]> jfr.im git - irc/rqf/shadowircd.git/commitdiff
blacklist: Remove the sscanf() for the IPv4 blacklist check.
authorWilliam Pitcock <redacted>
Sun, 5 Dec 2010 05:11:04 +0000 (23:11 -0600)
committerWilliam Pitcock <redacted>
Sun, 5 Dec 2010 05:11:04 +0000 (23:11 -0600)
From ratbox r27061 (androsyn).

src/blacklist.c

index 791d4beef702aef11fb25990af08aed9f3c6b5f4..d468a8f37dd22b7a11b0a87df7e3d1b4d7289bd8 100644 (file)
@@ -117,7 +117,7 @@ static void initiate_blacklist_dnsquery(struct Blacklist *blptr, struct Client *
 {
        struct BlacklistClient *blcptr = rb_malloc(sizeof(struct BlacklistClient));
        char buf[IRCD_RES_HOSTLEN + 1];
-       int ip[4];
+       uint8_t *ip;
 
        blcptr->blacklist = blptr;
        blcptr->client_p = client_p;
@@ -125,11 +125,15 @@ static void initiate_blacklist_dnsquery(struct Blacklist *blptr, struct Client *
        blcptr->dns_query.ptr = blcptr;
        blcptr->dns_query.callback = blacklist_dns_callback;
 
-       /* XXX: yes I know this is bad, I don't really care right now */
-       sscanf(client_p->sockhost, "%d.%d.%d.%d", &ip[3], &ip[2], &ip[1], &ip[0]);
+       ip = (uint8_t *)&((struct sockaddr_in *)&client_p->localClient->ip)->sin_addr.s_addr;
 
        /* becomes 2.0.0.127.torbl.ahbl.org or whatever */
-       rb_snprintf(buf, sizeof buf, "%d.%d.%d.%d.%s", ip[0], ip[1], ip[2], ip[3], blptr->host);
+       rb_snprintf(buf, sizeof buf, "%d.%d.%d.%d.%s",
+                   (unsigned int) ip[3],
+                   (unsigned int) ip[2],
+                   (unsigned int) ip[1],
+                   (unsigned int) ip[0],
+                   blptr->host);
 
        gethost_byname_type(buf, &blcptr->dns_query, T_A);