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;
+ 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 (ads->servers[i].addr.s_addr == addr.s_addr) {
- adns__debug(ads,-1,0,"duplicate nameserver %s ignored",inet_ntoa(addr));
+ if (adns__sockaddr_equal_p(sa, &ads->servers[i].addr.sa)) {
+ adns__debug(ads,-1,0,"duplicate nameserver %s ignored",
+ adns__sockaddr_ntoa(sa, buf));
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, buf));
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)) {
+ 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(ia));
- addserver(ads,ia);
+ 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,
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;
- struct in_addr base, mask;
+ const char *maskwhat;
+ struct sortlist *sl;
int l;
- unsigned long initial, baselocal;
+ int af;
+ int initial= -1;
if (!buf) return;
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 (!inet_aton(slash,&mask)) {
+ if (slash[strspn(slash, "0123456789")]) {
+ maskwhat = "mask";
+ if (!gen_pton(slash,&af,&sl->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) {
+ 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 {
- 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 (!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].base= base;
- ads->sortlist[ads->nsortlist].mask= mask;
+ sl->af= af;
ads->nsortlist++;
}
}
}
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; 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; }