* Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
*
* It is part of adns, which is
- * Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
- * Copyright (C) 1999 Tony Finch <dot@dotat.at>
+ * Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+ * Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
*
* 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
#include <unistd.h>
#include <fcntl.h>
+#include <sys/types.h>
#include <netdb.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include "internal.h"
-static void readconfig(adns_state ads, const char *filename);
+static void readconfig(adns_state ads, const char *filename, int warnmissing);
static void addserver(adns_state ads, struct in_addr addr) {
int i;
ads->nservers++;
}
+static void freesearchlist(adns_state ads) {
+ if (ads->nsearchlist) free(*ads->searchlist);
+ free(ads->searchlist);
+}
+
static void saveerr(adns_state ads, int en) {
if (!ads->configerrno) ads->configerrno= en;
}
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) {
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)) {
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;
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;
*newchars++ = 0;
}
- free(ads->searchlist);
+ freesearchlist(ads);
ads->nsearchlist= count;
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;
struct in_addr base, mask;
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;
}
continue;
}
if (base.s_addr & ~mask.s_addr) {
- configparseerr(ads,fn,lno,
- "mask `%s' in sortlist overlaps address `%s'",slash,tbuf);
+ configparseerr(ads,fn,lno, "mask `%s' in sortlist"
+ " overlaps address `%s'",slash,tbuf);
continue;
}
} else {
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;
}
}
}
-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;
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;
}
}
-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;
}
- readconfig(ads,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 {
{ "options", ccf_options },
{ "clearnameservers", ccf_clearnss },
{ "include", ccf_include },
+ { "lookup", ccf_lookup }, /* OpenBSD */
{ 0 }
};
} 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;
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'",
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;
}
-static void readconfig(adns_state ads, const char *filename) {
+static void readconfig(adns_state ads, const char *filename, int warnmissing) {
getline_ctx gl_ctx;
gl_ctx.file= fopen(filename,"r");
if (!gl_ctx.file) {
if (errno == ENOENT) {
- adns__debug(ads,-1,0,"configuration file `%s' does not exist",filename);
+ if (warnmissing)
+ adns__debug(ads,-1,0, "configuration file"
+ " `%s' does not exist",filename);
return;
}
saveerr(ads,errno);
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;
return;
}
filename= instrum_getenv(ads,envvar);
- if (filename) readconfig(ads,filename);
+ if (filename) readconfig(ads,filename,1);
}
static void readconfigenvtext(adns_state ads, const char *envvar) {
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;
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->timew);
+ LIST_INIT(ads->udpw);
+ LIST_INIT(ads->tcpw);
LIST_INIT(ads->childw);
LIST_INIT(ads->output);
ads->forallnext= 0;
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);
}
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");
ccf_options(ads,"RES_OPTIONS",-1,res_options);
ccf_options(ads,"ADNS_RES_OPTIONS",-1,adns_res_options);
- readconfig(ads,"/etc/resolv.conf");
+ readconfig(ads,"/etc/resolv.conf",1);
+ readconfig(ads,"/etc/resolv-adns.conf",0);
readconfigenv(ads,"RES_CONF");
readconfigenv(ads,"ADNS_RES_CONF");
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,"<supplied configuration text>");
if (ads->configerrno) {
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);
for (;;) {
- if (ads->timew.head) adns_cancel(ads->timew.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 break;
if (ads->tcpsocket >= 0) close(ads->tcpsocket);
adns__vbuf_free(&ads->tcpsend);
adns__vbuf_free(&ads->tcprecv);
+ freesearchlist(ads);
free(ads);
}
void adns_forallqueries_begin(adns_state ads) {
adns__consistency(ads,0,cc_entex);
ads->forallnext=
- ads->timew.head ? ads->timew.head :
+ ads->udpw.head ? ads->udpw.head :
+ ads->tcpw.head ? ads->tcpw.head :
ads->childw.head ? ads->childw.head :
ads->output.head;
}
if (!qu) return 0;
if (qu->next) {
nqu= qu->next;
- } else if (qu == ads->timew.tail) {
- if (ads->childw.head) {
- nqu= ads->childw.head;
- } else {
- nqu= ads->output.head;
- }
+ } else if (qu == ads->udpw.tail) {
+ nqu=
+ ads->tcpw.head ? ads->tcpw.head :
+ ads->childw.head ? ads->childw.head :
+ ads->output.head;
+ } else if (qu == ads->tcpw.tail) {
+ nqu=
+ ads->childw.head ? ads->childw.head :
+ ads->output.head;
} else if (qu == ads->childw.tail) {
nqu= ads->output.head;
} else {
if (context_r) *context_r= qu->ctx.ext;
return qu;
}
-
-void adns__checkqueues(adns_state ads) {
- adns_forallqueries_begin(ads);
- while (adns_forallqueries_next(ads,0));
-}
~mdw / adns / blobdiff