X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/9c344a4295bf94dbd4690f35b4d8722398af3913..ef514bbcec865ded4d2d040358e13c7432c15e1a:/src/transmit.c

diff --git a/src/transmit.c b/src/transmit.c
index 3b14822..212c6ec 100644
--- a/src/transmit.c
+++ b/src/transmit.c
@@ -4,12 +4,11 @@
  * - send queries
  */
 /*
- *  This file is
- *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
- *
- *  It is part of adns, which is
- *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
- *    Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
+ *  This file is part of adns, which is
+ *    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+ *    Copyright (C) 1999-2000,2003,2006  Tony Finch
+ *    Copyright (C) 1991 Massachusetts Institute of Technology
+ *  (See the file INSTALL for full details.)
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -67,7 +66,7 @@ static adns_status mkquery_footer(vbuf *vb, adns_rrtype type) {
   byte *rqp;
 
   MKQUERY_START(vb);
-  MKQUERY_ADDW(type & adns__rrt_typemask); /* QTYPE */
+  MKQUERY_ADDW(type & adns_rrt_typemask); /* QTYPE */
   MKQUERY_ADDW(DNS_CLASS_IN); /* QCLASS=IN */
   MKQUERY_STOP(vb);
   assert(vb->used <= vb->avail);
@@ -77,9 +76,11 @@ static adns_status mkquery_footer(vbuf *vb, adns_rrtype type) {
 
 adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
 			  const char *owner, int ol,
-			  const typeinfo *typei, adns_queryflags flags) {
-  int ll, c, nbytes;
-  byte label[255], *rqp;
+			  const typeinfo *typei, adns_rrtype type,
+			  adns_queryflags flags) {
+  int labelnum, ll, c, nbytes;
+  byte label[255];
+  byte *rqp;
   const char *p, *pe;
   adns_status st;
 
@@ -89,14 +90,18 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
 
   p= owner; pe= owner+ol;
   nbytes= 0;
+  labelnum= 0;
   while (p!=pe) {
+
     ll= 0;
     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 + (*p++ - '0')*10 + (*p++ - '0');
+	    c= (*p++ - '0')*100;
+	    c += (*p++ - '0')*10;
+	    c += (*p++ - '0');
 	    if (c >= 256) return adns_s_querydomaininvalid;
 	  } else {
 	    return adns_s_querydomaininvalid;
@@ -105,18 +110,10 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
 	  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 == sizeof(label)) 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);
@@ -126,7 +123,7 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
 
   MKQUERY_STOP(vb);
   
-  st= mkquery_footer(vb,typei->type);
+  st= mkquery_footer(vb,type);
   
   return adns_s_ok;
 }
@@ -226,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)) {
@@ -241,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);