X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsetup.c;h=6060a0807dc70d19012a9747009e9749739a1471;hb=26e1c3d691b52d21a8bb52d9bf3f8e2b42ae6cfa;hp=ce440557a108f71dca58ee1f4d8f2e3cd61a8ea2;hpb=f930c455a13d7d30ee94bdbfc460bc6227cda111;p=adns.git

diff --git a/src/setup.c b/src/setup.c
index ce44055..6060a08 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -5,14 +5,14 @@
  */
 /*
  *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+ *    Copyright (C) 1997-2000,2003,2006,2014  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,
@@ -21,8 +21,7 @@
  *  GNU General Public License for more details.
  *  
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+ *  along with this program; if not, write to the Free Software Foundation.
  */
 
 #include <stdlib.h>
@@ -41,33 +40,29 @@
 
 static void readconfig(adns_state ads, const char *filename, int warnmissing);
 
-static void addserver(adns_state ads, const struct sockaddr *sa, int n) {
+static void addserver(adns_state ads, const struct sockaddr *sa, int salen) {
   int i;
   adns_rr_addr *ss;
-  const struct sockaddr_in *sin;
-
-  assert(sa->sa_family==AF_INET); assert(n>=sizeof(*sin));
-  sin= (const void *)sa;
+  char buf[ADNS_ADDR2TEXT_BUFLEN];
   
   for (i=0; i<ads->nservers; i++) {
-    assert(ads->servers[i].addr.sa.sa_family==AF_INET);
-    if (ads->servers[i].addr.inet.sin_addr.s_addr == sin->sin_addr.s_addr) {
+    if (adns__sockaddrs_equal(sa, &ads->servers[i].addr.sa)) {
       adns__debug(ads,-1,0,"duplicate nameserver %s ignored",
-		  inet_ntoa(sin->sin_addr));
+		  adns__sockaddr_ntoa(sa, buf));
       return;
     }
   }
   
   if (ads->nservers>=MAXSERVERS) {
     adns__diag(ads,-1,0,"too many nameservers, ignoring %s",
-	       inet_ntoa(sin->sin_addr));
+	       adns__sockaddr_ntoa(sa, buf));
     return;
   }
 
   ss= ads->servers+ads->nservers;
-  assert(n <= sizeof(ss->addr));
-  ss->len = n;
-  memcpy(&ss->addr, sa, n);
+  assert(salen <= sizeof(ss->addr));
+  ss->len = salen;
+  memcpy(&ss->addr, sa, salen);
   ads->nservers++;
 }
 
