X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=server.c;h=287b628b0d2e7ffee18886f8885f58882d6e155a;hb=01556501c32d5ec155cc7e2cd78307ec1f177a07;hp=459f44621bb5c1f8350f2c5192edaa15362b5335;hpb=d9e608504d9d0e71380907559546e211c4f0ce55;p=paraslash.git diff --git a/server.c b/server.c index 459f4462..287b628b 100644 --- a/server.c +++ b/server.c @@ -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. */ @@ -27,7 +27,7 @@ * - Volume normalizer: \ref compress_filter.c, * - Output: \ref alsa_write.c, \ref osx_write.c, * - http: \ref http_recv.c, \ref http_send.c, - * - ortp: \ref ortp_recv.c, \ref ortp_send.c, + * - udp: \ref udp_recv.c, \ref udp_send.c, * - dccp: \ref dccp_recv.c, \ref dccp_send.c, * - Audio file selector: \ref afs.c, \ref aft.c, \ref mood.c, * - Afs structures: \ref afs_table, \ref audio_file_data, @@ -64,6 +64,7 @@ #include #include +#include #include "para.h" #include "error.h" @@ -136,7 +137,7 @@ struct server_command_task { * \param ll The log level. * \param fmt The format string describing the log message. */ -void para_log(int ll, const char* fmt,...) +__printf_2_3 void para_log(int ll, const char* fmt,...) { va_list argp; FILE *outfd; @@ -486,6 +487,8 @@ static void server_init(int argc, char **argv) parse_config(0); log_welcome("para_server", conf.loglevel_arg); shm_init(); /* init mmd struct */ + /* make sure, the global now pointer is uptodate */ + gettimeofday(now, NULL); server_uptime(UPTIME_SET); /* reset server uptime */ init_user_list(user_list_file); /* become daemon */