X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Fsetup.c;h=f73926c9f0c0ee50230fd4db0e408407515444eb;hp=ac88c33f6f79d15528102895013033cebdb3b99d;hb=95bee3e1cb676e462750a8c46cf6439a3e3e6cc0;hpb=626f869531a241dd8f187afb392a3151caf9a728 diff --git a/src/setup.c b/src/setup.c index ac88c33..f73926c 100644 --- a/src/setup.c +++ b/src/setup.c @@ -4,12 +4,11 @@ * - management of global state */ /* - * This file is - * Copyright (C) 1997-1999 Ian Jackson - * - * It is part of adns, which is - * Copyright (C) 1997-1999 Ian Jackson - * Copyright (C) 1999 Tony Finch + * This file is part of adns, which is + * Copyright (C) 1997-2000,2003,2006 Ian Jackson + * 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 @@ -32,6 +31,7 @@ #include #include +#include #include #include #include @@ -76,14 +76,14 @@ static void configparseerr(adns_state ads, const char *fn, int lno, va_list al; saveerr(ads,EINVAL); - if (!ads->diagfile || (ads->iflags & adns_if_noerrprint)) return; + if (!ads->logfn || (ads->iflags & adns_if_noerrprint)) return; - if (lno==-1) fprintf(ads->diagfile,"adns: %s: ",fn); - else fprintf(ads->diagfile,"adns: %s:%d: ",fn,lno); + if (lno==-1) adns__lprintf(ads,"adns: %s: ",fn); + else adns__lprintf(ads,"adns: %s:%d: ",fn,lno); va_start(al,fmt); - vfprintf(ads->diagfile,fmt,al); + adns__vlprintf(ads,fmt,al); va_end(al); - fputc('\n',ads->diagfile); + adns__lprintf(ads,"\n"); } static int nextword(const char **bufp_io, const char **word_r, int *l_r) { @@ -103,7 +103,8 @@ static int nextword(const char **bufp_io, const char **word_r, int *l_r) { return 1; } -static void ccf_nameserver(adns_state ads, const char *fn, int lno, const char *buf) { +static void ccf_nameserver(adns_state ads, const char *fn, + int lno, const char *buf) { struct in_addr ia; if (!inet_aton(buf,&ia)) { @@ -114,7 +115,8 @@ static void ccf_nameserver(adns_state ads, const char *fn, int lno, const char * addserver(ads,ia); } -static void ccf_search(adns_state ads, const char *fn, int lno, const char *buf) { +static void ccf_search(adns_state ads, const char *fn, + int lno, const char *buf) { const char *bufp, *word; char *newchars, **newptrs, **pp; int count, tl, l; @@ -126,8 +128,11 @@ static void ccf_search(adns_state ads, const char *fn, int lno, const char *buf) tl= 0; while (nextword(&bufp,&word,&l)) { count++; tl += l+1; } - newptrs= malloc(sizeof(char*)*count); if (!newptrs) { saveerr(ads,errno); return; } - newchars= malloc(tl); if (!newchars) { saveerr(ads,errno); free(newptrs); return; } + newptrs= malloc(sizeof(char*)*count); + if (!newptrs) { saveerr(ads,errno); return; } + + newchars= malloc(tl); + if (!newchars) { saveerr(ads,errno); free(newptrs); return; } bufp= buf; pp= newptrs; @@ -143,9 +148,11 @@ static void ccf_search(adns_state ads, const char *fn, int lno, const char *buf) ads->searchlist= newptrs; } -static void ccf_sortlist(adns_state ads, const char *fn, int lno, const char *buf) { +static void ccf_sortlist(adns_state ads, const char *fn, + int lno, const char *buf) { const char *word; char tbuf[200], *slash, *ep; + const char *maskwhat; struct in_addr base, mask; int l; unsigned long initial, baselocal; @@ -155,7 +162,8 @@ static void ccf_sortlist(adns_state ads, const char *fn, int lno, const char *bu ads->nsortlist= 0; while (nextword(&buf,&word,&l)) { if (ads->nsortlist >= MAXSORTLIST) { - adns__diag(ads,-1,0,"too many sortlist entries, ignoring %.*s onwards",l,word); + adns__diag(ads,-1,0,"too many sortlist entries," + " ignoring %.*s onwards",l,word); return; } @@ -175,16 +183,13 @@ static void ccf_sortlist(adns_state ads, const char *fn, int lno, const char *bu if (slash) { if (strchr(slash,'.')) { + maskwhat = "mask"; if (!inet_aton(slash,&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) { configparseerr(ads,fn,lno,"mask length `%s' invalid",slash); @@ -193,28 +198,37 @@ static void ccf_sortlist(adns_state ads, const char *fn, int lno, const char *bu mask.s_addr= htonl((0x0ffffffffUL) << (32-initial)); } } else { + maskwhat = "implied mask"; baselocal= ntohl(base.s_addr); - if (!baselocal & 0x080000000UL) /* class A */ + 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 { - configparseerr(ads,fn,lno, - "network address `%s' in sortlist is not in classed ranges," + configparseerr(ads,fn,lno, "network address `%s'" + " in sortlist is not in classed ranges," " must specify mask explicitly", tbuf); continue; } } + 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); + continue; + } + ads->sortlist[ads->nsortlist].base= base; ads->sortlist[ads->nsortlist].mask= mask; ads->nsortlist++; } } -static void ccf_options(adns_state ads, const char *fn, int lno, const char *buf) { +static void ccf_options(adns_state ads, const char *fn, + int lno, const char *buf) { const char *word; char *ep; unsigned long v; @@ -230,7 +244,8 @@ static void ccf_options(adns_state ads, const char *fn, int lno, const char *buf if (l>=6 && !memcmp(word,"ndots:",6)) { v= strtoul(word+6,&ep,10); if (l==6 || ep != word+l || v > INT_MAX) { - configparseerr(ads,fn,lno,"option `%.*s' malformed or has bad value",l,word); + configparseerr(ads,fn,lno,"option `%.*s' malformed" + " or has bad value",l,word); continue; } ads->searchndots= v; @@ -255,11 +270,13 @@ static void ccf_options(adns_state ads, const char *fn, int lno, const char *buf } } -static void ccf_clearnss(adns_state ads, const char *fn, int lno, const char *buf) { +static void ccf_clearnss(adns_state ads, const char *fn, + int lno, const char *buf) { ads->nservers= 0; } -static void ccf_include(adns_state ads, const char *fn, int lno, const char *buf) { +static void ccf_include(adns_state ads, const char *fn, + int lno, const char *buf) { if (!*buf) { configparseerr(ads,fn,lno,"`include' directive with no filename"); return; @@ -267,6 +284,35 @@ static void ccf_include(adns_state ads, const char *fn, int lno, const char *buf readconfig(ads,buf,1); } +static void ccf_lookup(adns_state ads, const char *fn, int lno, + const char *buf) { + int found_bind=0; + const char *word; + int l; + + if (!*buf) { + configparseerr(ads,fn,lno,"`lookup' directive with no databases"); + return; + } + + while (nextword(&buf,&word,&l)) { + if (l==4 && !memcmp(word,"bind",4)) { + found_bind=1; + } else if (l==4 && !memcmp(word,"file",4)) { + /* ignore this and hope /etc/hosts is not essential */ + } else if (l==2 && !memcmp(word,"yp",2)) { + 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); + found_bind=-1; + } + } + if (!found_bind) + adns__diag(ads,-1,0,"%s:%d: `lookup' specified, but not `bind'", fn,lno); +} + static const struct configcommandinfo { const char *name; void (*fn)(adns_state ads, const char *fn, int lno, const char *buf); @@ -278,6 +324,7 @@ static const struct configcommandinfo { { "options", ccf_options }, { "clearnameservers", ccf_clearnss }, { "include", ccf_include }, + { "lookup", ccf_lookup }, /* OpenBSD */ { 0 } }; @@ -310,7 +357,8 @@ static int gl_file(adns_state ads, getline_ctx *src_io, const char *filename, } else if (c == EOF) { if (ferror(file)) { saveerr(ads,errno); - adns__diag(ads,-1,0,"%s:%d: read error: %s",filename,lno,strerror(errno)); + adns__diag(ads,-1,0,"%s:%d: read error: %s", + filename,lno,strerror(errno)); return -1; } if (!i) return -1; @@ -373,16 +421,17 @@ static void readconfiggeneric(adns_state ads, const char *filename, linebuf[l]= 0; p= linebuf; while (ctype_whitespace(*p)) p++; - if (*p == '#' || !*p) continue; + if (*p == '#' || *p == ';' || !*p) continue; q= p; while (*q && !ctype_whitespace(*q)) q++; dirl= q-p; for (ccip=configcommandinfos; - ccip->name && !(strlen(ccip->name)==dirl && !memcmp(ccip->name,p,q-p)); + ccip->name && + !(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,q-p,p); + filename,lno,(int)(q-p),p); continue; } while (ctype_whitespace(*q)) q++; @@ -395,7 +444,8 @@ static const char *instrum_getenv(adns_state ads, const char *envvar) { value= getenv(envvar); if (!value) adns__debug(ads,-1,0,"environment variable %s not set",envvar); - else adns__debug(ads,-1,0,"environment variable %s set to `%s'",envvar,value); + else adns__debug(ads,-1,0,"environment variable %s" + " set to `%s'",envvar,value); return value; } @@ -406,7 +456,8 @@ static void readconfig(adns_state ads, const char *filename, int warnmissing) { if (!gl_ctx.file) { if (errno == ENOENT) { if (warnmissing) - adns__debug(ads,-1,0,"configuration file `%s' does not exist",filename); + adns__debug(ads,-1,0, "configuration file" + " `%s' does not exist",filename); return; } saveerr(ads,errno); @@ -420,7 +471,8 @@ static void readconfig(adns_state ads, const char *filename, int warnmissing) { fclose(gl_ctx.file); } -static void readconfigtext(adns_state ads, const char *text, const char *showname) { +static void readconfigtext(adns_state ads, const char *text, + const char *showname) { getline_ctx gl_ctx; gl_ctx.text= text; @@ -459,13 +511,16 @@ int adns__setnonblock(adns_state ads, int fd) { return 0; } -static int init_begin(adns_state *ads_r, adns_initflags flags, FILE *diagfile) { +static int init_begin(adns_state *ads_r, adns_initflags flags, + adns_logcallbackfn *logfn, void *logfndata) { adns_state ads; + pid_t pid; ads= malloc(sizeof(*ads)); if (!ads) return errno; ads->iflags= flags; - ads->diagfile= diagfile; + ads->logfn= logfn; + ads->logfndata= logfndata; ads->configerrno= 0; LIST_INIT(ads->udpw); LIST_INIT(ads->tcpw); @@ -483,6 +538,11 @@ static int init_begin(adns_state *ads_r, adns_initflags flags, FILE *diagfile) { timerclear(&ads->tcptimeout); ads->searchlist= 0; + pid= getpid(); + ads->rand48xsubi[0]= pid; + ads->rand48xsubi[1]= (unsigned long)pid >> 16; + ads->rand48xsubi[2]= pid ^ ((unsigned long)pid >> 16); + *ads_r= ads; return 0; } @@ -493,8 +553,8 @@ static int init_finish(adns_state ads) { int r; if (!ads->nservers) { - if (ads->diagfile && ads->iflags & adns_if_debug) - fprintf(ads->diagfile,"adns: no nameservers, using localhost\n"); + 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); } @@ -523,12 +583,18 @@ static void init_abort(adns_state ads) { free(ads); } -int adns_init(adns_state *ads_r, adns_initflags flags, FILE *diagfile) { +static void logfn_file(adns_state ads, void *logfndata, + const char *fmt, va_list al) { + vfprintf(logfndata,fmt,al); +} + +static int init_files(adns_state *ads_r, adns_initflags flags, + adns_logcallbackfn *logfn, void *logfndata) { adns_state ads; const char *res_options, *adns_res_options; int r; - r= init_begin(&ads, flags, diagfile ? diagfile : stderr); + r= init_begin(&ads, flags, logfn, logfndata); if (r) return r; res_options= instrum_getenv(ads,"RES_OPTIONS"); @@ -564,12 +630,18 @@ int adns_init(adns_state *ads_r, adns_initflags flags, FILE *diagfile) { return 0; } -int adns_init_strcfg(adns_state *ads_r, adns_initflags flags, - FILE *diagfile, const char *configtext) { +int adns_init(adns_state *ads_r, adns_initflags flags, FILE *diagfile) { + return init_files(ads_r, flags, logfn_file, diagfile ? diagfile : stderr); +} + +static int init_strcfg(adns_state *ads_r, adns_initflags flags, + adns_logcallbackfn *logfn, void *logfndata, + const char *configtext) { adns_state ads; int r; - r= init_begin(&ads, flags, diagfile); if (r) return r; + r= init_begin(&ads, flags, logfn, logfndata); + if (r) return r; readconfigtext(ads,configtext,""); if (ads->configerrno) { @@ -584,6 +656,24 @@ int adns_init_strcfg(adns_state *ads_r, adns_initflags flags, return 0; } +int adns_init_strcfg(adns_state *ads_r, adns_initflags flags, + FILE *diagfile, const char *configtext) { + return init_strcfg(ads_r, flags, + diagfile ? logfn_file : 0, diagfile, + configtext); +} + +int adns_init_logfn(adns_state *newstate_r, adns_initflags flags, + const char *configtext /*0=>use default config files*/, + adns_logcallbackfn *logfn /*0=>logfndata is a FILE* */, + void *logfndata /*0 with logfn==0 => discard*/) { + if (!logfn && logfndata) + logfn= logfn_file; + if (configtext) + return init_strcfg(newstate_r, flags, logfn, logfndata, configtext); + else + return init_files(newstate_r, flags, logfn, logfndata); +} void adns_finish(adns_state ads) { adns__consistency(ads,0,cc_entex);