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

remove info(), instead used printf's. Check for DAEMON at some stages

Browse Source
This commit is contained in:
Björn Ketelaars
2015-09-19 17:29:40 +02:00
parent f7926b75fc
commit 7e33e463bb
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
fiche.c
View File

@@ -170,7 +170,7 @@ struct client_data get_client_address(struct sockaddr_in client_address)
hostp = gethostbyaddr((const char *)&client_address.sin_addr.s_addr, sizeof(client_address.sin_addr.s_addr), AF_INET); hostp = gethostbyaddr((const char *)&client_address.sin_addr.s_addr, sizeof(client_address.sin_addr.s_addr), AF_INET);
if (hostp == NULL) if (hostp == NULL)
{ {
info("WARNING: Couldn't obtain client's hostname\n"); printf("WARNING: Couldn't obtain client's hostname\n");
data.hostname = "n/a"; data.hostname = "n/a";
} }
else else
@@ -179,7 +179,7 @@ struct client_data get_client_address(struct sockaddr_in client_address)
hostaddrp = inet_ntoa(client_address.sin_addr); hostaddrp = inet_ntoa(client_address.sin_addr);
if (hostaddrp == NULL) if (hostaddrp == NULL)
{ {
info("WARNING: Couldn't obtain client's address\n"); printf("WARNING: Couldn't obtain client's address\n");
data.ip_address = "n/a"; data.ip_address = "n/a";
} }
else else
@@ -208,12 +208,17 @@ void save_log(char *slug, char *hostaddrp, char *h_name)
void display_info(struct client_data data, char *slug, char *message) void display_info(struct client_data data, char *slug, char *message)
{ {
if (DAEMON)
return;
if (slug == NULL) if (slug == NULL)
info("%s\n", message); printf("%s\n", message);
else info("Saved to: %s\n", slug); else
info("%s\n", get_date()); printf("Saved to: %s\n", slug);
info("Client: %s (%s)\n", data.ip_address, data.hostname);
info("====================================\n"); printf("%s\n", get_date());
printf("Client: %s (%s)\n", data.ip_address, data.hostname);
printf("====================================\n");
} }
char *check_banlist(char *ip_address) char *check_banlist(char *ip_address)
@@ -371,23 +376,18 @@ void set_basedir()
} }
void startup_message() void startup_message()
{
info("====================================\n");
info("Domain name: %s\n", DOMAIN);
info("Saving files to: %s\n", BASEDIR);
info("Fiche started listening on port %d.\n", PORT);
info("Buffer size set to: %d.\n", BUFSIZE);
info("Slug size set to: %d.\n", SLUG_SIZE);
info("Log file: %s\n", LOG);
info("====================================\n");
}
void info(char *buffer, ...)
{ {
if (DAEMON) if (DAEMON)
return; return;
printf(buffer); printf("====================================\n");
printf("Domain name: %s\n", DOMAIN);
printf("Saving files to: %s\n", BASEDIR);
printf("Fiche started listening on port %d.\n", PORT);
printf("Buffer size set to: %d.\n", BUFSIZE);
printf("Slug size set to: %d.\n", SLUG_SIZE);
printf("Log file: %s\n", LOG);
printf("====================================\n");
} }
void parse_parameters(int argc, char **argv) void parse_parameters(int argc, char **argv)

1
fiche.h
View File

@@ -92,7 +92,6 @@ 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);
void change_owner(char *directory); void change_owner(char *directory);
void set_uid_gid(); void set_uid_gid();
void info(char *buffer, ...);
char *check_banlist(char *ip_address); char *check_banlist(char *ip_address);
char *check_whitelist(char *ip_address); char *check_whitelist(char *ip_address);