X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=command.c;h=aa827f2b1cdc9ffd9984379b55c02223addcca1b;hb=03655936efc48594ec7f35d82c41782e16d07f21;hp=74d82697dd241c8c435bf2f78d0052a1b5df9b10;hpb=474b4dfc006b9a7520d017ca4c82aab589dff934;p=paraslash.git diff --git a/command.c b/command.c index 74d82697..aa827f2b 100644 --- a/command.c +++ b/command.c @@ -11,7 +11,6 @@ #include #include #include -#include #include "para.h" #include "error.h" @@ -24,6 +23,7 @@ #include "server.h" #include "list.h" #include "send.h" +#include "sched.h" #include "vss.h" #include "net.h" #include "daemon.h" @@ -32,7 +32,6 @@ #include "user_list.h" #include "server_command_list.h" #include "afs_command_list.h" -#include "sched.h" #include "signal.h" #include "version.h" @@ -108,7 +107,8 @@ static char *get_status(struct misc_meta_data *nmmd, int parser_friendly) { char mtime[30] = ""; char *status, *flags; /* vss status info */ - char *ut = uptime_str(); + /* nobody updates our version of "now" */ + char *ut = get_server_uptime_str(NULL); long offset = (nmmd->offset + 500) / 1000; struct timeval current_time; struct tm mtime_tm; @@ -258,7 +258,7 @@ int com_si(struct stream_cipher_context *scc, int argc, __a_unused char * const sender_info = para_strcat(sender_info, info); free(info); } - ut = uptime_str(); + ut = get_server_uptime_str(now); ret = sc_send_va_buffer(scc, "version: " GIT_VERSION "\n" "up: %s\nplayed: %u\n" "server_pid: %d\n"