X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Fsetup.c;h=e853ab797e36139b015a3f1bb628fd6a38fa3377;hp=ce440557a108f71dca58ee1f4d8f2e3cd61a8ea2;hb=b582ca0f999ffd51e26c5543d2023ea137af3bec;hpb=f930c455a13d7d30ee94bdbfc460bc6227cda111 diff --git a/src/setup.c b/src/setup.c index ce44055..e853ab7 100644 --- a/src/setup.c +++ b/src/setup.c @@ -44,23 +44,19 @@ static void readconfig(adns_state ads, const char *filename, int warnmissing); static void addserver(adns_state ads, const struct sockaddr *sa, int n) { 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; inservers; 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__sockaddr_equal_p(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; } @@ -114,17 +110,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 +165,29 @@ static void ccf_search(adns_state ads, const char *fn, ads->searchlist= newptrs; } +static int gen_pton(const char *text, int *af_io, union gen_addr *a) { + adns_rr_addr addr; + int err; + + addr.len= sizeof(addr.addr); + err= adns_text2addr(text,0, adns_qf_addrlit_scope_forbid, + &addr.addr.sa, &addr.len); + if (err) { assert(err == EINVAL); return 0; } + if (*af_io == AF_UNSPEC) *af_io= addr.addr.sa.sa_family; + else if (*af_io != addr.addr.sa.sa_family) return 0; + adns__sockaddr_extract(&addr.addr.sa, a, 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 af; + int initial= -1; if (!buf) return; @@ -187,55 +207,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]; + af= AF_UNSPEC; + if (!gen_pton(tbuf, &af, &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,&af,&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(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 { - 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(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); } - 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_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; } - ads->sortlist[ads->nsortlist].af= AF_INET; - ads->sortlist[ads->nsortlist].base.v4= base; - ads->sortlist[ads->nsortlist].mask.v4= mask; + sl->af= af; ads->nsortlist++; } } @@ -539,9 +558,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->nudp= 0; + ads->tcpsocket= -1; adns__vbuf_init(&ads->tcpsend); adns__vbuf_init(&ads->tcprecv); ads->tcprecv_skip= 0; @@ -563,7 +584,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, j; + int r; if (!ads->nservers) { if (ads->logfn && ads->iflags & adns_if_debug) @@ -575,21 +598,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; 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; } - - r= adns__setnonblock(ads,ads->udpsocket); - if (r) { r= errno; goto x_closeudp; } + ads->nudp= 0; + for (i=0; inservers; i++) { + if (adns__udpsocket_by_af(ads, ads->servers[i].addr.sa.sa_family)) + continue; + assert(ads->nudp < MAXUDP); + udp= &ads->udpsocket[ads->nudp]; + 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->nudp++; + r= adns__setnonblock(ads,udp->fd); + if (r) { r= errno; goto x_closeudp; } + } return 0; x_closeudp: - close(ads->udpsocket); + for (j=0; jnudp; j++) close(ads->udpsocket[j].fd); x_free: free(ads); return r; @@ -696,15 +723,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; inudp; i++) close(ads->udpsocket[i].fd); if (ads->tcpsocket >= 0) close(ads->tcpsocket); adns__vbuf_free(&ads->tcpsend); adns__vbuf_free(&ads->tcprecv);