X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/eb2a930e0ff09c830479df1aea5d8a4ce9354dc1..97a937c8b7052d9ad87bb20394e1753a65fa3f37:/src/event.c

diff --git a/src/event.c b/src/event.c
index 5b2b42d..1652268 100644
--- a/src/event.c
+++ b/src/event.c
@@ -316,8 +316,8 @@ int adns__pollfds(adns_state ads, struct pollfd pollfds_buf[MAX_POLLFDS]) {
 
   assert(MAX_POLLFDS == MAXUDP + 1);
 
-  for (i=0; i<ads->nudp; i++)
-    ADD_POLLFD(ads->udpsocket[i].fd, POLLIN);
+  for (i=0; i<ads->nudpsockets; i++)
+    ADD_POLLFD(ads->udpsockets[i].fd, POLLIN);
 
   switch (ads->tcpstate) {
   case server_disconnected:
@@ -396,8 +396,8 @@ int adns_processreadable(adns_state ads, int fd, const struct timeval *now) {
   default:
     abort();
   }
-  for (i=0; i<ads->nudp; i++) {
-    udp= &ads->udpsocket[i];
+  for (i=0; i<ads->nudpsockets; i++) {
+    udp= &ads->udpsockets[i];
     if (fd == udp->fd) {
       for (;;) {
 	udpaddrlen= sizeof(udpaddr);
@@ -411,8 +411,8 @@ int adns_processreadable(adns_state ads, int fd, const struct timeval *now) {
 	}
 	for (serv= 0;
 	     serv < ads->nservers &&
-	       !adns__sockaddr_equal_p(&udpaddr.sa,
-				       &ads->servers[serv].addr.sa);
+	       !adns__sockaddrs_equal(&udpaddr.sa,
+				      &ads->servers[serv].addr.sa);
 	     serv++);
 	if (serv >= ads->nservers) {
 	  adns__warn(ads,-1,0,"datagram received from unknown nameserver %s",