Avoid repeating PONG handling that may already have been done.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1651 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 343b6b429c23abc09858f2bac9aa2dccf860b6ea..fdf813f09eb54af3221d9f486fd1f70caf3684b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-08  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/m_pong.c (mr_pong): Move cli_lasttime update from here...
+
+       * ircd/s_auth.c (auth_set_pong): ... to here.
+
 2006-05-07  Michael Poole <mdpoole@troilus.org>
 
        * include/s_auth.h (auth_ping_timeout): Declare new function.

diff --git a/ircd/m_pong.c b/ircd/m_pong.c
index 2ecb60979e4759e48e48e20e614510a1df6e0098..9cae0c0d1e29a67112a497ad02f03bbbe9949fbc 100644 (file)
--- a/ircd/m_pong.c
+++ b/ircd/m_pong.c
@@ -163,7 +163,6 @@ int mr_pong(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   assert(!IsRegistered(sptr));
 
   ClrFlag(cptr, FLAG_PINGSENT);
-  cli_lasttime(cptr) = CurrentTime;
   return (parc > 1) ? auth_set_pong(cli_auth(sptr), strtoul(parv[parc - 1], NULL, 10)) : 0;
 }
 

diff --git a/ircd/s_auth.c b/ircd/s_auth.c
index d64fb5cb3aaef87b52616373a60cef50a7653bcb..fdefd97443f8e982b45a74fcc5405ccb544709d1 100644 (file)
--- a/ircd/s_auth.c
+++ b/ircd/s_auth.c
@@ -1018,6 +1018,7 @@ int auth_set_pong(struct AuthRequest *auth, unsigned int cookie)
                ":To connect, type /QUOTE PONG %u", auth->cookie);
     return 0;
   }
+  cli_lasttime(auth->client) = CurrentTime;
   FlagClr(&auth->flags, AR_NEEDS_PONG);
   return check_auth_finished(auth);
 }