src/: Support IPv6 addresses in `sortlist'.

[adns] / src / setup.c

diff --git a/src/setup.c b/src/setup.c
index 21aded08a4790f501716d90519790f159f6f4bff..61f4f67c4b88a43d21273f9c73643062c1e4adca 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -4,12 +4,11 @@
  * - management of global state
  */
 /*
- *  This file is
- *    Copyright (C) 1997-1999 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-2000 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
@@ -153,9 +152,11 @@ 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;
+  const afinfo *ai;
+  int initial = -1;
 
   if (!buf) return;
   
@@ -175,49 +176,59 @@ static void ccf_sortlist(adns_state ads, const char *fn,
     memcpy(tbuf,word,l); tbuf[l]= 0;
     slash= strchr(tbuf,'/');
     if (slash) *slash++= 0;
+
+    sl= &ads->sortlist[ads->nsortlist];
+
+    if (strchr(tbuf, ':'))
+      ai= &adns__inet6_afinfo;
+    else
+      ai= &adns__inet_afinfo;
     
-    if (!inet_aton(tbuf,&base)) {
+    if (!inet_pton(ai->af, tbuf, &sl->base)) {
       configparseerr(ads,fn,lno,"invalid address `%s' in sortlist",tbuf);
       continue;
     }
 
     if (slash) {
-      if (strchr(slash,'.')) {
-       if (!inet_aton(slash,&mask)) {
+      if (strchr(slash,ai->delim)) {
+       maskwhat = "mask";
+       if (!inet_pton(ai->af,slash,&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>ai->width) {
          configparseerr(ads,fn,lno,"mask length `%s' invalid",slash);
          continue;
        }
-       mask.s_addr= htonl((0x0ffffffffUL) << (32-initial));
+       ai->prefix_mask(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 {
+      maskwhat = "implied prefix length";
+      initial = ai->guess_len(&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;
       }
+      ai->prefix_mask(initial, &sl->mask);
+    }
+
+    if (!ai->matchp(&sl->base, &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->ai = ai;
     ads->nsortlist++;
   }
 }
@@ -426,7 +437,7 @@ static void readconfiggeneric(adns_state ads, const char *filename,
         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++;
@@ -509,6 +520,7 @@ int adns__setnonblock(adns_state ads, int fd) {
 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;
 
@@ -532,6 +544,11 @@ static int init_begin(adns_state *ads_r, adns_initflags flags,
   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;
 }