X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Fadns.c;h=bde99e21a53852ab1120259fca56e6a13fcd8800;hp=91b85d90377c8929135fbf6947645c9904e20a93;hb=9d95094ce421414fade949831eeb9dd3090328a7;hpb=80917fcce9e578aaf5ebb3b5146edeada875f206

diff --git a/src/adns.c b/src/adns.c
index 91b85d9..bde99e2 100644
--- a/src/adns.c
+++ b/src/adns.c
@@ -140,9 +140,8 @@ static const struct configcommandinfo {
   {  0                                   }
 };
 
-static int whitespace(int c) {
-  return c==' ' || c=='\n' || c=='\t';
-}
+static int ctype_whitespace(int c) { return c==' ' || c=='\n' || c=='\t'; }
+static int ctype_digit(int c) { return c>='0' && c<='9'; }
 
 static void readconfig(adns_state ads, const char *filename) {
   char linebuf[2000], *p, *q;
@@ -169,13 +168,13 @@ static void readconfig(adns_state ads, const char *filename) {
       if (c == EOF) break;
       continue;
     }
-    while (l>0 && whitespace(linebuf[l-1])) l--;
+    while (l>0 && ctype_whitespace(linebuf[l-1])) l--;
     linebuf[l]= 0;
     p= linebuf;
-    while (whitespace(*p)) p++;
+    while (ctype_whitespace(*p)) p++;
     if (*p == '#' || *p == '\n') continue;
     q= p;
-    while (*q && !whitespace(*q)) q++;
+    while (*q && !ctype_whitespace(*q)) q++;
     for (ccip=configcommandinfos;
 	 ccip->name && strncmp(ccip->name,p,q-p);
 	 ccip++);
@@ -183,7 +182,7 @@ static void readconfig(adns_state ads, const char *filename) {
       diag(ads,"%s:%d: unknown configuration directive `%.*s'",filename,lno,q-p,p);
       continue;
     }
-    while (whitespace(*q)) q++;
+    while (ctype_whitespace(*q)) q++;
     ccip->fn(ads,filename,lno,q);
   }
   if (ferror(file)) {
@@ -216,11 +215,10 @@ int adns_init(adns_state *ads_r, adns_initflags flags) {
   adns_state ads;
   const char *res_options, *adns_res_options;
   struct protoent *proto;
-  struct sockaddr_in udpaddr;
-  int udpaddrlen, r;
+  int r;
   
   ads= malloc(sizeof(*ads)); if (!ads) return errno;
-  ads->input.head= ads->input.tail= 0;
+  ads->tosend.head= ads->tosend.tail= 0;
   ads->timew.head= ads->timew.tail= 0;
   ads->childw.head= ads->childw.tail= 0;
   ads->output.head= ads->output.tail= 0;
@@ -260,23 +258,6 @@ int adns_init(adns_state *ads_r, adns_initflags flags) {
   proto= getprotobyname("udp"); if (!proto) { r= ENOPROTOOPT; goto x_free; }
   ads->udpsocket= socket(AF_INET,SOCK_DGRAM,proto->p_proto);
   if (!ads->udpsocket) { r= errno; goto x_closeudp; }
-
-  memset(&udpaddr,0,sizeof(udpaddr));
-  udpaddr.sin_family= AF_INET;
-  udpaddr.sin_addr.s_addr= INADDR_ANY;
-  udpaddr.sin_port= 0;
-  r= bind(ads->udpsocket,&udpaddr,sizeof(udpaddr));
-  if (r) { r= errno; goto x_closeudp; }
-
-  udpaddrlen= sizeof(udpaddr);
-  r= getsockname(ads->udpsocket,&udpaddr,&udpaddrlen);
-  if (r) { r= errno; goto x_closeudp; }
-  if (udpaddr.sin_family != AF_INET) {
-    diag(ads,"network API error: UDP socket not AF_INET but %lu",
-	 (unsigned long)udpaddr.sin_family);
-    r= EPROTOTYPE; goto x_closeudp;
-  }
-  debug(ads,"UDP socket is %s:%u",inet_ntoa(udpaddr.sin_addr),ntohs(udpaddr.sin_port));
   
   *ads_r= ads;
   return 0;
@@ -300,7 +281,8 @@ static void query_fail(adns_state ads, adns_query qu, adns_status stat) {
     ans->nrrs= 0;
   }
   qu->answer= ans;
-  LIST_LINK_TAIL(ads->input,qu);
+  qu->id= -1;
+  LIST_LINK_TAIL(ads->output,qu);
 }
 
 int adns_finish(adns_state ads) {
@@ -330,21 +312,34 @@ int adns_callback(adns_state ads, int maxfd,
 
 static int internal_check(adns_state ads,
 			  adns_query *query_io,
-			  adns_answer *answer,
-			  void *context_r) {
-  abort(); /* FIXME */
+			  adns_answer **answer,
+			  void **context_r) {
+  adns_query qu;
+
+  qu= *query_io;
+  if (!qu) {
+    if (!ads->output.head) return EWOULDBLOCK;
+    qu= ads->output.head;
+  } else {
+    if (qu->id>=0) return EWOULDBLOCK;
+  }
+  LIST_UNLINK(ads->output,qu);
+  *answer= qu->answer;
+  if (context_r) *context_r= qu->context;
+  free(qu);
+  return 0;
 }
 
 int adns_wait(adns_state ads,
 	      adns_query *query_io,
-	      adns_answer *answer,
-	      void *context_r) {
+	      adns_answer **answer_r,
+	      void **context_r) {
   int r, maxfd, rsel, rcb;
   fd_set readfds, writefds, exceptfds;
   struct timeval tvbuf, *tvp;
   
   for (;;) {
-    r= internal_check(ads,query_io,answer,context_r);
+    r= internal_check(ads,query_io,answer_r,context_r);
     if (r && r != EWOULDBLOCK) return r;
     FD_ZERO(&readfds); FD_ZERO(&writefds); FD_ZERO(&exceptfds);
     maxfd= 0; tvp= 0;
@@ -358,17 +353,17 @@ int adns_wait(adns_state ads,
 
 int adns_check(adns_state ads,
 	       adns_query *query_io,
-	       adns_answer *answer,
-	       void *context_r) {
+	       adns_answer **answer_r,
+	       void **context_r) {
   autosys(ads);
-  return internal_check(ads,query_io,answer,context_r);
+  return internal_check(ads,query_io,answer_r,context_r);
 }
 
 int adns_synchronous(adns_state ads,
 		     const char *owner,
 		     adns_rrtype type,
 		     adns_queryflags flags,
-		     adns_answer *answer) {
+		     adns_answer **answer_r) {
   adns_query qu;
   int r;
   
@@ -376,35 +371,89 @@ int adns_synchronous(adns_state ads,
   if (r) return r;
 
   do {
-    r= adns_wait(ads,&qu,answer,0);
+    r= adns_wait(ads,&qu,answer_r,0);
   } while (r==EINTR);
   if (r) adns_cancel(ads,qu);
   return r;
 }
 
-static int mkquery(adns_state ads,
-		   const char *owner,
-		   adns_rrtype type) {
-  abort();
+static adns_status mkquery(adns_state ads, const char *owner, int ol, int id,
+			   adns_rrtype type, adns_queryflags flags, int *qml_r) {
+  int ll, c, nlabs, qbufreq;
+  unsigned char label[255], *nqbuf;
+  const char *p, *pe;
+
+#define MKQUERY_ADDB(b) *nqbuf++= (b)
+#define MKQUERY_ADDW(w) (MKQUERY_ADDB(((w)>>8)&0x0ff), MKQUERY_ADDB((w)&0x0ff))
+
+  qbufreq= 12+strlen(owner)+3;
+  if (ads->qbufavail < qbufreq) {
+    nqbuf= realloc(ads->qbuf,qbufreq);
+    if (!nqbuf) return adns_s_nolocalmem;
+    ads->qbuf= nqbuf; ads->qbufavail= qbufreq;
+  }
+  nqbuf= ads->qbuf;
+  
+  MKQUERY_ADDW(id);
+  MKQUERY_ADDB(0x01); /* QR=Q(0), OPCODE=QUERY(0000), !AA, !TC, RD */
+  MKQUERY_ADDB(0x00); /* !RA, Z=000, RCODE=NOERROR(0000) */
+  MKQUERY_ADDW(1); /* QDCOUNT=1 */
+  MKQUERY_ADDW(0); /* ANCOUNT=0 */
+  MKQUERY_ADDW(0); /* NSCOUNT=0 */
+  MKQUERY_ADDW(0); /* ARCOUNT=0 */
+  p= owner; pe= owner+ol;
+  nlabs= 0;
+  if (!*p) return adns_s_invaliddomain;
+  do {
+    ll= 0;
+    while (p!=pe && (c= *p++)!='.') {
+      if (c=='\\') {
+	if (!(flags & adns_f_anyquote)) return adns_s_invaliddomain;
+	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_invaliddomain;
+	  } else {
+	    return adns_s_invaliddomain;
+	  }
+	} else if (!(c= *p++)) {
+	  return adns_s_invaliddomain;
+	}
+      }
+      if (!(flags & adns_f_anyquote)) {
+	if ((c >= '0' && c <= '9') || c == '-') {
+	  if (!ll) return adns_s_invaliddomain;
+	} else if ((c < 'a' || c > 'z') && (c < 'A' && c > 'Z')) {
+	  return adns_s_invaliddomain;
+	}
+      }
+      if (ll == sizeof(label)) return adns_s_invaliddomain;
+      label[ll++]= c;
+    }
+    if (!ll) return adns_s_invaliddomain;
+    if (nlabs++ > 63) return adns_s_invaliddomain;
+    MKQUERY_ADDB(ll);
+    memcpy(nqbuf,label,ll); nqbuf+= ll;
+  } while (p!=pe);
+
+  MKQUERY_ADDB(0);
+  MKQUERY_ADDW(type & adns__rrt_typemask); /* QTYPE */
+  MKQUERY_ADDW(1); /* QCLASS=IN */
+
+  *qml_r= nqbuf - ads->qbuf;
+  
+  return adns_s_ok;
 }
 
-int adns_submit(adns_state ads,
-		const char *owner,
-		adns_rrtype type,
-		adns_queryflags flags,
-		void *context,
-		adns_query *query_r) {
+static adns_query allocquery(adns_state ads, const char *owner, int ol,
+			     int qml, int id, adns_rrtype type,
+			     adns_queryflags flags, void *context) {
   adns_query qu;
-  adns_status stat;
-  int ol;
-
-  stat= 0;
-  ol= strlen(owner);
-  if (ol>MAXDNAME+1) { stat= adns_s_invaliddomain; ol= 0; }
-  if (ol>0 && owner[ol-1]=='.') { flags &= ~adns_f_search; ol--; }
-  qu= malloc(sizeof(*qu)+ol+1); if (!qu) return errno;
+  unsigned char *qm;
+  
+  qu= malloc(sizeof(*qu)+ol+1+qml); if (!qu) return 0;
   qu->next= qu->back= qu->parent= qu->child= 0;
-  qu->id= ads->nextid++;
+  qu->id= id;
   qu->type= type;
   qu->answer= 0;
   qu->flags= flags;
@@ -413,16 +462,59 @@ int adns_submit(adns_state ads,
   qu->sentudp= qu->senttcp= 0;
   qu->nextserver= 0;
   memcpy(qu->owner,owner,ol); qu->owner[ol]= 0;
+  qu->querymsg= qm= qu->owner+ol+1;
+  memcpy(qm,ads->qbuf,qml);
+  qu->querylen= qml;
+  return qu;
+}
 
+static int failsubmit(adns_state ads, void *context, adns_query *query_r,
+		      adns_rrtype type, adns_queryflags flags,
+		      int id, adns_status stat) {
+  adns_query qu;
+
+  qu= allocquery(ads,0,0,0,id,type,flags,context); if (!qu) return errno;
+  query_fail(ads,qu,stat);
+  *query_r= qu;
+  return 0;
+}
 
-  mkquery(ads,owner,type);
+static void trysendudp(adns_state ads, adns_query qu) {
+  struct sockaddr_in servaddr;
+  /* FIXME: _f_usevc not implemented */
+  memset(&servaddr,0,sizeof(servaddr));
+  servaddr.sin_family= AF_INET;
+  servaddr.sin_addr= ads->servers[qu->nextserver].addr;
+  servaddr.sin_port= htons(53);
+  sendto(ads->udpsocket,qu->querymsg,qu->querylen,0,&servaddr,sizeof(servaddr));
+}
+
+int adns_submit(adns_state ads,
+		const char *owner,
+		adns_rrtype type,
+		adns_queryflags flags,
+		void *context,
+		adns_query *query_r) {
+  adns_query qu;
+  adns_status stat;
+  int ol, id, qml;
+
+  id= ads->nextid++;
+
+  ol= strlen(owner);
+  if (ol<=1 || ol>MAXDNAME+1)
+    return failsubmit(ads,context,query_r,type,flags,id,adns_s_invaliddomain);
+  if (owner[ol-1]=='.' && owner[ol-2]!='\\') { flags &= ~adns_f_search; ol--; }
+
+  stat= mkquery(ads,owner,ol,id,type,flags,&qml);
+  if (stat) return failsubmit(ads,context,query_r,type,flags,id,stat);
+
+  qu= allocquery(ads,owner,ol,qml,id,type,flags,context); if (!qu) return errno;
+
+  LIST_LINK_TAIL(ads->tosend,qu);
+  trysendudp(ads,qu);
+  autosys(ads);
 
-  if (stat) {
-    query_fail(ads,qu,stat);
-  } else {
-    LIST_LINK_TAIL(ads->input,qu);
-    autosys(ads);
-  }
   *query_r= qu;
   return 0;
 }