george/fiche
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

enhancement #33

Browse Source
This commit is contained in:
solusipse
2016-01-23 12:36:53 +01:00
parent abf8ae5117
commit a5c137c06d
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fiche.c
View File

@@ -36,6 +36,7 @@ int main(int argc, char **argv)
time_seed = time(0); time_seed = time(0);
parse_parameters(argc, argv); parse_parameters(argc, argv);
set_domain_name();
if (getuid() == 0) if (getuid() == 0)
{ {
@@ -404,11 +405,21 @@ void error(char *buffer)
exit(1); exit(1);
} }
void set_domain_name() {
char b[128];
memcpy(b, DOMAIN, sizeof DOMAIN);
if (HTTPS)
snprintf(DOMAIN, sizeof DOMAIN, "%s%s", "https://", b);
else
snprintf(DOMAIN, sizeof DOMAIN, "%s%s", "http://", b);
}
void parse_parameters(int argc, char **argv) void parse_parameters(int argc, char **argv)
{ {
int c; int c;
while ((c = getopt (argc, argv, "Dep:b:s:d:o:l:B:u:w:")) != -1) while ((c = getopt (argc, argv, "DeSp:b:s:d:o:l:B:u:w:")) != -1)
switch (c) switch (c)
{ {
case 'D': case 'D':
@@ -417,8 +428,11 @@ void parse_parameters(int argc, char **argv)
case 'e': case 'e':
snprintf(symbols, sizeof symbols, "%s", "abcdefghijklmnopqrstuvwxyz0123456789-+_=.ABCDEFGHIJKLMNOPQRSTUVWXYZ"); snprintf(symbols, sizeof symbols, "%s", "abcdefghijklmnopqrstuvwxyz0123456789-+_=.ABCDEFGHIJKLMNOPQRSTUVWXYZ");
break; break;
case 'S':
HTTPS = 1;
break;
case 'd': case 'd':
snprintf(DOMAIN, sizeof DOMAIN, "%s%s%s", "http://", optarg, "/"); snprintf(DOMAIN, sizeof DOMAIN, "%s%s", optarg, "/");
break; break;
case 'p': case 'p':
PORT = atoi(optarg); PORT = atoi(optarg);
@@ -447,7 +461,7 @@ void parse_parameters(int argc, char **argv)
load_list(WHITEFILE, 1); load_list(WHITEFILE, 1);
break; break;
default: default:
printf("usage: fiche [-pbsdolBuw].\n"); printf("usage: fiche [-pbsdSolBuw].\n");
printf(" [-d domain] [-p port] [-s slug_size]\n"); printf(" [-d domain] [-p port] [-s slug_size]\n");
printf(" [-o output directory] [-B buffer_size] [-u user name]\n"); printf(" [-o output directory] [-B buffer_size] [-u user name]\n");
printf(" [-l log file] [-b banlist] [-w whitelist]\n"); printf(" [-l log file] [-b banlist] [-w whitelist]\n");

4
fiche.h
View File

@@ -54,11 +54,12 @@ char *BANFILE;
char *WHITEFILE; char *WHITEFILE;
char *WHITELIST; char *WHITELIST;
int DAEMON = 0; int DAEMON = 0;
int HTTPS = 0;
int PORT = 9999; int PORT = 9999;
int SLUG_SIZE = 4; int SLUG_SIZE = 4;
int BUFSIZE = 32768; int BUFSIZE = 32768;
int QUEUE_SIZE = 500; int QUEUE_SIZE = 500;
char DOMAIN[128] = "http://localhost/"; char DOMAIN[128] = "localhost/";
char symbols[67] = "abcdefghijklmnopqrstuvwxyz0123456789"; char symbols[67] = "abcdefghijklmnopqrstuvwxyz0123456789";
unsigned int time_seed; unsigned int time_seed;
@@ -87,6 +88,7 @@ void save_to_file(char *buffer, char *slug, struct client_data data);
void display_info(struct client_data data, char *slug, char *message); void display_info(struct client_data data, char *slug, char *message);
void startup_message(); void startup_message();
void set_basedir(); void set_basedir();
void set_domain_name();
void load_list(char *file_path, int type); void load_list(char *file_path, int type);
void parse_parameters(int argc, char **argv); void parse_parameters(int argc, char **argv);
void save_log(char *slug, char *hostaddrp, char *h_name); void save_log(char *slug, char *hostaddrp, char *h_name);