static void readconfig(adns_state ads, const char *filename, int warnmissing);
-static void addserver(adns_state ads, struct in_addr addr) {
+static const afinfo *const transport_aftab[] = {
+ &adns__inet_afinfo,
+ &adns__inet6_afinfo,
+ 0
+};
+
+static const afinfo *find_afinfo(int af)
+{
+ int i;
+
+ for (i = 0; transport_aftab[i]; i++)
+ if (transport_aftab[i]->af == af) return transport_aftab[i];
+ return 0;
+}
+
+static void addserver(adns_state ads, struct sockaddr *sa, int n) {
int i;
- struct server *ss;
+ adns_rr_addr *ss;
+ const afinfo *ai;
+
+ ai = find_afinfo(sa->sa_family);
+ if (!ai) {
+ adns__diag(ads,-1,0,
+ "nameserver %s for unknown address family %d ignored",
+ adns__sockaddr_ntoa(sa, n), sa->sa_family);
+ }
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 (ads->servers[i].addr.sa.sa_family == sa->sa_family &&
+ ai->sockaddr_equalp(sa, &ads->servers[i].addr.sa)) {
+ adns__debug(ads,-1,0,"duplicate nameserver %s ignored",
+ adns__sockaddr_ntoa(sa, n));
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",
+ adns__sockaddr_ntoa(sa, n));
return;
}
ss= ads->servers+ads->nservers;
- ss->addr= addr;
+ assert(n <= sizeof(ss->addr));
+ ss->len = n;
+ memcpy(&ss->addr, sa, n);
ads->nservers++;
}
static void ccf_nameserver(adns_state ads, const char *fn,
int lno, const char *buf) {
- struct in_addr ia;
-
- if (!inet_aton(buf,&ia)) {
- configparseerr(ads,fn,lno,"invalid nameserver address `%s'",buf);
+ struct addrinfo *ai, ai_hint = { 0 };
+ int err;
+
+ ai_hint.ai_family = AF_UNSPEC;
+ ai_hint.ai_socktype = SOCK_DGRAM;
+ ai_hint.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV;
+
+ err = getaddrinfo(buf, STRINGIFY(DNS_PORT), &ai_hint, &ai);
+ if (err) {
+ configparseerr(ads,fn,lno,"invalid nameserver address `%s' (%s)",
+ buf, gai_strerror(err));
return;
}
- adns__debug(ads,-1,0,"using nameserver %s",inet_ntoa(ia));
- addserver(ads,ia);
+
+ adns__debug(ads,-1,0,"using nameserver %s",
+ adns__sockaddr_ntoa(ai->ai_addr, ai->ai_addrlen));
+ addserver(ads, ai->ai_addr, ai->ai_addrlen);
+ freeaddrinfo(ai);
}
static void ccf_search(adns_state ads, const char *fn,
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;
+ const afinfo *ai;
+ int initial = -1;
if (!buf) return;
memcpy(tbuf,word,l); tbuf[l]= 0;
slash= strchr(tbuf,'/');
if (slash) *slash++= 0;
+
+ sl= &ads->sortlist[ads->nsortlist];
+
+ if (strchr(tbuf, ':'))
+ ai= &adns__inet6_afinfo;
+ else
+ ai= &adns__inet_afinfo;
- if (!inet_aton(tbuf,&base)) {
+ if (!inet_pton(ai->af, tbuf, &sl->base)) {
configparseerr(ads,fn,lno,"invalid address `%s' in sortlist",tbuf);
continue;
}
if (slash) {
- if (strchr(slash,'.')) {
+ if (strchr(slash,ai->delim)) {
maskwhat = "mask";
- if (!inet_aton(slash,&mask)) {
+ if (!inet_pton(ai->af,slash,&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>ai->width) {
configparseerr(ads,fn,lno,"mask length `%s' invalid",slash);
continue;
}
- mask.s_addr= htonl((0x0ffffffffUL) << (32-initial));
+ ai->prefix_mask(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 = ai->guess_len(&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;
}
+ ai->prefix_mask(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 (!ai->matchp(&sl->base, &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].base= base;
- ads->sortlist[ads->nsortlist].mask= mask;
+ sl->ai = ai;
ads->nsortlist++;
}
}
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;
}
static int init_finish(adns_state ads) {
- struct in_addr ia;
+ struct sockaddr_in sin;
struct protoent *proto;
+ struct udpsocket *udp;
+ int i, j;
int 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_port = htons(DNS_PORT);
+ sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ addserver(ads,(struct sockaddr *)&sin, sizeof(sin));
}
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; }
+ ads->nudp = 0;
+ for (i = 0; i < ads->nservers; i++) {
+ for (j = 0; j < ads->nudp; j++) {
+ if (ads->udpsocket[j].ai->af == ads->servers[i].addr.sa.sa_family)
+ goto afmatch;
+ }
- r= adns__setnonblock(ads,ads->udpsocket);
- if (r) { r= errno; goto x_closeudp; }
+ assert(ads->nudp < MAXUDP);
+ udp = &ads->udpsocket[ads->nudp];
+ udp->ai = find_afinfo(ads->servers[i].addr.sa.sa_family);
+ assert(udp->ai);
+ udp->fd = socket(udp->ai->af,SOCK_DGRAM,proto->p_proto);
+ if (udp->fd < 0) { r= errno; goto x_free; }
+ r= adns__setnonblock(ads,udp->fd);
+ if (r) { r= errno; goto x_closeudp; }
+ ads->nudp++;
+
+ afmatch:;
+ }
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->output.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