#include "client.h"
#include "hash.h"
#include "ircd.h"
+#include "ircd_log.h"
#include "ircd_reply.h"
#include "ircd_string.h"
#include "msg.h"
#include "numeric.h"
#include "numnicks.h"
#include "opercmds.h"
+#include "s_auth.h"
#include "s_user.h"
#include "send.h"
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
#include <string.h>
#include <stdlib.h>
}
origin = parv[1];
destination = parv[2];
- ClrFlag(cptr, FLAG_PINGSENT);
- ClrFlag(sptr, FLAG_PINGSENT);
+ ClearPingSent(cptr);
+ ClearPingSent(sptr);
cli_lasttime(cptr) = CurrentTime;
if (parc > 5)
cli_serv(cptr)->asll_rtt = atoi(militime_float(parv[3]));
cli_serv(cptr)->asll_to = atoi(parv[4]);
cli_serv(cptr)->asll_from = atoi(militime_float(parv[5]));
+ cli_serv(cptr)->asll_last = CurrentTime;
return 0;
}
assert(cptr == sptr);
assert(!IsRegistered(sptr));
- ClrFlag(cptr, FLAG_PINGSENT);
- cli_lasttime(cptr) = CurrentTime;
- /*
- * Check to see if this is a PONG :cookie reply from an
- * unregistered user. If so, process it. -record
- */
- if (0 != cli_cookie(sptr) && COOKIE_VERIFIED != cli_cookie(sptr)) {
- if (parc > 1 && cli_cookie(sptr) == atol(parv[parc - 1])) {
- cli_cookie(sptr) = COOKIE_VERIFIED;
- if (cli_user(sptr) && *(cli_user(sptr))->host && (cli_name(sptr))[0])
- /*
- * NICK and USER OK
- */
- return register_user(cptr, sptr, cli_name(sptr), cli_user(sptr)->username);
- }
- else
- send_reply(sptr, SND_EXPLICIT | ERR_BADPING,
- ":To connect, type /QUOTE PONG %u", cli_cookie(sptr));
- }
- return 0;
+ ClearPingSent(cptr);
+ return (parc > 1) ? auth_set_pong(cli_auth(sptr), strtoul(parv[parc - 1], NULL, 10)) : 0;
}
/*
{
assert(0 != cptr);
assert(cptr == sptr);
- ClrFlag(cptr, FLAG_PINGSENT);
+
+ ClearPingSent(cptr);
cli_lasttime(cptr) = CurrentTime;
return 0;
}