X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftransmit.c;h=33a8cc2e4254d6285b301c87fc6467ee06626ef8;hb=d8c062faeda8147546f1e709171f7f0767331954;hp=46d2cbf78f9027075baad08723c67355f936e9bd;hpb=e062dcae8f9acfc112459cf7b2d8c925cda08249;p=adns.git

diff --git a/src/transmit.c b/src/transmit.c
index 46d2cbf..33a8cc2 100644
--- a/src/transmit.c
+++ b/src/transmit.c
@@ -4,7 +4,7 @@
  * - send queries
  */
 /*
- *  This file is part of adns, which is Copyright (C) 1997, 1998 Ian Jackson
+ *  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
  *  
  *  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
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <string.h>
 
+#include <sys/types.h>
 #include <sys/uio.h>
 
 #include "internal.h"
@@ -37,13 +38,12 @@ static adns_status mkquery_header(adns_state ads, vbuf *vb, int *id_r, int qdlen
   int id;
   byte *rqp;
   
-  if (!adns__vbuf_ensure(vb,DNS_HDRSIZE+qdlen+4)) return adns_s_nolocalmem;
+  if (!adns__vbuf_ensure(vb,DNS_HDRSIZE+qdlen+4)) return adns_s_nomemory;
 
-  *id_r= id= (ads->nextid++) & 0x0ffff;
-  
   vb->used= 0;
   MKQUERY_START(vb);
   
+  *id_r= id= (ads->nextid++) & 0x0ffff;
   MKQUERY_ADDW(id);
   MKQUERY_ADDB(0x01); /* QR=Q(0), OPCODE=QUERY(0000), !AA, !TC, RD */
   MKQUERY_ADDB(0x00); /* !RA, Z=000, RCODE=NOERROR(0000) */
@@ -83,38 +83,37 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
 
   p= owner; pe= owner+ol;
   nlabs= 0;
-  if (!*p) return adns_s_invalidquerydomain;
-  do {
+  while (p!=pe) {
     ll= 0;
     while (p!=pe && (c= *p++)!='.') {
       if (c=='\\') {
-	if (!(flags & adns_qf_anyquote)) return adns_s_invalidquerydomain;
+	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_invalidquerydomain;
+	    if (c >= 256) return adns_s_querydomaininvalid;
 	  } else {
-	    return adns_s_invalidquerydomain;
+	    return adns_s_querydomaininvalid;
 	  }
 	} else if (!(c= *p++)) {
-	  return adns_s_invalidquerydomain;
+	  return adns_s_querydomaininvalid;
 	}
       }
-      if (!(flags & adns_qf_anyquote)) {
+      if (!(flags & adns_qf_quoteok_query)) {
 	if (c == '-') {
-	  if (!ll) return adns_s_invalidquerydomain;
+	  if (!ll) return adns_s_querydomaininvalid;
 	} else if (!ctype_alpha(c) && !ctype_digit(c)) {
-	  return adns_s_invalidquerydomain;
+	  return adns_s_querydomaininvalid;
 	}
       }
-      if (ll == sizeof(label)) return adns_s_invalidquerydomain;
+      if (ll == sizeof(label)) return adns_s_querydomaininvalid;
       label[ll++]= c;
     }
-    if (!ll) return adns_s_invalidquerydomain;
-    if (nlabs++ > 63) return adns_s_domaintoolong;
+    if (!ll) return adns_s_querydomaininvalid;
+    if (nlabs++ > 63) return adns_s_querydomaintoolong;
     MKQUERY_ADDB(ll);
     memcpy(rqp,label,ll); rqp+= ll;
-  } while (p!=pe);
+  }
   MKQUERY_ADDB(0);
 
   MKQUERY_STOP(vb);
@@ -179,7 +178,9 @@ void adns__query_tcp(adns_query qu, struct timeval now) {
     iov[0].iov_len= 2;
     iov[1].iov_base= qu->query_dgram;
     iov[1].iov_len= qu->query_dglen;
+    adns__sigpipe_protect(qu->ads);
     wr= writev(qu->ads->tcpsocket,iov,2);
+    adns__sigpipe_unprotect(qu->ads);
     if (wr < 0) {
       if (!(errno == EAGAIN || errno == EINTR || errno == ENOSPC ||
 	    errno == ENOBUFS || errno == ENOMEM)) {
@@ -210,12 +211,12 @@ static void query_usetcp(adns_query qu, struct timeval now) {
   adns__tcp_tryconnect(qu->ads,now);
 }
 
-void adns__query_udp(adns_query qu, struct timeval now) {
+void adns__query_send(adns_query qu, struct timeval now) {
   struct sockaddr_in servaddr;
   int serv, r;
   adns_state ads;
 
-  assert(qu->state == query_udp);
+  assert(qu->state == query_tosend);
   if ((qu->flags & adns_qf_usevc) || (qu->query_dglen > DNS_MAXUDP)) {
     query_usetcp(qu,now);
     return;
@@ -234,7 +235,8 @@ void adns__query_udp(adns_query qu, struct timeval now) {
   servaddr.sin_addr= ads->servers[serv].addr;
   servaddr.sin_port= htons(DNS_PORT);
   
-  r= sendto(ads->udpsocket,qu->query_dgram,qu->query_dglen,0,&servaddr,sizeof(servaddr));
+  r= sendto(ads->udpsocket,qu->query_dgram,qu->query_dglen,0,
+	    (const struct sockaddr*)&servaddr,sizeof(servaddr));
   if (r<0 && errno == EMSGSIZE) { query_usetcp(qu,now); return; }
   if (r<0) adns__warn(ads,serv,0,"sendto failed: %s",strerror(errno));