pissnet/pissircd
1
0
Fork 0
mirror of https://github.com/pissnet/pissircd.git synced 2025-07-29 22:42:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fixed some other weird remote PING/PONG stuff as well.

Browse source
This commit is contained in:
Bram Matthys 2003-11-02 20:05:12 +00:00
parent c25223913c
commit 1e162381ac
2 changed files with 19 additions and 15 deletions

1
Changes
View file

@ -2547,3 +2547,4 @@ seen. gmtime warning still there
you won't notice, I suggest you to update your callback functions anyway.
- Possibly fixed an issue with set::modes-on-join and mode +f, it could have
set random remove-chanmode times in the default chanmode line.
- Fixed some other weird remote PING/PONG stuff as well.

33
src/modules/m_pingpong.c
View file

@ -113,7 +113,6 @@ DLLFUNC int m_ping(aClient *cptr, aClient *sptr, int parc, char *parv[])
aClient *acptr;
char *origin, *destination;
if (parc < 2 || *parv[1] == '\0')
{
sendto_one(sptr, err_str(ERR_NOORIGIN), me.name, parv[0]);
@ -122,16 +121,22 @@ DLLFUNC int m_ping(aClient *cptr, aClient *sptr, int parc, char *parv[])
origin = parv[1];
destination = parv[2]; /* Will get NULL or pointer (parc >= 2!!) */
acptr = find_client(origin, NULL);
if (!acptr)
acptr = find_server_quick(origin);
if (acptr && acptr != sptr)
origin = cptr->name;
if (!MyClient(sptr))
{
/* I've no idea who invented this or what it is supposed to do.. */
acptr = find_client(origin, NULL);
if (!acptr)
acptr = find_server_quick(origin);
if (acptr && acptr != sptr)
origin = cptr->name;
}
if (!BadPtr(destination) && mycmp(destination, me.name) != 0)
{
if (MyClient(sptr))
origin = sptr->name; /* Make sure origin is not spoofed */
if ((acptr = find_server_quick(destination)) && (acptr != &me))
sendto_one(acptr, ":%s PING %s :%s", parv[0],
origin, destination);
sendto_one(acptr, ":%s PING %s :%s", parv[0], origin, destination);
else
{
sendto_one(sptr, err_str(ERR_NOSUCHSERVER),
@ -141,7 +146,7 @@ DLLFUNC int m_ping(aClient *cptr, aClient *sptr, int parc, char *parv[])
}
else
sendto_one(sptr, ":%s %s %s :%s", me.name,
IsToken(sptr) ? TOK_PONG : MSG_PONG,
IsToken(cptr) ? TOK_PONG : MSG_PONG,
(destination) ? destination : me.name, origin);
return 0;
}
@ -222,14 +227,12 @@ DLLFUNC int m_pong(aClient *cptr, aClient *sptr, int parc, char *parv[])
cptr->flags &= ~FLAGS_PINGSENT;
sptr->flags &= ~FLAGS_PINGSENT;
/* Remote pongs for clients? uhh... */
if (MyClient(sptr) || !IsRegistered(sptr))
destination = NULL;
if (!BadPtr(destination) && mycmp(destination, me.name) != 0)
{
/* No remote pongs if not registered */
if (MyConnect(sptr) && IsUnknown(sptr))
{
sendto_one(sptr, err_str(ERR_NOSUCHSERVER), me.name, parv[0], destination);
return 0;
}
if ((acptr = find_client(destination, NULL)) ||
(acptr = find_server_quick(destination)))
{