X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Fsetup.c;h=54d2d0f9adc5bbde5e2ad2777ecfbb3de8450880;hp=03d737edd002ccca90932e65dec1ae8978b8c773;hb=3eb20edd4ef2a509a0ff7d3973f663e35f812ea7;hpb=07554ccd8286775b4f88a608ba3b94ff7b9efaf9 diff --git a/src/setup.c b/src/setup.c index 03d737e..54d2d0f 100644 --- a/src/setup.c +++ b/src/setup.c @@ -44,22 +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); /* for inet_ntoa */ - sin= (const void *)sa; + char buf[ADNS_ADDR2TEXT_BUFLEN]; for (i=0; inservers; i++) { 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; } @@ -113,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, @@ -159,6 +165,20 @@ 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; @@ -166,7 +186,7 @@ static void ccf_sortlist(adns_state ads, const char *fn, const char *maskwhat; struct sortlist *sl; int l; - int af= AF_UNSPEC; + int af; int initial= -1; if (!buf) return; @@ -189,16 +209,16 @@ static void ccf_sortlist(adns_state ads, const char *fn, if (slash) *slash++= 0; sl= &ads->sortlist[ads->nsortlist]; - if (!inet_aton(tbuf, &sl->base.v4)) { + af= AF_UNSPEC; + if (!gen_pton(tbuf, &af, &sl->base)) { configparseerr(ads,fn,lno,"invalid address `%s' in sortlist",tbuf); continue; } - af= AF_INET; if (slash) { if (slash[strspn(slash, "0123456789")]) { maskwhat = "mask"; - if (!inet_aton(slash, &sl->mask.v4)) { + if (!gen_pton(slash,&af,&sl->mask)) { configparseerr(ads,fn,lno,"invalid mask `%s' in sortlist",slash); continue; } @@ -540,7 +560,8 @@ static int init_begin(adns_state *ads_r, adns_initflags flags, LIST_INIT(ads->output); 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; @@ -562,7 +583,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) @@ -574,21 +597,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; @@ -695,6 +722,7 @@ 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); @@ -703,7 +731,7 @@ void adns_finish(adns_state ads) { else if (ads->output.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);