X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Fsetup.c;h=a0828703f8f55ddcc95c374a9f1b1cfd15844b15;hp=78333563ccbb55901f72d0bf2b7e70696acbc75a;hb=138722f000939e5a176b27d498c76681bdf04860;hpb=a1d593db283023f2f7763df26389eb6a54b82d7f

diff --git a/src/setup.c b/src/setup.c
index 7833356..a082870 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -4,7 +4,11 @@
  * - management of global state
  */
 /*
- *  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+ *  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
@@ -23,39 +27,51 @@
 
 #include <stdlib.h>
 #include <errno.h>
-#include <string.h>
 #include <limits.h>
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <sys/types.h>
 #include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include "internal.h"
 
-static void readconfig(adns_state ads, const char *filename);
+static void readconfig(adns_state ads, const char *filename, int warnmissing);
 
-static void addserver(adns_state ads, struct in_addr addr) {
+static void addserver(adns_state ads, const struct sockaddr *sa, int n) {
   int i;
-  struct server *ss;
+  adns_rr_addr *ss;
+  char buf[ADNS_ADDR2TEXT_BUFLEN];
   
   for (i=0; i<ads->nservers; i++) {
-    if (ads->servers[i].addr.s_addr == addr.s_addr) {
-      adns__debug(ads,-1,0,"duplicate nameserver %s ignored",inet_ntoa(addr));
+    if (adns__sockaddr_equal_p(sa, &ads->servers[i].addr.sa)) {
+      adns__debug(ads,-1,0,"duplicate nameserver %s ignored",
+		  adns__sockaddr_ntoa(sa, buf));
       return;
     }
   }
   
   if (ads->nservers>=MAXSERVERS) {
-    adns__diag(ads,-1,0,"too many nameservers, ignoring %s",inet_ntoa(addr));
+    adns__diag(ads,-1,0,"too many nameservers, ignoring %s",
+	       adns__sockaddr_ntoa(sa, buf));
     return;
   }
 
   ss= ads->servers+ads->nservers;
-  ss->addr= addr;
+  assert(n <= sizeof(ss->addr));
+  ss->len = n;
+  memcpy(&ss->addr, sa, n);
   ads->nservers++;
 }
 
+static void freesearchlist(adns_state ads) {
+  if (ads->nsearchlist) free(*ads->searchlist);
+  free(ads->searchlist);
+}
+
 static void saveerr(adns_state ads, int en) {
   if (!ads->configerrno) ads->configerrno= en;
 }
@@ -65,14 +81,14 @@ static void configparseerr(adns_state ads, const char *fn, int lno,
   va_list al;
 
   saveerr(ads,EINVAL);
-  if (!ads->diagfile || (ads->iflags & adns_if_noerrprint)) return;
+  if (!ads->logfn || (ads->iflags & adns_if_noerrprint)) return;
 
-  if (lno==-1) fprintf(ads->diagfile,"adns: %s: ",fn);
-  else fprintf(ads->diagfile,"adns: %s:%d: ",fn,lno);
+  if (lno==-1) adns__lprintf(ads,"adns: %s: ",fn);
+  else adns__lprintf(ads,"adns: %s:%d: ",fn,lno);
   va_start(al,fmt);
-  vfprintf(ads->diagfile,fmt,al);
+  adns__vlprintf(ads,fmt,al);
   va_end(al);
-  fputc('\n',ads->diagfile);
+  adns__lprintf(ads,"\n");
 }
 
 static int nextword(const char **bufp_io, const char **word_r, int *l_r) {
@@ -92,18 +108,32 @@ static int nextword(const char **bufp_io, const char **word_r, int *l_r) {
   return 1;
 }
 
-static void ccf_nameserver(adns_state ads, const char *fn, int lno, const char *buf) {
-  struct in_addr ia;
-  
-  if (!inet_aton(buf,&ia)) {
+static void ccf_nameserver(adns_state ads, const char *fn,
+			   int lno, const char *buf) {
+  adns_rr_addr a;
+  char addrbuf[ADNS_ADDR2TEXT_BUFLEN];
+  int err;
+
+  a.len= sizeof(a.addr);
+  err= adns_text2addr(buf,DNS_PORT, 0, &a.addr.sa,&a.len);
+  switch (err) {
+  case 0:
+    break;
+  case EINVAL:
     configparseerr(ads,fn,lno,"invalid nameserver address `%s'",buf);
     return;
+  default:
+    configparseerr(ads,fn,lno,"failed to parse nameserver address `%s': %s",
+		   buf,strerror(err));
+    return;
   }
-  adns__debug(ads,-1,0,"using nameserver %s",inet_ntoa(ia));
-  addserver(ads,ia);
+  adns__debug(ads,-1,0,"using nameserver %s",
+	      adns__sockaddr_ntoa(&a.addr.sa, addrbuf));
+  addserver(ads,&a.addr.sa,a.len);
 }
 
-static void ccf_search(adns_state ads, const char *fn, int lno, const char *buf) {
+static void ccf_search(adns_state ads, const char *fn,
+		       int lno, const char *buf) {
   const char *bufp, *word;
   char *newchars, **newptrs, **pp;
   int count, tl, l;
@@ -115,8 +145,11 @@ static void ccf_search(adns_state ads, const char *fn, int lno, const char *buf)
   tl= 0;
   while (nextword(&bufp,&word,&l)) { count++; tl += l+1; }
 
-  newptrs= malloc(sizeof(char*)*count);  if (!newptrs) { saveerr(ads,errno); return; }
-  newchars= malloc(tl);  if (!newchars) { saveerr(ads,errno); free(newptrs); return; }
+  newptrs= malloc(sizeof(char*)*count);
+  if (!newptrs) { saveerr(ads,errno); return; }
+
+  newchars= malloc(tl);
+  if (!newchars) { saveerr(ads,errno); free(newptrs); return; }
 
   bufp= buf;
   pp= newptrs;
@@ -127,24 +160,42 @@ static void ccf_search(adns_state ads, const char *fn, int lno, const char *buf)
     *newchars++ = 0;
   }
 
-  free(ads->searchlist);
+  freesearchlist(ads);
   ads->nsearchlist= count;
   ads->searchlist= newptrs;
 }
 
-static void ccf_sortlist(adns_state ads, const char *fn, int lno, const char *buf) {
+static int gen_pton(const char *text, int *af_io, union gen_addr *a) {
+  adns_rr_addr addr;
+  int err;
+
+  addr.len= sizeof(addr.addr);
+  err= adns_text2addr(text,0, adns_qf_addrlit_scope_forbid,
+		      &addr.addr.sa, &addr.len);
+  if (err) { assert(err == EINVAL); return 0; }
+  if (*af_io == AF_UNSPEC) *af_io= addr.addr.sa.sa_family;
+  else if (*af_io != addr.addr.sa.sa_family) return 0;
+  adns__sockaddr_extract(&addr.addr.sa, a, 0);
+  return 1;
+}
+
+static void ccf_sortlist(adns_state ads, const char *fn,
+			 int lno, const char *buf) {
   const char *word;
   char tbuf[200], *slash, *ep;
-  struct in_addr base, mask;
+  const char *maskwhat;
+  struct sortlist *sl;
   int l;
-  unsigned long initial, baselocal;
+  int af;
+  int initial= -1;
 
   if (!buf) return;
   
   ads->nsortlist= 0;
   while (nextword(&buf,&word,&l)) {
     if (ads->nsortlist >= MAXSORTLIST) {
-      adns__diag(ads,-1,0,"too many sortlist entries, ignoring %.*s onwards",l,word);
+      adns__diag(ads,-1,0,"too many sortlist entries,"
+		 " ignoring %.*s onwards",l,word);
       return;
     }
 
@@ -156,58 +207,64 @@ static void ccf_sortlist(adns_state ads, const char *fn, int lno, const char *bu
     memcpy(tbuf,word,l); tbuf[l]= 0;
     slash= strchr(tbuf,'/');
     if (slash) *slash++= 0;
-    
-    if (!inet_aton(tbuf,&base)) {
+
+    sl= &ads->sortlist[ads->nsortlist];
+    af= AF_UNSPEC;
+    if (!gen_pton(tbuf, &af, &sl->base)) {
       configparseerr(ads,fn,lno,"invalid address `%s' in sortlist",tbuf);
       continue;
     }
 
     if (slash) {
-      if (strchr(slash,'.')) {
-	if (!inet_aton(slash,&mask)) {
+      if (slash[strspn(slash, "0123456789")]) {
+	maskwhat = "mask";
+	if (!gen_pton(slash,&af,&sl->mask)) {
 	  configparseerr(ads,fn,lno,"invalid mask `%s' in sortlist",slash);
 	  continue;
 	}
-	if (base.s_addr & ~mask.s_addr) {
-	  configparseerr(ads,fn,lno,
-			 "mask `%s' in sortlist overlaps address `%s'",slash,tbuf);
-	  continue;
-	}
       } else {
+	maskwhat = "prefix length";
 	initial= strtoul(slash,&ep,10);
-	if (*ep || initial>32) {
+	if (*ep || initial>adns__addr_width(af)) {
 	  configparseerr(ads,fn,lno,"mask length `%s' invalid",slash);
 	  continue;
 	}
-	mask.s_addr= htonl((0x0ffffffffUL) << (32-initial));
+	adns__prefix_mask(af, initial, &sl->mask);
       }
     } else {
-      baselocal= ntohl(base.s_addr);
-      if (!baselocal & 0x080000000UL) /* class A */
-	mask.s_addr= htonl(0x0ff000000UL);
-      else if ((baselocal & 0x0c0000000UL) == 0x080000000UL)
-	mask.s_addr= htonl(0x0ffff0000UL); /* class B */
-      else if ((baselocal & 0x0f0000000UL) == 0x0e0000000UL)
-	mask.s_addr= htonl(0x0ff000000UL); /* class C */
-      else {
-	configparseerr(ads,fn,lno,
-		       "network address `%s' in sortlist is not in classed ranges,"
+      maskwhat = "implied prefix length";
+      initial= adns__guess_prefix_length(af, &sl->base);
+      if (initial < 0) {
+	configparseerr(ads,fn,lno, "network address `%s'"
+		       " in sortlist is not in classed ranges,"
 		       " must specify mask explicitly", tbuf);
 	continue;
       }
+      adns__prefix_mask(af, initial, &sl->mask);
+    }
+
+    if (!adns__addr_match_p(af,&sl->base, af,&sl->base,&sl->mask)) {
+      if (initial >= 0) {
+	configparseerr(ads,fn,lno, "%s %d in sortlist"
+		       " overlaps address `%s'",maskwhat,initial,tbuf);
+      } else {
+	configparseerr(ads,fn,lno, "%s `%s' in sortlist"
+		       " overlaps address `%s'",maskwhat,slash,tbuf);
+      }
+      continue;
     }
 
-    ads->sortlist[ads->nsortlist].base= base;
-    ads->sortlist[ads->nsortlist].mask= mask;
+    sl->af= af;
     ads->nsortlist++;
   }
 }
 
