X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsetup.c;h=8ff92d284e5bf4a89955f336795479417d28ade1;hb=7ba7a232de0516d2cce934bdc91627b33b46ef47;hp=79e00e13ff71220b7e0494984e1d2a25dad30a56;hpb=82ae109eba3901127fcd5267872b0afd64af4a7c;p=adns.git diff --git a/src/setup.c b/src/setup.c index 79e00e1..8ff92d2 100644 --- a/src/setup.c +++ b/src/setup.c @@ -5,14 +5,15 @@ */ /* * This file is part of adns, which is - * Copyright (C) 1997-2000,2003,2006 Ian Jackson + * Copyright (C) 1997-2000,2003,2006,2014-2016 Ian Jackson + * Copyright (C) 2014 Mark Wooding * Copyright (C) 1999-2000,2003,2006 Tony Finch * Copyright (C) 1991 Massachusetts Institute of Technology * (See the file INSTALL for full details.) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) + * the Free Software Foundation; either version 3, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, @@ -21,8 +22,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program; if not, write to the Free Software Foundation. */ #include @@ -41,7 +41,7 @@ static void readconfig(adns_state ads, const char *filename, int warnmissing); -static void addserver(adns_state ads, const struct sockaddr *sa, int n) { +static void addserver(adns_state ads, const struct sockaddr *sa, int salen) { int i; adns_rr_addr *ss; char buf[ADNS_ADDR2TEXT_BUFLEN]; @@ -61,9 +61,9 @@ static void addserver(adns_state ads, const struct sockaddr *sa, int n) { } ss= ads->servers+ads->nservers; - assert(n <= sizeof(ss->addr)); - ss->len = n; - memcpy(&ss->addr, sa, n); + assert(salen <= sizeof(ss->addr)); + ss->len = salen; + memcpy(&ss->addr, sa, salen); ads->nservers++; } @@ -113,9 +113,11 @@ static void ccf_nameserver(adns_state ads, const char *fn, adns_rr_addr a; char addrbuf[ADNS_ADDR2TEXT_BUFLEN]; int err; + socklen_t salen; - a.len= sizeof(a.addr); - err= adns_text2addr(buf,DNS_PORT, 0, &a.addr.sa,&a.len); + salen= sizeof(a.addr); + err= adns_text2addr(buf,DNS_PORT, 0, &a.addr.sa,&salen); + a.len= salen; switch (err) { case 0: break; @@ -129,7 +131,7 @@ static void ccf_nameserver(adns_state ads, const char *fn, } adns__debug(ads,-1,0,"using nameserver %s", adns__sockaddr_ntoa(&a.addr.sa, addrbuf)); - addserver(ads,&a.addr.sa,a.len); + addserver(ads,&a.addr.sa,salen); } static void ccf_search(adns_state ads, const char *fn, @@ -167,7 +169,7 @@ static void ccf_search(adns_state ads, const char *fn, static int gen_pton(const char *text, int want_af, adns_sockaddr *a) { int err; - int len; + socklen_t len; len= sizeof(*a); err= adns_text2addr(text,0, adns_qf_addrlit_scope_forbid, @@ -260,65 +262,95 @@ static void ccf_sortlist(adns_state ads, const char *fn, static void ccf_options(adns_state ads, const char *fn, int lno, const char *buf) { - const char *word; + const char *opt, *word, *endword, *endopt; char *ep; unsigned long v; - int i,l; + int l; if (!buf) return; +#define WORD__IS(s,op) ((endword-word) op (sizeof(s)-1) && \ + !memcmp(word,s,(sizeof(s)-1))) +#define WORD_IS(s) (WORD__IS(s,==)) +#define WORD_STARTS(s) (WORD__IS(s,>=) ? ((word+=sizeof(s)-1)) : 0) + while (nextword(&buf,&word,&l)) { - if (l==5 && !memcmp(word,"debug",5)) { + opt=word; + endopt=endword=word+l; + if (WORD_IS("debug")) { ads->iflags |= adns_if_debug; continue; } - if (l>=6 && !memcmp(word,"ndots:",6)) { - v= strtoul(word+6,&ep,10); - if (l==6 || ep != word+l || v > INT_MAX) { + if (WORD_STARTS("ndots:")) { + v= strtoul(word,&ep,10); + if (ep==word || ep != endword || v > INT_MAX) { configparseerr(ads,fn,lno,"option `%.*s' malformed" - " or has bad value",l,word); + " or has bad value",l,opt); continue; } ads->searchndots= v; continue; } - if (l>=12 && !memcmp(word,"adns_checkc:",12)) { - if (!strcmp(word+12,"none")) { + if (WORD_STARTS("adns_checkc:")) { + if (WORD_IS("none")) { ads->iflags &= ~adns_if_checkc_freq; ads->iflags |= adns_if_checkc_entex; - } else if (!strcmp(word+12,"entex")) { + } else if (WORD_IS("entex")) { ads->iflags &= ~adns_if_checkc_freq; ads->iflags |= adns_if_checkc_entex; - } else if (!strcmp(word+12,"freq")) { + } else if (WORD_IS("freq")) { ads->iflags |= adns_if_checkc_freq; } else { configparseerr(ads,fn,lno, "option adns_checkc has bad value `%s' " - "(must be none, entex or freq", word+12); + "(must be none, entex or freq", word); } continue; } - if (l>=8 && !memcmp(word,"adns_af:",8)) { - word += 8; + if (WORD_STARTS("adns_af:")) { ads->iflags &= ~adns_if_afmask; - if (strcmp(word,"any")) for (;;) { - i= strcspn(word,","); - if (i>=4 && !memcmp(word,"ipv4",4)) + if (!WORD_IS("any")) for (;;) { + const char *comma= memchr(word,',',endopt-word); + endword=comma?comma:endopt; + if (WORD_IS("ipv4")) ads->iflags |= adns_if_permit_ipv4; - else if (i>=4 && !memcmp(word,"ipv6",4)) + else if (WORD_IS("ipv6")) 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); + if (ads->config_report_unknown) + adns__diag(ads,-1,0,"%s:%d: " + "option adns_af has bad value or entry `%.*s' " + "(option must be `any', or list of `ipv4',`ipv6')", + fn,lno, (int)(endword-word),word); break; } - if (!word[i]) break; - word= word + i + 1; + if (!comma) break; + word= comma+1; } continue; } - adns__diag(ads,-1,0,"%s:%d: unknown option `%.*s'", fn,lno, l,word); + if (WORD_IS("adns_ignoreunkcfg")) { + ads->config_report_unknown=0; + continue; + } + if (/* adns's query strategy is not configurable */ + WORD_STARTS("timeout:") || + WORD_STARTS("attempts:") || + WORD_IS("rotate") || + /* adns provides the application with knob for this */ + WORD_IS("no-check-names") || + /* adns normally does IPv6 if the application wants it; control + * this with the adns_af: option if you like */ + WORD_IS("inet6") || + /* adns does not do edns0 and this is not a problem */ + WORD_IS("edns0")) + continue; + if (ads->config_report_unknown) + adns__diag(ads,-1,0,"%s:%d: unknown option `%.*s'", fn,lno, l,opt); } + +#undef WORD__IS +#undef WORD_IS +#undef WORD_STARTS } static void ccf_clearnss(adns_state ads, const char *fn, @@ -355,8 +387,9 @@ static void ccf_lookup(adns_state ads, const char *fn, int lno, adns__diag(ads,-1,0,"%s:%d: yp lookups not supported by adns", fn,lno); found_bind=-1; } else { - adns__diag(ads,-1,0,"%s:%d: unknown `lookup' database `%.*s'", - fn,lno, l,word); + if (ads->config_report_unknown) + adns__diag(ads,-1,0,"%s:%d: unknown `lookup' database `%.*s'", + fn,lno, l,word); found_bind=-1; } } @@ -364,6 +397,10 @@ static void ccf_lookup(adns_state ads, const char *fn, int lno, adns__diag(ads,-1,0,"%s:%d: `lookup' specified, but not `bind'", fn,lno); } +static void ccf_ignore(adns_state ads, const char *fn, int lno, + const char *buf) { +} + static const struct configcommandinfo { const char *name; void (*fn)(adns_state ads, const char *fn, int lno, const char *buf); @@ -376,6 +413,7 @@ static const struct configcommandinfo { { "clearnameservers", ccf_clearnss }, { "include", ccf_include }, { "lookup", ccf_lookup }, /* OpenBSD */ + { "lwserver", ccf_ignore }, /* BIND9 lwresd */ { 0 } }; @@ -481,8 +519,9 @@ static void readconfiggeneric(adns_state ads, const char *filename, !(strlen(ccip->name)==dirl && !memcmp(ccip->name,p,q-p)); ccip++); if (!ccip->name) { - adns__diag(ads,-1,0,"%s:%d: unknown configuration directive `%.*s'", - filename,lno,(int)(q-p),p); + if (ads->config_report_unknown) + adns__diag(ads,-1,0,"%s:%d: unknown configuration directive `%.*s'", + filename,lno,(int)(q-p),p); continue; } while (ctype_whitespace(*q)) q++; @@ -567,6 +606,10 @@ static int init_begin(adns_state *ads_r, adns_initflags flags, adns_state ads; pid_t pid; + if (flags & ~(adns_initflags)(0x4fff)) + /* 0x4000 is reserved for `harmless' future expansion */ + return ENOSYS; + ads= malloc(sizeof(*ads)); if (!ads) return errno; ads->iflags= flags; @@ -580,7 +623,7 @@ static int init_begin(adns_state *ads_r, adns_initflags flags, LIST_INIT(ads->intdone); ads->forallnext= 0; ads->nextid= 0x311f; - ads->nudp= 0; + ads->nudpsockets= 0; ads->tcpsocket= -1; adns__vbuf_init(&ads->tcpsend); adns__vbuf_init(&ads->tcprecv); @@ -590,6 +633,7 @@ static int init_begin(adns_state *ads_r, adns_initflags flags, ads->tcpstate= server_disconnected; timerclear(&ads->tcptimeout); ads->searchlist= 0; + ads->config_report_unknown=1; pid= getpid(); ads->rand48xsubi[0]= pid; @@ -604,7 +648,7 @@ static int init_finish(adns_state ads) { struct sockaddr_in sin; struct protoent *proto; struct udpsocket *udp; - int i, j; + int i; int r; if (!ads->nservers) { @@ -618,16 +662,16 @@ static int init_finish(adns_state ads) { } proto= getprotobyname("udp"); if (!proto) { r= ENOPROTOOPT; goto x_free; } - ads->nudp= 0; + ads->nudpsockets= 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]; + assert(ads->nudpsockets < MAXUDP); + udp= &ads->udpsockets[ads->nudpsockets]; 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++; + ads->nudpsockets++; r= adns__setnonblock(ads,udp->fd); if (r) { r= errno; goto x_closeudp; } } @@ -635,7 +679,7 @@ static int init_finish(adns_state ads) { return 0; x_closeudp: - for (j=0; jnudp; j++) close(ads->udpsocket[j].fd); + for (i=0; inudpsockets; i++) close(ads->udpsockets[i].fd); x_free: free(ads); return r; @@ -752,7 +796,7 @@ void adns_finish(adns_state ads) { else if (ads->intdone.head) adns__cancel(ads->output.head); else break; } - for (i=0; inudp; i++) close(ads->udpsocket[i].fd); + for (i=0; inudpsockets; i++) close(ads->udpsockets[i].fd); if (ads->tcpsocket >= 0) close(ads->tcpsocket); adns__vbuf_free(&ads->tcpsend); adns__vbuf_free(&ads->tcprecv);