X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftransmit.c;h=549bc7d8ecb74032d4f575112ba03b1bba0d1904;hb=7f8bbe29436e29cc2683955d642f79a10d62f67d;hp=7ae2464d4537c55a63072a04c54290eb41aec4e2;hpb=3d5cde09d167be1609d27d0d93de2096250a310c;p=adns.git

diff --git a/src/transmit.c b/src/transmit.c
index 7ae2464..549bc7d 100644
--- a/src/transmit.c
+++ b/src/transmit.c
@@ -4,16 +4,15 @@
  * - 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 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
- *  the Free Software Foundation; either version 2, or (at your option)
+ *  the Free Software Foundation; either version 3, or (at your option)
  *  any later version.
  *  
  *  This program is distributed in the hope that it will be useful,
@@ -39,7 +38,8 @@
 #define MKQUERY_ADDW(w) (MKQUERY_ADDB(((w)>>8)&0x0ff), MKQUERY_ADDB((w)&0x0ff))
 #define MKQUERY_STOP(vb) ((vb)->used= rqp-(vb)->buf)
 
-static adns_status mkquery_header(adns_state ads, vbuf *vb, int *id_r, int qdlen) {
+static adns_status mkquery_header(adns_state ads, vbuf *vb,
+				  int *id_r, int qdlen) {
   int id;
   byte *rqp;
   
@@ -66,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);
@@ -74,11 +74,49 @@ static adns_status mkquery_footer(vbuf *vb, adns_rrtype type) {
   return adns_s_ok;
 }
 
+static adns_status qdparselabel(adns_state ads,
+				const char **p_io, const char *pe,
+				char label_r[], int *ll_io,
+				adns_queryflags flags) {
+  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 (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_queryflags flags) {
-  int ll, c, nbytes;
-  byte label[255], *rqp;
+			  const typeinfo *typei, adns_rrtype type,
+			  adns_queryflags flags) {
+  int ll, nbytes;
+  byte label[255];
+  byte *rqp;
   const char *p, *pe;
   adns_status st;
 
@@ -89,31 +127,9 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
   p= owner; pe= owner+ol;
   nbytes= 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 (ctype_digit(p[1]) && ctype_digit(p[2])) {
-	    c= (*p++ - '0')*100 + (*p++ - '0')*10 + (*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 == sizeof(label)) return adns_s_querydomaininvalid;
-      label[ll++]= c;
-    }
+    ll= sizeof(label);
+    st= qdparselabel(ads, &p,pe, label, &ll, flags);
+    if (st) return st;
     if (!ll) return adns_s_querydomaininvalid;
     if (ll > DNS_MAXLABEL) return adns_s_querydomaintoolong;
     nbytes+= ll+1;
@@ -125,13 +141,14 @@ 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;
 }
 
 adns_status adns__mkquery_frdgram(adns_state ads, vbuf *vb, int *id_r,
-				  const byte *qd_dgram, int qd_dglen, int qd_begin,
+				  const byte *qd_dgram, int qd_dglen,
+				  int qd_begin,
 				  adns_rrtype type, adns_queryflags flags) {
   byte *rqp;
   findlabel_state fls;
@@ -174,7 +191,8 @@ void adns__querysend_tcp(adns_query qu, struct timeval now) {
   length[1]= (qu->query_dglen&0x0ff);
 
   ads= qu->ads;
-  if (!adns__vbuf_ensure(&ads->tcpsend,ads->tcpsend.used+qu->query_dglen+2)) return;
+  if (!adns__vbuf_ensure(&ads->tcpsend,ads->tcpsend.used+qu->query_dglen+2))
+    return;
 
   qu->retries++;
 
@@ -208,7 +226,8 @@ void adns__querysend_tcp(adns_query qu, struct timeval now) {
     wr-= 2;
   }
   if (wr<qu->query_dglen) {
-    r= adns__vbuf_append(&ads->tcpsend,qu->query_dgram+wr,qu->query_dglen-wr); assert(r);
+    r= adns__vbuf_append(&ads->tcpsend,qu->query_dgram+wr,qu->query_dglen-wr);
+    assert(r);
   }
 }
 
@@ -221,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->nudpsockets; i++)
+    if (ads->udpsockets[i].af == af) return &ads->udpsockets[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)) {
@@ -237,18 +264,21 @@ 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));
-  if (r<0 && errno == EMSGSIZE) { qu->retries= 0; query_usetcp(qu,now); return; }
-  if (r<0) adns__warn(ads,serv,0,"sendto failed: %s",strerror(errno));
+  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);
+    return;
+  }
+  if (r<0 && errno != EAGAIN)
+    adns__warn(ads,serv,0,"sendto failed: %s",strerror(errno));
   
   qu->timeout= now;
   timevaladd(&qu->timeout,UDPRETRYMS);