@@ -114,17 +109,26 @@ static int nextword(const char **bufp_io, const char **word_r, int *l_r) {
 
 static void ccf_nameserver(adns_state ads, const char *fn,
 			   int lno, const char *buf) {
-  struct sockaddr_in sin;
-
-  memset(&sin,0,sizeof(sin));
-  sin.sin_family= AF_INET;
-  sin.sin_port= htons(DNS_PORT);
-  if (!inet_aton(buf,&sin.sin_addr)) {
+  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(sin.sin_addr));
-  addserver(ads,(const struct sockaddr *)&sin,sizeof(sin));
+  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,
@@ -160,14 +164,26 @@ static void ccf_search(adns_state ads, const char *fn,
   ads->searchlist= newptrs;
 }
 
+static int gen_pton(const char *text, int want_af, adns_sockaddr *a) {
+  int err;
+  int len;
+
+  len= sizeof(*a);
+  err= adns_text2addr(text,0, adns_qf_addrlit_scope_forbid,
+		      &a->sa, &len);
+  if (err) { assert(err == EINVAL); return 0; }
+  if (want_af != AF_UNSPEC && a->sa.sa_family != want_af) return 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;
   const char *maskwhat;
-  struct in_addr base, mask;
+  struct sortlist *sl;
   int l;
-  unsigned long initial, baselocal;
+  int initial= -1;
 
   if (!buf) return;
   
@@ -187,55 +203,56 @@ static void ccf_sortlist(adns_state ads, const char *fn,
     memcpy(tbuf,word,l); tbuf[l]= 0;
     slash= strchr(tbuf,'/');
     if (slash) *slash++= 0;
-    
-    if (!inet_aton(tbuf,&base)) {
+
+    sl= &ads->sortlist[ads->nsortlist];
+    if (!gen_pton(tbuf, AF_UNSPEC, &sl->base)) {
       configparseerr(ads,fn,lno,"invalid address `%s' in sortlist",tbuf);
       continue;
     }
 
     if (slash) {
-      if (strchr(slash,'.')) {
+      if (slash[strspn(slash, "0123456789")]) {
 	maskwhat = "mask";
-	if (!inet_aton(slash,&mask)) {
+	if (!gen_pton(slash, sl->base.sa.sa_family, &sl->mask)) {
 	  configparseerr(ads,fn,lno,"invalid mask `%s' in sortlist",slash);
 	  continue;
 	}
       } else {
 	maskwhat = "prefix length";
 	initial= strtoul(slash,&ep,10);
-	if (*ep || initial>32) {
+	if (*ep || initial>adns__addr_width(sl->base.sa.sa_family)) {
 	  configparseerr(ads,fn,lno,"mask length `%s' invalid",slash);
 	  continue;
 	}
-	mask.s_addr= htonl((0x0ffffffffUL) << (32-initial));
+	sl->mask.sa.sa_family= sl->base.sa.sa_family;
+	adns__prefix_mask(&sl->mask, initial);
       }
     } else {
-      maskwhat = "implied mask";
-      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 {
+      maskwhat = "implied prefix length";
+      initial= adns__guess_prefix_length(&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;
       }
+      sl->mask.sa.sa_family= sl->base.sa.sa_family;
+      adns__prefix_mask(&sl->mask, initial);
     }
 
-    if (base.s_addr & ~mask.s_addr) {
-      configparseerr(ads,fn,lno, "%s `%s' in sortlist"
-		     " overlaps address `%s'",maskwhat,
-		     slash ? slash : inet_ntoa(mask), tbuf);
+    if (!adns__addr_matches(sl->base.sa.sa_family,
+			    adns__sockaddr_addr(&sl->base.sa),
+			    &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].af= AF_INET;
-    ads->sortlist[ads->nsortlist].base.v4= base;
-    ads->sortlist[ads->nsortlist].mask.v4= mask;
     ads->nsortlist++;
   }
 }
@@ -245,7 +262,7 @@ static void ccf_options(adns_state ads, const char *fn,
   const char *word;
   char *ep;
   unsigned long v;
-  int l;
+  int i,l;
 
   if (!buf) return;
 
@@ -279,6 +296,26 @@ static void ccf_options(adns_state ads, const char *fn,
       }
       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);
   }
 }
@@ -539,9 +576,11 @@ static int init_begin(adns_state *ads_r, adns_initflags flags,
   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->nudpsockets= 0;
+  ads->tcpsocket= -1;
   adns__vbuf_init(&ads->tcpsend);
   adns__vbuf_init(&ads->tcprecv);
   ads->tcprecv_skip= 0;
@@ -563,7 +602,9 @@ static int init_begin(adns_state *ads_r, adns_initflags flags,
 static int init_finish(adns_state ads) {
   struct sockaddr_in sin;
   struct protoent *proto;
-  int i, r;
+  struct udpsocket *udp;
+  int i;
+  int r;
   
   if (!ads->nservers) {
     if (ads->logfn && ads->iflags & adns_if_debug)
@@ -575,21 +616,25 @@ static int init_finish(adns_state ads) {
     addserver(ads,(struct sockaddr *)&sin, sizeof(sin));
   }
 
-  /* we can't cope with multiple transport address families yet */
-  for (i=0; i<ads->nservers; i++)
-    assert(ads->servers[i].addr.sa.sa_family==AF_INET);
-
   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->nudpsockets= 0;
+  for (i=0; i<ads->nservers; i++) {
+    if (adns__udpsocket_by_af(ads, ads->servers[i].addr.sa.sa_family))
+      continue;
+    assert(ads->nudpsockets < MAXUDP);
+    udp= &ads->udpsockets[ads->nudpsockets];
+    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->nudpsockets++;
+    r= adns__setnonblock(ads,udp->fd);
+    if (r) { r= errno; goto x_closeudp; }
+  }
   
   return 0;
 
  x_closeudp:
-  close(ads->udpsocket);
+  for (i=0; i<ads->nudpsockets; i++) close(ads->udpsockets[i].fd);
  x_free:
   free(ads);
   return r;
@@ -696,15 +741,17 @@ int adns_init_logfn(adns_state *newstate_r, adns_initflags flags,
 }
 
 void adns_finish(adns_state ads) {
+  int i;
   adns__consistency(ads,0,cc_entex);
   for (;;) {
-    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);
+    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->nudpsockets; i++) close(ads->udpsockets[i].fd);
   if (ads->tcpsocket >= 0) close(ads->tcpsocket);
   adns__vbuf_free(&ads->tcpsend);
   adns__vbuf_free(&ads->tcprecv);