/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2018 Alexander Barton (alex@barton.de) and Contributors.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/* Protocol version */
if (Req->argc >= 2 && strlen(Req->argv[1]) >= 4) {
- int c2, c4;
+ char c2, c4;
c2 = Req->argv[1][2];
c4 = Req->argv[1][4];
/* Search "target" client */
if (Client_Type(Client) == CLIENT_SERVER) {
+ _IRC_REQUIRE_PREFIX_OR_RETURN_(Client, Req)
target = Client_Search(Req->prefix);
if (!target)
return IRC_WriteErrClient(Client,
assert(Client != NULL);
assert(Req != NULL);
+ _IRC_REQUIRE_PREFIX_OR_RETURN_(Client, Req)
+
/* Search the originator */
from = Client_Search(Req->prefix);
if (!from)
Client_Type(Client) == CLIENT_SERVICE) {
/* Server/service updating an user */
_IRC_ARGC_EQ_OR_RETURN_(Client, Req, 4)
+ _IRC_REQUIRE_PREFIX_OR_RETURN_(Client, Req)
c = Client_Search(Req->prefix);
if (!c)
if (Client_Type(Client) == CLIENT_SERVER) {
/* Server */
+ _IRC_REQUIRE_PREFIX_OR_RETURN_(Client, Req)
+
target = Client_Search(Req->prefix);
if (!target) {
Log(LOG_WARNING,
if (target != Client_ThisServer()) {
/* Ok, we have to forward the PING */
- if (Client_Type(Client) == CLIENT_SERVER)
+ if (Client_Type(Client) == CLIENT_SERVER) {
+ _IRC_REQUIRE_PREFIX_OR_RETURN_(Client, Req)
from = Client_Search(Req->prefix);
- else
+ } else
from = Client;
if (!from)
return IRC_WriteErrClient(Client,
return IRC_WriteErrClient(Client, ERR_NOSUCHSERVER_MSG,
Client_ID(Client), Req->prefix);
- Log(LOG_DEBUG, "Connection %d: got PING, sending PONG ...",
+ LogDebug("Connection %d: got PING, sending PONG ...",
Client_Conn(Client));
#ifdef STRICT_RFC
/* Forward? */
if (Req->argc == 2 && Client_Type(Client) == CLIENT_SERVER) {
+ _IRC_REQUIRE_PREFIX_OR_RETURN_(Client, Req)
+
target = Client_Search(Req->argv[0]);
if (!target)
return IRC_WriteErrClient(Client, ERR_NOSUCHSERVER_MSG,
if (Client_Type(Client) == CLIENT_SERVER && Conn_LastPing(conn) == 0) {
Log(LOG_INFO,
"Synchronization with \"%s\" done (connection %d): %ld second%s [%ld users, %ld channels].",
- Client_ID(Client), conn, time(NULL) - Conn_GetSignon(conn),
+ Client_ID(Client), conn,
+ (long)(time(NULL) - Conn_GetSignon(conn)),
time(NULL) - Conn_GetSignon(conn) == 1 ? "" : "s",
Client_UserCount(), Channel_CountVisible(NULL));
- Conn_UpdatePing(conn);
- } else
- LogDebug("Connection %d: received PONG. Lag: %ld seconds.",
- conn, time(NULL) - Conn_LastPing(conn));
+ } else {
+ if (Conn_LastPing(conn) > 1)
+ LogDebug("Connection %d: received PONG. Lag: %ld seconds.",
+ conn, (long)(time(NULL) - Conn_LastPing(conn)));
+ else
+ LogDebug("Got unexpected PONG on connection %d. Ignored.",
+ conn);
+ }
+ /* We got a PONG, so signal that none is pending on this connection. */
+ Conn_UpdatePing(conn, 1);
return CONNECTED;
} /* IRC_PONG */