src/types.c: Start on IPv6 support in adns_r_addr queries.

[adns.git] / src / transmit.c

diff --git a/src/transmit.c b/src/transmit.c
index 56140b48d9323e793200788ad99d44b25e1ae5e6..be72cf237e1f23d6e4a5ef00e286e8bdc2e9605e 100644 (file)
--- a/src/transmit.c
+++ b/src/transmit.c
@@ -120,7 +120,6 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
   const char *p, *pe;
   adns_status st;
 
-  if (!((type^adns_r_addr) & adns_rrt_reprmask)) ads->nextid++; /* bodge */
   st= mkquery_header(ads,vb,id_r,ol+2); if (st) return st;
   
   MKQUERY_START(vb);
@@ -156,7 +155,6 @@ adns_status adns__mkquery_frdgram(adns_state ads, vbuf *vb, int *id_r,
   int lablen, labstart;
   adns_status st;
 
-  if (!((type^adns_r_addr) & adns_rrt_reprmask)) ads->nextid++; /* bodge */
   st= mkquery_header(ads,vb,id_r,qd_dglen); if (st) return st;
 
   MKQUERY_START(vb);
@@ -242,10 +240,18 @@ static void query_usetcp(adns_query qu, struct timeval 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) {
-  struct sockaddr_in servaddr;
   int serv, r;
   adns_state ads;
+  struct udpsocket *udp;
+  adns_rr_addr *addr;
 
   assert(qu->state == query_tosend);
   if ((qu->flags & adns_qf_usevc) || (qu->query_dglen > DNS_MAXUDP)) {
@@ -258,16 +264,14 @@ void adns__query_send(adns_query qu, struct timeval now) {
     return;
   }
 
-  serv= qu->udpnextserver;
-  memset(&servaddr,0,sizeof(servaddr));
-
   ads= qu->ads;
-  servaddr.sin_family= AF_INET;
-  servaddr.sin_addr= ads->servers[serv].addr;
-  servaddr.sin_port= htons(DNS_PORT);
+  serv= qu->udpnextserver;
+  addr= &ads->servers[serv];
+  udp= adns__udpsocket_by_af(ads, addr->addr.sa.sa_family);
+  assert(udp);
   
-  r= sendto(ads->udpsocket,qu->query_dgram,qu->query_dglen,0,
-           (const struct sockaddr*)&servaddr,sizeof(servaddr));
+  r= sendto(udp->fd,qu->query_dgram,qu->query_dglen,0,
+           &addr->addr.sa,addr->len);
   if (r<0 && errno == EMSGSIZE) {
     qu->retries= 0;
     query_usetcp(qu,now);