src/setup.c: Check netmask more carefully.

[adns] / src / setup.c

diff --git a/src/setup.c b/src/setup.c
index 0134680a125a57c99ab78227ddb5b180d7d43838..e6f1e55d85993f264bdfacf5c9711e87ad4e0dbd 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,6 +152,7 @@ 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;
   int l;
   unsigned long initial, baselocal;
@@ -183,16 +183,13 @@ static void ccf_sortlist(adns_state ads, const char *fn,
 
     if (slash) {
       if (strchr(slash,'.')) {
+       maskwhat = "mask";
        if (!inet_aton(slash,&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) {
          configparseerr(ads,fn,lno,"mask length `%s' invalid",slash);
@@ -201,6 +198,7 @@ static void ccf_sortlist(adns_state ads, const char *fn,
        mask.s_addr= htonl((0x0ffffffffUL) << (32-initial));
       }
     } else {
+      maskwhat = "implied mask";
       baselocal= ntohl(base.s_addr);
       if (!baselocal & 0x080000000UL) /* class A */
        mask.s_addr= htonl(0x0ff000000UL);
@@ -216,6 +214,13 @@ static void ccf_sortlist(adns_state ads, const char *fn,
       }
     }
 
+    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);
+      continue;
+    }
+
     ads->sortlist[ads->nsortlist].base= base;
     ads->sortlist[ads->nsortlist].mask= mask;
     ads->nsortlist++;
@@ -509,6 +514,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 +538,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;
 }