X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/39f45e7e0051167558b7efd0266462ec5f998999..e4007092f843cf382791448bcb839ff13c13c535:/src/transmit.c

diff --git a/src/transmit.c b/src/transmit.c
index 7afb90f..212c6ec 100644
--- a/src/transmit.c
+++ b/src/transmit.c
@@ -74,55 +74,11 @@ static adns_status mkquery_footer(vbuf *vb, adns_rrtype type) {
   return adns_s_ok;
 }
 
-adns_status adns__qdpl_normal(adns_state ads,
-			      const char **p_io, const char *pe, int labelnum,
-			      char label_r[], int *ll_io,
-			      adns_queryflags flags,
-			      const typeinfo *typei) {
-  int ll, c;
-  const char *p;
-
-  ll= 0;
-  p= *p_io;
-  
-  while (p!=pe && (c= *p++)!='.') {
-    if (c=='\\') {
-      if (!(flags & adns_qf_quoteok_query)) return adns_s_querydomaininvalid;
-      if (ctype_digit(p[0])) {
-	if (p+1==pe || p+2==pe) return adns_s_querydomaininvalid;
-	if (ctype_digit(p[1]) && ctype_digit(p[2])) {
-	  c= (*p++ - '0')*100;
-	  c += (*p++ - '0')*10;
-	  c += (*p++ - '0');
-	  if (c >= 256) return adns_s_querydomaininvalid;
-	} else {
-	  return adns_s_querydomaininvalid;
-	}
-      } else if (!(c= *p++)) {
-	return adns_s_querydomaininvalid;
-      }
-    }
-    if (!(flags & adns_qf_quoteok_query)) {
-      if (c == '-') {
-	if (!ll) return adns_s_querydomaininvalid;
-      } else if (!ctype_alpha(c) && !ctype_digit(c)) {
-	return adns_s_querydomaininvalid;
-      }
-    }
-    if (ll == *ll_io) return adns_s_querydomaininvalid;
-    label_r[ll++]= c;
-  }
-  
-  *p_io= p;
-  *ll_io= ll;
-  return adns_s_ok;
-}
-
 adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
 			  const char *owner, int ol,
 			  const typeinfo *typei, adns_rrtype type,
 			  adns_queryflags flags) {
-  int labelnum, ll, nbytes;
+  int labelnum, ll, c, nbytes;
   byte label[255];
   byte *rqp;
   const char *p, *pe;
@@ -136,11 +92,28 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
   nbytes= 0;
   labelnum= 0;
   while (p!=pe) {
-    ll= sizeof(label);
-    st= typei->qdparselabel(ads, &p,pe, labelnum++, label, &ll, flags, typei);
-    if (st) return st;
+
+    ll= 0;
+    while (p!=pe && (c= *p++)!='.') {
+      if (c=='\\') {
+	if (ctype_digit(p[0])) {
+	  if (p+1==pe || p+2==pe) return adns_s_querydomaininvalid;
+	  if (ctype_digit(p[1]) && ctype_digit(p[2])) {
+	    c= (*p++ - '0')*100;
+	    c += (*p++ - '0')*10;
+	    c += (*p++ - '0');
+	    if (c >= 256) return adns_s_querydomaininvalid;
+	  } else {
+	    return adns_s_querydomaininvalid;
+	  }
+	} else if (!(c= *p++)) {
+	  return adns_s_querydomaininvalid;
+	}
+      }
+      if (ll >= DNS_MAXLABEL) return adns_s_querydomaintoolong;
+      label[ll++]= c;
+    }
     if (!ll) return adns_s_querydomaininvalid;
-    if (ll > DNS_MAXLABEL) return adns_s_querydomaintoolong;
     nbytes+= ll+1;
     if (nbytes >= DNS_MAXDOMAIN) return adns_s_querydomaintoolong;
     MKQUERY_ADDB(ll);
@@ -250,9 +223,11 @@ static void query_usetcp(adns_query qu, struct timeval now) {
 }
 
 void adns__query_send(adns_query qu, struct timeval now) {
-  struct sockaddr_in servaddr;
-  int serv, r;
+  int serv, r, i;
   adns_state ads;
+  int fd = -1;
+  struct udpsocket *udp;
+  adns_rr_addr *addr;
 
   assert(qu->state == query_tosend);
   if ((qu->flags & adns_qf_usevc) || (qu->query_dglen > DNS_MAXUDP)) {
@@ -265,16 +240,17 @@ 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];
+  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);
   
-  r= sendto(ads->udpsocket,qu->query_dgram,qu->query_dglen,0,
-	    (const struct sockaddr*)&servaddr,sizeof(servaddr));
+  r= sendto(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);