src/addrfam.c, src/...: Abstract out address-family-specific details.

[adns.git] / src / setup.c

diff --git a/src/setup.c b/src/setup.c
index 96a2a213cde3d4cb699af092d01909b109cd139e..03d737edd002ccca90932e65dec1ae8978b8c773 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -41,24 +41,32 @@
 
 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;
+  const struct sockaddr_in *sin;
+
+  assert(sa->sa_family==AF_INET); /* for inet_ntoa */
+  sin= (const void *)sa;
   
   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",
+                 inet_ntoa(sin->sin_addr));
       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",
+              inet_ntoa(sin->sin_addr));
     return;
   }
 
   ss= ads->servers+ads->nservers;
-  ss->addr= addr;
+  assert(n <= sizeof(ss->addr));
+  ss->len = n;
+  memcpy(&ss->addr, sa, n);
   ads->nservers++;
 }
 
@@ -105,14 +113,17 @@ 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 in_addr ia;
-  
-  if (!inet_aton(buf,&ia)) {
+  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)) {
     configparseerr(ads,fn,lno,"invalid nameserver address `%s'",buf);
     return;
   }
-  adns__debug(ads,-1,0,"using nameserver %s",inet_ntoa(ia));
-  addserver(ads,ia);
+  adns__debug(ads,-1,0,"using nameserver %s",inet_ntoa(sin.sin_addr));
+  addserver(ads,(const struct sockaddr *)&sin,sizeof(sin));
 }
 
 static void ccf_search(adns_state ads, const char *fn,
@@ -152,9 +163,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;
+  int af= AF_UNSPEC;
+  int initial= -1;
 
   if (!buf) return;
   
@@ -174,49 +187,54 @@ 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 (!inet_aton(tbuf, &sl->base.v4)) {
       configparseerr(ads,fn,lno,"invalid address `%s' in sortlist",tbuf);
       continue;
     }
+    af= AF_INET;
 
     if (slash) {
-      if (strchr(slash,'.')) {
-       if (!inet_aton(slash,&mask)) {
+      if (slash[strspn(slash, "0123456789")]) {
+       maskwhat = "mask";
+       if (!inet_aton(slash, &sl->mask.v4)) {
          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 {
+      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);
     }
 
-    ads->sortlist[ads->nsortlist].base= base;
-    ads->sortlist[ads->nsortlist].mask= 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;
+    }
+
+    sl->af= af;
     ads->nsortlist++;
   }
 }
@@ -542,17 +560,24 @@ static int init_begin(adns_state *ads_r, adns_initflags flags,
 }
 
 static int init_finish(adns_state ads) {
-  struct in_addr ia;
+  struct sockaddr_in sin;
   struct protoent *proto;
-  int r;
+  int i, r;
   
   if (!ads->nservers) {
     if (ads->logfn && ads->iflags & adns_if_debug)
-      adns__lprintf(ads,"adns: no nameservers, using localhost\n");
-    ia.s_addr= htonl(INADDR_LOOPBACK);
-    addserver(ads,ia);
+      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));
   }
 
+  /* 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; }