int i;
adns_rr_addr *ss;
char buf[ADNS_ADDR2TEXT_BUFLEN];
-
- if (sa->sa_family != AF_INET) {
- adns__debug(ads,-1,0,"non-IPv4 nameserver %s ignored",
- adns__sockaddr_ntoa(sa, buf));
- return;
- }
for (i=0; i<ads->nservers; i++) {
- if (adns__sockaddr_equal_p(sa, &ads->servers[i].addr.sa)) {
+ if (adns__sockaddrs_equal(sa, &ads->servers[i].addr.sa)) {
adns__debug(ads,-1,0,"duplicate nameserver %s ignored",
adns__sockaddr_ntoa(sa, buf));
return;
ads->searchlist= newptrs;
}
-static int gen_pton(const char *text, int *af_io, union gen_addr *a) {
- adns_rr_addr addr;
+static int gen_pton(const char *text, int want_af, adns_sockaddr *a) {
int err;
+ int len;
- addr.len= sizeof(addr.addr);
+ len= sizeof(*a);
err= adns_text2addr(text,0, adns_qf_addrlit_scope_forbid,
- &addr.addr.sa, &addr.len);
+ &a->sa, &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);
+ if (want_af != AF_UNSPEC && a->sa.sa_family != want_af) return 0;
return 1;
}
const char *maskwhat;
struct sortlist *sl;
int l;
- int af;
int initial= -1;
if (!buf) return;
if (slash) *slash++= 0;
sl= &ads->sortlist[ads->nsortlist];
- af= AF_UNSPEC;
- if (!gen_pton(tbuf, &af, &sl->base)) {
+ if (!gen_pton(tbuf, AF_UNSPEC, &sl->base)) {
configparseerr(ads,fn,lno,"invalid address `%s' in sortlist",tbuf);
continue;
}
if (slash) {
if (slash[strspn(slash, "0123456789")]) {
maskwhat = "mask";
- if (!gen_pton(slash,&af,&sl->mask)) {
+ if (!gen_pton(slash, sl->base.sa.sa_family, &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>adns__addr_width(af)) {
+ if (*ep || initial>adns__addr_width(sl->base.sa.sa_family)) {
configparseerr(ads,fn,lno,"mask length `%s' invalid",slash);
continue;
}
- adns__prefix_mask(af, initial, &sl->mask);
+ sl->mask.sa.sa_family= sl->base.sa.sa_family;
+ adns__prefix_mask(&sl->mask, initial);
}
} else {
maskwhat = "implied prefix length";
- initial= adns__guess_prefix_length(af, &sl->base);
+ initial= adns__guess_prefix_length(&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);
+ sl->mask.sa.sa_family= sl->base.sa.sa_family;
+ adns__prefix_mask(&sl->mask, initial);
}
- if (!adns__addr_match_p(af,&sl->base, af,&sl->base,&sl->mask)) {
+ if (!adns__addr_matches(sl->base.sa.sa_family,
+ adns__sockaddr_addr(&sl->base.sa),
+ &sl->base,&sl->mask)) {
if (initial >= 0) {
configparseerr(ads,fn,lno, "%s %d in sortlist"
" overlaps address `%s'",maskwhat,initial,tbuf);
continue;
}
- sl->af= af;
ads->nsortlist++;
}
}
const char *word;
char *ep;
unsigned long v;
- int l;
+ int i,l;
if (!buf) return;
}
continue;
}
+ if (l>=8 && !memcmp(word,"adns_af:",8)) {
+ word += 8;
+ ads->iflags &= ~adns_if_afmask;
+ if (strcmp(word,"any")) for (;;) {
+ i= strcspn(word,",");
+ if (i>=4 && !memcmp(word,"ipv4",4))
+ ads->iflags |= adns_if_permit_ipv4;
+ else if (i>=4 && !memcmp(word,"ipv6",4))
+ ads->iflags |= adns_if_permit_ipv6;
+ else {
+ configparseerr(ads,fn,lno, "option adns_af has bad value `%.*s' "
+ "(must be `any' or list {`ipv4',`ipv6'},...)",
+ i, word);
+ break;
+ }
+ if (!word[i]) break;
+ word= word + i + 1;
+ }
+ continue;
+ }
adns__diag(ads,-1,0,"%s:%d: unknown option `%.*s'", fn,lno, l,word);
}
}
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;
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)
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; }
-
- r= adns__setnonblock(ads,ads->udpsocket);
- if (r) { r= errno; goto x_closeudp; }
+ ads->nudp= 0;
+ for (i=0; i<ads->nservers; 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; j<ads->nudp; j++) close(ads->udpsocket[j].fd);
x_free:
free(ads);
return r;
}
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; i<ads->nudp; i++) close(ads->udpsocket[i].fd);
if (ads->tcpsocket >= 0) close(ads->tcpsocket);
adns__vbuf_free(&ads->tcpsend);
adns__vbuf_free(&ads->tcprecv);
~mdw / adns / blobdiff