From 898eef3f9854a6815c53d36e1e2464cfbc0fb215 Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Sun, 14 May 2006 02:46:58 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ ircd/m_pong.c | 1 - ircd/s_auth.c | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 343b6b4..fdf813f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-05-08 Michael Poole + + * 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 * include/s_auth.h (auth_ping_timeout): Declare new function. diff --git a/ircd/m_pong.c b/ircd/m_pong.c index 2ecb609..9cae0c0 100644 --- 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 d64fb5c..fdefd97 100644 --- 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); } -- 2.20.1