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

Move ipv4-in-ipv6 handling to find_conf_by_address

Browse source 
This removes some inconsistencies: first of all it applies to both
CONF_KILL searches by IP in find_address_conf, and secondly it applies
to find_kline, which would have been an edge case before.
This commit is contained in:
Ed Kellett 2020-04-18 16:57:22 +01:00
parent f53d2f45de
commit de0673d7ad
No known key found for this signature in database
GPG key ID: CB9986DEF342FABC
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ircd/hostmask.c
View file

@ -216,6 +216,8 @@ find_conf_by_address(const char *name, const char *sockhost,
unsigned long hprecv = 0; unsigned long hprecv = 0;
struct ConfItem *hprec = NULL; struct ConfItem *hprec = NULL;
struct AddressRec *arec; struct AddressRec *arec;
struct sockaddr_in ip4;
struct sockaddr *pip4 = NULL;
int b; int b;
if(username == NULL) if(username == NULL)
@ -223,9 +225,13 @@ find_conf_by_address(const char *name, const char *sockhost,
if(addr) if(addr)
{ {
/* Check for IPV6 matches... */ if (fam == AF_INET)
pip4 = addr;
if (fam == AF_INET6) if (fam == AF_INET6)
{ {
if (type == CONF_KILL && rb_ipv4_from_ipv6((struct sockaddr_in6 *)addr, &ip4))
pip4 = (struct sockaddr *)&ip4;
for (b = 128; b >= 0; b -= 16) for (b = 128; b >= 0; b -= 16)
{ {
@ -244,15 +250,15 @@ find_conf_by_address(const char *name, const char *sockhost,
} }
} }
} }
else
if(fam == AF_INET) if (pip4 != NULL)
{ {
for (b = 32; b >= 0; b -= 8) for (b = 32; b >= 0; b -= 8)
{ {
for (arec = atable[hash_ipv4(addr, b)]; arec; arec = arec->next) for (arec = atable[hash_ipv4(pip4, b)]; arec; arec = arec->next)
if(arec->type == (type & ~0x1) && if(arec->type == (type & ~0x1) &&
arec->masktype == HM_IPV4 && arec->masktype == HM_IPV4 &&
comp_with_mask_sock(addr, (struct sockaddr *)&arec->Mask.ipa.addr, comp_with_mask_sock(pip4, (struct sockaddr *)&arec->Mask.ipa.addr,
arec->Mask.ipa.bits) && arec->Mask.ipa.bits) &&
(type & 0x1 || match(arec->username, username)) && (type & 0x1 || match(arec->username, username)) &&
(type != CONF_CLIENT || !arec->auth_user || (type != CONF_CLIENT || !arec->auth_user ||
@ -364,7 +370,6 @@ find_address_conf(const char *host, const char *sockhost, const char *user,
{ {
struct ConfItem *iconf, *kconf; struct ConfItem *iconf, *kconf;
const char *vuser; const char *vuser;
struct sockaddr_in ip4;
/* Find the best I-line... If none, return NULL -A1kmm */ /* Find the best I-line... If none, return NULL -A1kmm */
if(!(iconf = find_conf_by_address(host, sockhost, NULL, ip, CONF_CLIENT, aftype, user, auth_user))) if(!(iconf = find_conf_by_address(host, sockhost, NULL, ip, CONF_CLIENT, aftype, user, auth_user)))
@ -415,14 +420,6 @@ find_address_conf(const char *host, const char *sockhost, const char *user,
return kconf; return kconf;
} }
if(ip != NULL && ip->sa_family == AF_INET6 &&
rb_ipv4_from_ipv6((const struct sockaddr_in6 *)(const void *)ip, &ip4))
{
kconf = find_conf_by_address(NULL, NULL, NULL, (struct sockaddr *)&ip4, CONF_KILL, AF_INET, vuser, NULL);
if(kconf)
return kconf;
}
return iconf; return iconf;
} }