pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-06-30 11:06:38 +02:00
Code Activity

split all the local client stuff to acptr->local. makes it a lot easier to catch bugs.

Browse Source 
If the IRCd crashes then it's likely not by this change but rather an existing issue that was previously gone unnoticed.
This commit is contained in:
Bram Matthys
2015-07-19 12:48:18 +02:00
parent 19ad342a73
commit 13fffa4e1a
47 changed files with 580 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/webirc.c
+10 -10
View File
@@ -317,9 +317,9 @@ int dowebirc(aClient *cptr, char *ip, char *host)
if (host && !strcmp(ip, host))
host = NULL; /* host did not resolve, make it NULL */
/* STEP 1: Update cptr->ip
/* STEP 1: Update cptr->local->ip
inet_pton() returns 1 on success, 0 on bad input, -1 on bad AF */
if(inet_pton(AFINET, ip, &cptr->ip) != 1)
if(inet_pton(AFINET, ip, &cptr->local->ip) != 1)
{
#ifndef INET6
/* then we have an invalid IP */
@@ -327,7 +327,7 @@ int dowebirc(aClient *cptr, char *ip, char *host)
#else
/* The address may be IPv4. We have to try ::ffff:ipv4 */
snprintf(ipbuf, sizeof(ipbuf), "::ffff:%s", ip);
if(inet_pton(AFINET, ipbuf, &cptr->ip) != 1)
if(inet_pton(AFINET, ipbuf, &cptr->local->ip) != 1)
return exit_client(cptr, cptr, &me, "Invalid IP address");
#endif
}
@@ -341,27 +341,27 @@ int dowebirc(aClient *cptr, char *ip, char *host)
cptr->user->ip_str = strdup(ip);
}
/* STEP 3: Update cptr->hostp */
/* STEP 3: Update cptr->local->hostp */
/* (free old) */
if (cptr->hostp)
if (cptr->local->hostp)
{
unreal_free_hostent(cptr->hostp);
cptr->hostp = NULL;
unreal_free_hostent(cptr->local->hostp);
cptr->local->hostp = NULL;
}
/* (create new) */
if (host && verify_hostname(host))
cptr->hostp = unreal_create_hostent(host, &cptr->ip);
cptr->local->hostp = unreal_create_hostent(host, &cptr->local->ip);
/* STEP 4: Update sockhost
Make sure that if this any IPv4 address is _not_ prefixed with
"::ffff:" by using Inet_ia2p().
*/
sockhost = Inet_ia2p(&cptr->ip);
sockhost = Inet_ia2p(&cptr->local->ip);
if(!sockhost)
{
return exit_client(cptr, cptr, &me, "Error processing CGI:IRC IP address.");
}
strlcpy(cptr->sockhost, sockhost, sizeof(cptr->sockhost));
strlcpy(cptr->local->sockhost, sockhost, sizeof(cptr->local->sockhost));
SetWEBIRC(cptr);