From 1b12a5aeb2f96c1dec22d564630268f37ecb7eaf Mon Sep 17 00:00:00 2001 From: Alex Badea Date: Sun, 11 Sep 2005 17:40:21 +0000 Subject: [PATCH] Author: Alex Badea Log message: Fixed AsLL code misplacement in m_ping.c, now it works again. git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1477 c9e4aea6-c8fd-4c43-8297-357d70d61c8c --- ChangeLog | 5 +++++ ircd/m_ping.c | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a2ee113..5ba9007 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-09-11 Alex Badea + + * ircd/m_ping.c (ms_ping, mo_ping): misplaced chunk of code + (probably during the forward port) which broke AsLL; fixed. + 2005-09-01 Michael Poole * ircd/gline.c (make_gline): Remove debug output from when IPv6 diff --git a/ircd/m_ping.c b/ircd/m_ping.c index 6766b60..c1393d4 100644 --- a/ircd/m_ping.c +++ b/ircd/m_ping.c @@ -188,14 +188,6 @@ int mo_ping(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) origin = parv[1]; destination = parv[2]; /* Will get NULL or pointer (parc >= 2!!) */ - if (parc > 3) - { - /* AsLL ping, send reply back */ - int diff = atoi(militime_float(parv[3])); - sendcmdto_one(&me, CMD_PONG, sptr, "%C %s %s %i %s", &me, origin, - parv[3], diff, militime_float(NULL)); - return 0; - } if (!EmptyString(destination) && 0 != ircd_strcmp(destination, cli_name(&me))) { if ((acptr = FindServer(destination))) sendcmdto_one(sptr, CMD_PING, acptr, "%C :%s", sptr, destination); @@ -252,6 +244,14 @@ int ms_ping(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) origin = parv[1]; destination = parv[2]; /* Will get NULL or pointer (parc >= 2!!) */ + if (parc > 3) + { + /* AsLL ping, send reply back */ + int diff = atoi(militime_float(parv[3])); + sendcmdto_one(&me, CMD_PONG, sptr, "%C %s %s %i %s", &me, origin, + parv[3], diff, militime_float(NULL)); + return 0; + } if (!EmptyString(destination) && 0 != ircd_strcmp(destination, cli_name(&me))) { if ((acptr = FindServer(destination))) { /* -- 2.20.1