MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-11 08:02:59 +01:00
Code Issues Releases Wiki Activity

ircd: blacklist: use GET_SS_FAMILY()

Browse source
This commit is contained in:
William Pitcock 2016-03-20 01:48:14 -05:00
parent e0dc28c59f
commit 1d90b085d3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ircd/blacklist.c
View file

@ -156,7 +156,7 @@ static void initiate_blacklist_dnsquery(struct Blacklist *blptr, struct Client *
blcptr->client_p = client_p; blcptr->client_p = client_p;
/* IPv4 */ /* IPv4 */
if ((client_p->localClient->ip.ss_family == AF_INET) && blptr->ipv4) if ((GET_SS_FAMILY(&client_p->localClient->ip) == AF_INET) && blptr->ipv4)
{ {
ip = (uint8_t *)&((struct sockaddr_in *)&client_p->localClient->ip)->sin_addr.s_addr; ip = (uint8_t *)&((struct sockaddr_in *)&client_p->localClient->ip)->sin_addr.s_addr;
@ -168,8 +168,9 @@ static void initiate_blacklist_dnsquery(struct Blacklist *blptr, struct Client *
(unsigned int) ip[0], (unsigned int) ip[0],
blptr->host); blptr->host);
} }
#ifdef RB_IPV6
/* IPv6 */ /* IPv6 */
else if ((client_p->localClient->ip.ss_family == AF_INET6) && blptr->ipv6) else if ((GET_SS_FAMILY(&client_p->localClient->ip) == AF_INET6) && blptr->ipv6)
{ {
/* Split up for rDNS lookup /* Split up for rDNS lookup
* ex: ip[0] = 0x00, ip[1] = 0x00... ip[16] = 0x01 for localhost * ex: ip[0] = 0x00, ip[1] = 0x00... ip[16] = 0x01 for localhost
@ -197,6 +198,7 @@ static void initiate_blacklist_dnsquery(struct Blacklist *blptr, struct Client *
/* Tack host on */ /* Tack host on */
strcpy(bufptr, blptr->host); strcpy(bufptr, blptr->host);
} }
#endif
/* This shouldn't happen... */ /* This shouldn't happen... */
else else
return; return;