* - management of global state
*/
/*
- * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+ * This file is
+ * Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ * It is part of adns, which is
+ * 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 <stdlib.h>
#include <errno.h>
-#include <string.h>
+#include <limits.h>
#include <unistd.h>
#include <fcntl.h>
+#include <sys/types.h>
#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
#include <arpa/inet.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;
}
*newchars++ = 0;
}
- free(ads->searchlist);
+ freesearchlist(ads);
ads->nsearchlist= count;
ads->searchlist= newptrs;
- /* fixme: actually pay attention */
}
static void ccf_sortlist(adns_state ads, const char *fn, int lno, const char *buf) {
continue;
}
- memcpy(tbuf,word,l);
+ memcpy(tbuf,word,l); tbuf[l]= 0;
slash= strchr(tbuf,'/');
if (slash) *slash++= 0;
}
static void ccf_options(adns_state ads, const char *fn, int lno, const char *buf) {
+ const char *word;
+ char *ep;
+ unsigned long v;
+ int l;
+
if (!buf) return;
- adns__diag(ads,-1,0,"warning - `options' ignored fixme");
+
+ while (nextword(&buf,&word,&l)) {
+ if (l==5 && !memcmp(word,"debug",5)) {
+ 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) {
+ configparseerr(ads,fn,lno,"option `%.*s' malformed or has bad value",l,word);
+ continue;
+ }
+ ads->searchndots= v;
+ continue;
+ }
+ if (l>=12 && !memcmp(word,"adns_checkc:",12)) {
+ if (!strcmp(word+12,"none")) {
+ ads->iflags &= ~adns_if_checkc_freq;
+ ads->iflags |= adns_if_checkc_entex;
+ } else if (!strcmp(word+12,"entex")) {
+ ads->iflags &= ~adns_if_checkc_freq;
+ ads->iflags |= adns_if_checkc_entex;
+ } else if (!strcmp(word+12,"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);
+ }
+ continue;
+ }
+ adns__diag(ads,-1,0,"%s:%d: unknown option `%.*s'", fn,lno, l,word);
+ }
}
static void ccf_clearnss(adns_state ads, const char *fn, int lno, const char *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 }
};
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);
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) {
ads->iflags= flags;
ads->diagfile= diagfile;
- LIST_INIT(ads->timew);
+ ads->configerrno= 0;
+ LIST_INIT(ads->udpw);
+ LIST_INIT(ads->tcpw);
LIST_INIT(ads->childw);
LIST_INIT(ads->output);
+ ads->forallnext= 0;
ads->nextid= 0x311f;
ads->udpsocket= ads->tcpsocket= -1;
adns__vbuf_init(&ads->tcpsend);
adns__vbuf_init(&ads->tcprecv);
+ ads->tcprecv_skip= 0;
ads->nservers= ads->nsortlist= ads->nsearchlist= ads->tcpserver= 0;
+ ads->searchndots= 1;
ads->tcpstate= server_disconnected;
- ads->searchlist= 0;
timerclear(&ads->tcptimeout);
+ ads->searchlist= 0;
*ads_r= ads;
return 0;
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");
r= init_finish(ads);
if (r) return r;
+ adns__consistency(ads,0,cc_entex);
*ads_r= ads;
return 0;
}
}
r= init_finish(ads); if (r) return r;
+ adns__consistency(ads,0,cc_entex);
*ads_r= ads;
return 0;
}
+
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->udpw.head ? ads->udpw.head :
+ ads->tcpw.head ? ads->tcpw.head :
+ ads->childw.head ? ads->childw.head :
+ ads->output.head;
+}
+
+adns_query adns_forallqueries_next(adns_state ads, void **context_r) {
+ adns_query qu, nqu;
+
+ adns__consistency(ads,0,cc_entex);
+ nqu= ads->forallnext;
+ for (;;) {
+ qu= nqu;
+ if (!qu) return 0;
+ if (qu->next) {
+ nqu= qu->next;
+ } 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 {
+ nqu= 0;
+ }
+ if (!qu->parent) break;
+ }
+ ads->forallnext= nqu;
+ if (context_r) *context_r= qu->ctx.ext;
+ return qu;
+}
~mdw / adns / blobdiff