vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

check_one_kline: fix kline_spoof_ip handling

Browse source
This commit is contained in:
Ed Kellett 2021-11-07 23:30:22 +00:00 committed by GitHub
parent 85d5888f69
commit 19f0ae8429
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ircd/client.c
View file

@ -600,7 +600,7 @@ check_one_kline(struct ConfItem *kline)
case HM_IPV6: case HM_IPV6:
if (IsConfDoSpoofIp(client_p->localClient->att_conf) && if (IsConfDoSpoofIp(client_p->localClient->att_conf) &&
IsConfKlineSpoof(client_p->localClient->att_conf)) IsConfKlineSpoof(client_p->localClient->att_conf))
continue; break;
if (client_p->localClient->ip.ss_family == AF_INET6 && sockaddr.ss_family == AF_INET && if (client_p->localClient->ip.ss_family == AF_INET6 && sockaddr.ss_family == AF_INET &&
rb_ipv4_from_ipv6((struct sockaddr_in6 *)&client_p->localClient->ip, &ip4) rb_ipv4_from_ipv6((struct sockaddr_in6 *)&client_p->localClient->ip, &ip4)
&& comp_with_mask_sock((struct sockaddr *)&ip4, (struct sockaddr *)&sockaddr, bits)) && comp_with_mask_sock((struct sockaddr *)&ip4, (struct sockaddr *)&sockaddr, bits))
@ -615,7 +615,7 @@ check_one_kline(struct ConfItem *kline)
matched = 1; matched = 1;
if (IsConfDoSpoofIp(client_p->localClient->att_conf) && if (IsConfDoSpoofIp(client_p->localClient->att_conf) &&
IsConfKlineSpoof(client_p->localClient->att_conf)) IsConfKlineSpoof(client_p->localClient->att_conf))
continue; break;
if (match(kline->host, client_p->sockhost)) if (match(kline->host, client_p->sockhost))
matched = 1; matched = 1;
break; break;