9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't match iline-spoofed IPs for channel bans

Browse source
This commit is contained in:
Ed Kellett 2020-04-12 02:09:12 +01:00
parent a7d4a0ab81
commit 55ed78dab1
No known key found for this signature in database
GPG key ID: CB9986DEF342FABC
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ircd/match.c
View file

@ -594,7 +594,12 @@ void matchset_for_client(struct Client *who, struct matchset *m)
struct sockaddr_in ip4; struct sockaddr_in ip4;
sprintf(m->host[hostn++], "%s!%s@%s", who->name, who->username, who->host); sprintf(m->host[hostn++], "%s!%s@%s", who->name, who->username, who->host);
sprintf(m->ip[ipn++], "%s!%s@%s", who->name, who->username, who->sockhost);
if (!IsIPSpoof(who))
{
sprintf(m->ip[ipn++], "%s!%s@%s", who->name, who->username, who->sockhost);
}
if (who->localClient->mangledhost != NULL) if (who->localClient->mangledhost != NULL)
{ {
/* if host mangling mode enabled, also check their real host */ /* if host mangling mode enabled, also check their real host */
@ -609,7 +614,7 @@ void matchset_for_client(struct Client *who, struct matchset *m)
sprintf(m->host[hostn++], "%s!%s@%s", who->name, who->username, who->localClient->mangledhost); sprintf(m->host[hostn++], "%s!%s@%s", who->name, who->username, who->localClient->mangledhost);
} }
} }
if (GET_SS_FAMILY(&who->localClient->ip) == AF_INET6 && if (!IsIPSpoof(who) && GET_SS_FAMILY(&who->localClient->ip) == AF_INET6 &&
rb_ipv4_from_ipv6((const struct sockaddr_in6 *)&who->localClient->ip, &ip4)) rb_ipv4_from_ipv6((const struct sockaddr_in6 *)&who->localClient->ip, &ip4))
{ {
int n = sprintf(m->ip[ipn++], "%s!%s@", who->name, who->username); int n = sprintf(m->ip[ipn++], "%s!%s@", who->name, who->username);