X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=server.h;h=8d1d6752daa8b558c4f5160a37e3d11155074832;hb=d4f00ccce225a821023321f146efbb095de8d609;hp=1468b458f4cc94d0dcd2eb43fbb1b1ca506970e7;hpb=d79c420304e9ae7e0dec89ca2644f2e04a7134e2;p=paraslash.git diff --git a/server.h b/server.h index 1468b458..8d1d6752 100644 --- a/server.h +++ b/server.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2008 Andre Noll + * Copyright (C) 1997-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -36,6 +36,8 @@ struct sender_command_data{ int sender_num; /** Used for the allow/deny/add/remove subcommands. */ struct in_addr addr; + /** Used for the allow/deny/add/remove subcommands. */ + char host[256]; /** Used for allow/deny. */ int netmask; /** The port number for add/remove. */ @@ -92,8 +94,8 @@ struct misc_meta_data { unsigned int num_connects; /** The number of connections currently active. */ unsigned int active_connections; - /** The process id of para_server. */ - pid_t server_pid; + /** The process id of the audio file selector. */ + pid_t afs_pid; /** This gets updated by afs and contains its current mode. */ char afs_mode_string[MAXLINE]; /** Used by the sender command. */ @@ -106,3 +108,4 @@ struct misc_meta_data { extern struct server_args_info conf; __noreturn void handle_connect(int fd, const char *peername); +void parse_config_or_die(int override);