From 5b05a6ab3e2831fcf3a4fc68f746dc29edff6339 Mon Sep 17 00:00:00 2001 From: ultramage Date: Fri, 9 Nov 2007 21:23:02 +0000 Subject: Fixed socket.c using time() incorrectly, causing stall timer desynchronization (bugreport:394) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11702 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/common') diff --git a/src/common/socket.c b/src/common/socket.c index 5fb9ead9e..9907845eb 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -527,8 +527,6 @@ int do_sockets(int next) struct timeval timeout; int ret,i; - last_tick = time(0); - // PRESEND Timers are executed before do_sendrecv and can send packets and/or set sessions to eof. // Send remaining data and process client-side disconnects here. #ifdef SEND_SHORTLIST @@ -561,6 +559,8 @@ int do_sockets(int next) return 0; // interrupted by a signal, just loop and try again } + last_tick = time(NULL); + #ifdef WIN32 // on windows, enumerating all members of the fd_set is way faster if we access the internals for(i=0;i<(int)rfd.fd_count;i++) @@ -1080,7 +1080,7 @@ void socket_init(void) socket_config_read(SOCKET_CONF_FILENAME); // initialise last send-receive tick - last_tick = time(0); + last_tick = time(NULL); // session[0] is now currently used for disconnected sessions of the map server, and as such, // should hold enough buffer (it is a vacuum so to speak) as it is never flushed. [Skotlex] -- cgit v1.2.3-70-g09d2