X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Fsetup.c;h=ce440557a108f71dca58ee1f4d8f2e3cd61a8ea2;hp=21aded08a4790f501716d90519790f159f6f4bff;hb=c0ec02b59a25b13bb6a04abd518d0d2da0fefc88;hpb=d3a102c4369f6b071040865063a7620261d74a6d diff --git a/src/setup.c b/src/setup.c index 21aded0..ce44055 100644 --- 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 - * - * It is part of adns, which is - * Copyright (C) 1997-2000 Ian Jackson - * Copyright (C) 1999-2000 Tony Finch + * 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 @@ -42,24 +41,33 @@ 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); assert(n>=sizeof(*sin)); + sin= (const void *)sa; for (i=0; inservers; i++) { - if (ads->servers[i].addr.s_addr == addr.s_addr) { - adns__debug(ads,-1,0,"duplicate nameserver %s ignored",inet_ntoa(addr)); + 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) { + 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++; } @@ -106,14 +114,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, @@ -153,6 +164,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 +195,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,8 +210,9 @@ 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 */ + if (!(baselocal & 0x080000000UL)) /* class A */ mask.s_addr= htonl(0x0ff000000UL); else if ((baselocal & 0x0c0000000UL) == 0x080000000UL) mask.s_addr= htonl(0x0ffff0000UL); /* class B */ @@ -216,8 +226,16 @@ static void ccf_sortlist(adns_state ads, const char *fn, } } - ads->sortlist[ads->nsortlist].base= base; - ads->sortlist[ads->nsortlist].mask= mask; + 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].af= AF_INET; + ads->sortlist[ads->nsortlist].base.v4= base; + ads->sortlist[ads->nsortlist].mask.v4= mask; ads->nsortlist++; } } @@ -426,7 +444,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 +527,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,22 +551,34 @@ 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; } 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; inservers; 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; }