-static void ccf_options(adns_state ads, const char *fn, int lno, const char *buf) {
+static void ccf_options(adns_state ads, const char *fn,
+			int lno, const char *buf) {
   const char *word;
   char *ep;
   unsigned long v;
-  int l;
+  int i,l;
 
   if (!buf) return;
 
@@ -219,26 +276,93 @@ static void ccf_options(adns_state ads, const char *fn, int lno, const char *buf
     if (l>=6 && !memcmp(word,"ndots:",6)) {
       v= strtoul(word+6,&ep,10);
       if (l==6 || ep != word+l || v > INT_MAX) {
-	configparseerr(ads,fn,lno,"option `%.*s' malformed or has bad value",l,word);
+	configparseerr(ads,fn,lno,"option `%.*s' malformed"
+		       " or has bad value",l,word);
 	continue;
       }
       ads->searchndots= v;
       continue;
     }
+    if (l>=12 && !memcmp(word,"adns_checkc:",12)) {
+      if (!strcmp(word+12,"none")) {
+	ads->iflags &= ~adns_if_checkc_freq;
+	ads->iflags |= adns_if_checkc_entex;
+      } else if (!strcmp(word+12,"entex")) {
+	ads->iflags &= ~adns_if_checkc_freq;
+	ads->iflags |= adns_if_checkc_entex;
+      } else if (!strcmp(word+12,"freq")) {
+	ads->iflags |= adns_if_checkc_freq;
+      } else {
+	configparseerr(ads,fn,lno, "option adns_checkc has bad value `%s' "
+		       "(must be none, entex or freq", word+12);
+      }
+      continue;
+    }
+    if (l>=8 && !memcmp(word,"adns_af:",8)) {
+      word += 8;
+      ads->iflags &= ~adns_if_afmask;
+      if (strcmp(word,"any")) for (;;) {
+	i= strcspn(word,",");
+	if (i>=4 && !memcmp(word,"ipv4",4))
+	  ads->iflags |= adns_if_permit_ipv4;
+	else if (i>=4 && !memcmp(word,"ipv6",4))
+	  ads->iflags |= adns_if_permit_ipv6;
+	else {
+	  configparseerr(ads,fn,lno, "option adns_af has bad value `%.*s' "
+			 "(must be `any' or list {`ipv4',`ipv6'},...)",
+			 i, word);
+	  break;
+	}
+	if (!word[i]) break;
+	word= word + i + 1;
+      }
+      continue;
+    }
     adns__diag(ads,-1,0,"%s:%d: unknown option `%.*s'", fn,lno, l,word);
   }
 }
 
-static void ccf_clearnss(adns_state ads, const char *fn, int lno, const char *buf) {
+static void ccf_clearnss(adns_state ads, const char *fn,
+			 int lno, const char *buf) {
   ads->nservers= 0;
 }
 
-static void ccf_include(adns_state ads, const char *fn, int lno, const char *buf) {
+static void ccf_include(adns_state ads, const char *fn,
+			int lno, const char *buf) {
   if (!*buf) {
     configparseerr(ads,fn,lno,"`include' directive with no filename");
     return;
   }
-  readconfig(ads,buf);
+  readconfig(ads,buf,1);
+}
+
+static void ccf_lookup(adns_state ads, const char *fn, int lno,
+		       const char *buf) {
+  int found_bind=0;
+  const char *word;
+  int l;
+
+  if (!*buf) {
+    configparseerr(ads,fn,lno,"`lookup' directive with no databases");
+    return;
+  }
+
+  while (nextword(&buf,&word,&l)) {
+    if (l==4 && !memcmp(word,"bind",4)) {
+      found_bind=1;
+    } else if (l==4 && !memcmp(word,"file",4)) {
+      /* ignore this and hope /etc/hosts is not essential */
+    } else if (l==2 && !memcmp(word,"yp",2)) {
+      adns__diag(ads,-1,0,"%s:%d: yp lookups not supported by adns", fn,lno);
+      found_bind=-1;
+    } else {
+      adns__diag(ads,-1,0,"%s:%d: unknown `lookup' database `%.*s'",
+		 fn,lno, l,word);
+      found_bind=-1;
+    }
+  }
+  if (!found_bind)
+    adns__diag(ads,-1,0,"%s:%d: `lookup' specified, but not `bind'", fn,lno);
 }
 
 static const struct configcommandinfo {
@@ -252,6 +376,7 @@ static const struct configcommandinfo {
   { "options",           ccf_options     },
   { "clearnameservers",  ccf_clearnss    },
   { "include",           ccf_include     },
+  { "lookup",            ccf_lookup      }, /* OpenBSD */
   {  0                                   }
 };
 
@@ -284,7 +409,8 @@ static int gl_file(adns_state ads, getline_ctx *src_io, const char *filename,
     } else if (c == EOF) {
       if (ferror(file)) {
 	saveerr(ads,errno);
-	adns__diag(ads,-1,0,"%s:%d: read error: %s",filename,lno,strerror(errno));
+	adns__diag(ads,-1,0,"%s:%d: read error: %s",
+		   filename,lno,strerror(errno));
 	return -1;
       }
       if (!i) return -1;
@@ -347,16 +473,17 @@ static void readconfiggeneric(adns_state ads, const char *filename,
     linebuf[l]= 0;
     p= linebuf;
     while (ctype_whitespace(*p)) p++;
-    if (*p == '#' || !*p) continue;
+    if (*p == '#' || *p == ';' || !*p) continue;
     q= p;
     while (*q && !ctype_whitespace(*q)) q++;
     dirl= q-p;
     for (ccip=configcommandinfos;
-	 ccip->name && !(strlen(ccip->name)==dirl && !memcmp(ccip->name,p,q-p));
+	 ccip->name &&
+	   !(strlen(ccip->name)==dirl && !memcmp(ccip->name,p,q-p));
 	 ccip++);
     if (!ccip->name) {
       adns__diag(ads,-1,0,"%s:%d: unknown configuration directive `%.*s'",
-		 filename,lno,q-p,p);
+		 filename,lno,(int)(q-p),p);
       continue;
     }
     while (ctype_whitespace(*q)) q++;
@@ -369,17 +496,20 @@ static const char *instrum_getenv(adns_state ads, const char *envvar) {
 
   value= getenv(envvar);
   if (!value) adns__debug(ads,-1,0,"environment variable %s not set",envvar);
-  else adns__debug(ads,-1,0,"environment variable %s set to `%s'",envvar,value);
+  else adns__debug(ads,-1,0,"environment variable %s"
+		   " set to `%s'",envvar,value);
   return value;
 }
 
-static void readconfig(adns_state ads, const char *filename) {
+static void readconfig(adns_state ads, const char *filename, int warnmissing) {
   getline_ctx gl_ctx;
   
   gl_ctx.file= fopen(filename,"r");
   if (!gl_ctx.file) {
     if (errno == ENOENT) {
-      adns__debug(ads,-1,0,"configuration file `%s' does not exist",filename);
+      if (warnmissing)
+	adns__debug(ads,-1,0, "configuration file"
+		    " `%s' does not exist",filename);
       return;
     }
     saveerr(ads,errno);
@@ -393,7 +523,8 @@ static void readconfig(adns_state ads, const char *filename) {
   fclose(gl_ctx.file);
 }
 
-static void readconfigtext(adns_state ads, const char *text, const char *showname) {
+static void readconfigtext(adns_state ads, const char *text,
+			   const char *showname) {
   getline_ctx gl_ctx;
   
   gl_ctx.text= text;
@@ -408,7 +539,7 @@ static void readconfigenv(adns_state ads, const char *envvar) {
     return;
   }
   filename= instrum_getenv(ads,envvar);
-  if (filename) readconfig(ads,filename);
+  if (filename) readconfig(ads,filename,1);
 }
 
 static void readconfigenvtext(adns_state ads, const char *envvar) {
@@ -432,53 +563,80 @@ int adns__setnonblock(adns_state ads, int fd) {
   return 0;
 }
 
-static int init_begin(adns_state *ads_r, adns_initflags flags, FILE *diagfile) {
+static int init_begin(adns_state *ads_r, adns_initflags flags,
+		      adns_logcallbackfn *logfn, void *logfndata) {
   adns_state ads;
+  pid_t pid;
   
   ads= malloc(sizeof(*ads)); if (!ads) return errno;
 
   ads->iflags= flags;
-  ads->diagfile= diagfile;
-  LIST_INIT(ads->timew);
+  ads->logfn= logfn;
+  ads->logfndata= logfndata;
+  ads->configerrno= 0;
+  LIST_INIT(ads->udpw);
+  LIST_INIT(ads->tcpw);
   LIST_INIT(ads->childw);
   LIST_INIT(ads->output);
+  LIST_INIT(ads->intdone);
+  ads->forallnext= 0;
   ads->nextid= 0x311f;
-  ads->udpsocket= ads->tcpsocket= -1;
+  ads->nudp= 0;
+  ads->tcpsocket= -1;
   adns__vbuf_init(&ads->tcpsend);
   adns__vbuf_init(&ads->tcprecv);
+  ads->tcprecv_skip= 0;
   ads->nservers= ads->nsortlist= ads->nsearchlist= ads->tcpserver= 0;
-  ads->tcpstate= server_disconnected;
-  ads->searchlist= 0;
   ads->searchndots= 1;
+  ads->tcpstate= server_disconnected;
   timerclear(&ads->tcptimeout);
+  ads->searchlist= 0;
+
+  pid= getpid();
+  ads->rand48xsubi[0]= pid;
+  ads->rand48xsubi[1]= (unsigned long)pid >> 16;
+  ads->rand48xsubi[2]= pid ^ ((unsigned long)pid >> 16);
 
   *ads_r= ads;
   return 0;
 }
 
 static int init_finish(adns_state ads) {
-  struct in_addr ia;
+  struct sockaddr_in sin;
   struct protoent *proto;
+  struct udpsocket *udp;
+  int i, j;
   int r;
   
   if (!ads->nservers) {
-    if (ads->diagfile && ads->iflags & adns_if_debug)
-      fprintf(ads->diagfile,"adns: no nameservers, using localhost\n");
-    ia.s_addr= htonl(INADDR_LOOPBACK);
-    addserver(ads,ia);
+    if (ads->logfn && ads->iflags & adns_if_debug)
+      adns__lprintf(ads,"adns: no nameservers, using IPv4 localhost\n");
+    memset(&sin, 0, sizeof(sin));
+    sin.sin_family = AF_INET;
+    sin.sin_port = htons(DNS_PORT);
+    sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+    addserver(ads,(struct sockaddr *)&sin, sizeof(sin));
   }
 
   proto= getprotobyname("udp"); if (!proto) { r= ENOPROTOOPT; goto x_free; }
-  ads->udpsocket= socket(AF_INET,SOCK_DGRAM,proto->p_proto);
-  if (ads->udpsocket<0) { r= errno; goto x_free; }
-
-  r= adns__setnonblock(ads,ads->udpsocket);
-  if (r) { r= errno; goto x_closeudp; }
+  ads->nudp= 0;
+  for (i=0; i<ads->nservers; i++) {
+    if (adns__udpsocket_by_af(ads, ads->servers[i].addr.sa.sa_family))
+      continue;
+    assert(ads->nudp < MAXUDP);
+    udp= &ads->udpsocket[ads->nudp];
+    udp->af= ads->servers[i].addr.sa.sa_family;
+    udp->fd= socket(udp->af,SOCK_DGRAM,proto->p_proto);
+    if (udp->fd < 0) { r= errno; goto x_free; }
+    ads->nudp++;
+    r= adns__setnonblock(ads,udp->fd);
+    if (r) { r= errno; goto x_closeudp; }
+  }
   
   return 0;
 
  x_closeudp:
-  close(ads->udpsocket);
+  for (j=0; j<ads->nudp; j++) close(ads->udpsocket[j].fd);
  x_free:
   free(ads);
   return r;
@@ -492,12 +650,18 @@ static void init_abort(adns_state ads) {
   free(ads);
 }
 
-int adns_init(adns_state *ads_r, adns_initflags flags, FILE *diagfile) {
+static void logfn_file(adns_state ads, void *logfndata,
+		       const char *fmt, va_list al) {
+  vfprintf(logfndata,fmt,al);
+}
+
+static int init_files(adns_state *ads_r, adns_initflags flags,
+		      adns_logcallbackfn *logfn, void *logfndata) {
   adns_state ads;
   const char *res_options, *adns_res_options;
   int r;
   
-  r= init_begin(&ads, flags, diagfile ? diagfile : stderr);
+  r= init_begin(&ads, flags, logfn, logfndata);
   if (r) return r;
   
   res_options= instrum_getenv(ads,"RES_OPTIONS");
@@ -505,7 +669,8 @@ int adns_init(adns_state *ads_r, adns_initflags flags, FILE *diagfile) {
   ccf_options(ads,"RES_OPTIONS",-1,res_options);
   ccf_options(ads,"ADNS_RES_OPTIONS",-1,adns_res_options);
 
-  readconfig(ads,"/etc/resolv.conf");
+  readconfig(ads,"/etc/resolv.conf",1);
+  readconfig(ads,"/etc/resolv-adns.conf",0);
   readconfigenv(ads,"RES_CONF");
   readconfigenv(ads,"ADNS_RES_CONF");
 
@@ -527,16 +692,23 @@ int adns_init(adns_state *ads_r, adns_initflags flags, FILE *diagfile) {
   r= init_finish(ads);
   if (r) return r;
 
+  adns__consistency(ads,0,cc_entex);
   *ads_r= ads;
   return 0;
 }
 
-int adns_init_strcfg(adns_state *ads_r, adns_initflags flags,
-		     FILE *diagfile, const char *configtext) {
+int adns_init(adns_state *ads_r, adns_initflags flags, FILE *diagfile) {
+  return init_files(ads_r, flags, logfn_file, diagfile ? diagfile : stderr);
+}
+
+static int init_strcfg(adns_state *ads_r, adns_initflags flags,
+		       adns_logcallbackfn *logfn, void *logfndata,
+		       const char *configtext) {
   adns_state ads;
   int r;
 
-  r= init_begin(&ads, flags, diagfile);  if (r) return r;
+  r= init_begin(&ads, flags, logfn, logfndata);
+  if (r) return r;
 
   readconfigtext(ads,configtext,"<supplied configuration text>");
   if (ads->configerrno) {
@@ -546,20 +718,85 @@ int adns_init_strcfg(adns_state *ads_r, adns_initflags flags,
   }
 
   r= init_finish(ads);  if (r) return r;
+  adns__consistency(ads,0,cc_entex);
   *ads_r= ads;
   return 0;
 }
 
+int adns_init_strcfg(adns_state *ads_r, adns_initflags flags,
+		     FILE *diagfile, const char *configtext) {
+  return init_strcfg(ads_r, flags,
+		     diagfile ? logfn_file : 0, diagfile,
+		     configtext);
+}
+
+int adns_init_logfn(adns_state *newstate_r, adns_initflags flags,
+		    const char *configtext /*0=>use default config files*/,
+		    adns_logcallbackfn *logfn /*0=>logfndata is a FILE* */,
+		    void *logfndata /*0 with logfn==0 => discard*/) {
+  if (!logfn && logfndata)
+    logfn= logfn_file;
+  if (configtext)
+    return init_strcfg(newstate_r, flags, logfn, logfndata, configtext);
+  else
+    return init_files(newstate_r, flags, logfn, logfndata);
+}
+
 void adns_finish(adns_state ads) {
+  int i;
+  adns__consistency(ads,0,cc_entex);
   for (;;) {
-    if (ads->timew.head) adns_cancel(ads->timew.head);
-    else if (ads->childw.head) adns_cancel(ads->childw.head);
-    else if (ads->output.head) adns_cancel(ads->output.head);
+    if (ads->udpw.head) adns__cancel(ads->udpw.head);
+    else if (ads->tcpw.head) adns__cancel(ads->tcpw.head);
+    else if (ads->childw.head) adns__cancel(ads->childw.head);
+    else if (ads->output.head) adns__cancel(ads->output.head);
+    else if (ads->intdone.head) adns__cancel(ads->output.head);
     else break;
   }
-  close(ads->udpsocket);
+  for (i=0; i<ads->nudp; i++) close(ads->udpsocket[i].fd);
   if (ads->tcpsocket >= 0) close(ads->tcpsocket);
   adns__vbuf_free(&ads->tcpsend);
   adns__vbuf_free(&ads->tcprecv);
+  freesearchlist(ads);
   free(ads);
 }
+
+void adns_forallqueries_begin(adns_state ads) {
+  adns__consistency(ads,0,cc_entex);
+  ads->forallnext=
+    ads->udpw.head ? ads->udpw.head :
+    ads->tcpw.head ? ads->tcpw.head :
+    ads->childw.head ? ads->childw.head :
+    ads->output.head;
+}
+  
+adns_query adns_forallqueries_next(adns_state ads, void **context_r) {
+  adns_query qu, nqu;
+
+  adns__consistency(ads,0,cc_entex);
+  nqu= ads->forallnext;
+  for (;;) {
+    qu= nqu;
+    if (!qu) return 0;
+    if (qu->next) {
+      nqu= qu->next;
+    } else if (qu == ads->udpw.tail) {
+      nqu=
+	ads->tcpw.head ? ads->tcpw.head :
+	ads->childw.head ? ads->childw.head :
+	ads->output.head;
+    } else if (qu == ads->tcpw.tail) {
+      nqu=
+	ads->childw.head ? ads->childw.head :
+	ads->output.head;
+    } else if (qu == ads->childw.tail) {
+      nqu= ads->output.head;
+    } else {
+      nqu= 0;
+    }
+    if (!qu->parent) break;
+  }
+  ads->forallnext= nqu;
+  if (context_r) *context_r= qu->ctx.ext;
+  return qu;
+}