X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=5fec70b63517f352386d0990cb9b7e797a2429dc;hp=35d6f19137b3a881482df4e65c3945d6bcdb8a78;hb=b2576e98c343652649abc094ea4dc1a810371ee7;hpb=de96aa2a6141626fce73aa682efc37912f4778a4 diff --git a/server.c b/server.c index 35d6f191..5fec70b6 100644 --- a/server.c +++ b/server.c @@ -52,20 +52,19 @@ * - Blob tables: \ref blob.c, * - The error subssystem: \ref error.h. * - Access control for paraslash senders: \ref acl.c, \ref acl.h. + * - Internal crypto API: \ref crypt.h. * * Low-level data structures: * * - Doubly linked lists: \ref list.h, * - Ring buffer: \ref ringbuffer.c, \ref ringbuffer.h, - * - Hashing: \ref hash.h, \ref sha1.h, \ref sha1.c, - * - Crypto: \ref crypt.c. + * - openssl: \ref crypt.c + * - libgcrypt: \ref gcrypt.c * - Forward error correction: \ref fec.c. */ #include -#include #include -#include #include #include #include @@ -91,6 +90,7 @@ #include "signal.h" #include "user_list.h" #include "color.h" +#include "version.h" /** Define the array of error lists needed by para_server. */ INIT_SERVER_ERRLISTS; @@ -525,7 +525,7 @@ static void server_init(int argc, char **argv) static void status_refresh(void) { static int prev_uptime = -1, prev_events = -1; - int uptime = server_uptime(UPTIME_GET), ret = 1; + int uptime = server_uptime(UPTIME_GET); if (prev_events != mmd->events) goto out; @@ -540,11 +540,8 @@ out: prev_uptime = uptime; prev_events = mmd->events; mmd->vss_status_flags = mmd->new_vss_status_flags; - if (ret) { - PARA_DEBUG_LOG("%d events, forcing status update\n", - mmd->events); - killpg(0, SIGUSR1); - } + PARA_DEBUG_LOG("%d events, forcing status update\n", mmd->events); + killpg(0, SIGUSR1); } static int server_select(int max_fileno, fd_set *readfds, fd_set *writefds,