src/setup.c, src/transmit.c: New function finds udpsocket by AF.

[adns] / src / transmit.c

diff --git a/src/transmit.c b/src/transmit.c
index 212c6ec2ff40c50cf65c92a9116db1e54122ede3..63e222c23356784655a7b805ce02371b79554b8d 100644 (file)
--- a/src/transmit.c
+++ b/src/transmit.c
@@ -222,10 +222,16 @@ static void query_usetcp(adns_query qu, struct timeval now) {
   adns__tcp_tryconnect(qu->ads,now);
 }
 
   adns__tcp_tryconnect(qu->ads,now);
 }
 

+struct udpsocket *adns__udpsocket_by_af(adns_state ads, int af) {
+  int i;
+  for (i=0; i<ads->nudp; i++)
+    if (ads->udpsocket[i].af == af) return &ads->udpsocket[i];
+  return 0;
+}
+

 void adns__query_send(adns_query qu, struct timeval now) {
   int serv, r, i;
   adns_state ads;
 void adns__query_send(adns_query qu, struct timeval now) {
   int serv, r, i;
   adns_state ads;

-  int fd = -1;

   struct udpsocket *udp;
   adns_rr_addr *addr;
 
   struct udpsocket *udp;
   adns_rr_addr *addr;
 


@@ -243,13 +249,10 @@ void adns__query_send(adns_query qu, struct timeval now) {
   ads= qu->ads;
   serv= qu->udpnextserver;
   addr= &ads->servers[serv];
   ads= qu->ads;
   serv= qu->udpnextserver;
   addr= &ads->servers[serv];

-  for (i = 0; i < ads->nudp; i++) {
-    udp = &ads->udpsocket[i];
-    if (udp->ai->af == addr->addr.sa.sa_family) { fd = udp->fd; break; }
-  }
-  assert(fd >= 0);
+  udp= adns__udpsocket_by_af(ads, addr->addr.sa.sa_family);
+  assert(udp);

   
   

-  r= sendto(fd,qu->query_dgram,qu->query_dglen,0,
+  r= sendto(udp->fd,qu->query_dgram,qu->query_dglen,0,

            &addr->addr.sa,addr->len);
   if (r<0 && errno == EMSGSIZE) {
     qu->retries= 0;
            &addr->addr.sa,addr->len);
   if (r<0 && errno == EMSGSIZE) {
     qu->retries= 0;