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

combine 2 if-statements. While here; spacing, spacing, spacing

Browse Source
This commit is contained in:
Björn Ketelaars
2015-09-19 17:54:15 +02:00
parent 7e33e463bb
commit b1de821740
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
fiche.c
View File

@@ -38,7 +38,7 @@ int main(int argc, char **argv)
parse_parameters(argc, argv); parse_parameters(argc, argv);
if (BASEDIR == NULL) if (BASEDIR == NULL)
set_basedir(); set_basedir();
startup_message(); startup_message();
int listen_socket, optval = 1; int listen_socket, optval = 1;
@@ -77,25 +77,23 @@ void *thread_connection(void *args)
bzero(buffer, BUFSIZE); bzero(buffer, BUFSIZE);
int status = recv(connection_socket, buffer, BUFSIZE, MSG_DONTWAIT); int status = recv(connection_socket, buffer, BUFSIZE, MSG_DONTWAIT);
if (WHITELIST != NULL) if (WHITELIST != NULL && check_whitelist(data.ip_address) == NULL)
if (check_whitelist(data.ip_address) == NULL) {
{ display_info(data, NULL, "Rejected connection from unknown user.");
display_info(data, NULL, "Rejected connection from unknown user."); save_log(NULL, data.ip_address, data.hostname);
save_log(NULL, data.ip_address, data.hostname); write(connection_socket, "You are not whitelisted!\n", 26);
write(connection_socket, "You are not whitelisted!\n", 26); close(connection_socket);
close(connection_socket); pthread_exit(NULL);
pthread_exit(NULL); }
}
if (BANLIST != NULL) if (BANLIST != NULL && check_banlist(data.ip_address) != NULL)
if (check_banlist(data.ip_address) != NULL) {
{ display_info(data, NULL, "Rejected connection from banned user.");
display_info(data, NULL, "Rejected connection from banned user."); save_log(NULL, data.ip_address, data.hostname);
save_log(NULL, data.ip_address, data.hostname); write(connection_socket, "You are banned!\n", 17);
write(connection_socket, "You are banned!\n", 17); close(connection_socket);
close(connection_socket); pthread_exit(NULL);
pthread_exit(NULL); }
}
if (check_protocol(buffer) == 1) if (check_protocol(buffer) == 1)
status = -1; status = -1;
@@ -124,7 +122,7 @@ void perform_connection(int listen_socket)
{ {
pthread_t thread_id; pthread_t thread_id;
struct sockaddr_in client_address; struct sockaddr_in client_address;
int address_length = sizeof(client_address); int address_length = sizeof(client_address);
int connection_socket = accept(listen_socket, (struct sockaddr *) &client_address, (void *) &address_length); int connection_socket = accept(listen_socket, (struct sockaddr *) &client_address, (void *) &address_length);
@@ -345,8 +343,8 @@ void save_to_file(char *slug, char *buffer, struct client_data data)
void change_owner(char *directory) void change_owner(char *directory)
{ {
if ((UID != -1)&&(GID != -1)) if (UID != -1 && GID != -1)
chown(directory, UID, GID); chown(directory, UID, GID);
} }
void set_uid_gid(char *username) void set_uid_gid(char *username)