/**/
+#include <stdarg.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <assert.h>
+
#include <arpa/nameser.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
#include "adns-internal.h"
do { \
(node)->back= 0; \
(node)->next= (list).tail; \
- if (list).tail (list).tail->back= (node); else (list).head= (node); \
+ if ((list).tail) (list).tail->back= (node); else (list).head= (node); \
(list).tail= (node); \
} while(0)
-void addserver(adns_state ads, struct in_addr addr) {
+static void vdebug(adns_state ads, const char *fmt, va_list al) {
+ if (!(ads->iflags & adns_if_debug)) return;
+ fputs("adns debug: ",stderr);
+ vfprintf(stderr,fmt,al);
+ fputc('\n',stderr);
+}
+
+static void debug(adns_state ads, const char *fmt, ...) {
+ va_list al;
+
+ va_start(al,fmt);
+ vdebug(ads,fmt,al);
+ va_end(al);
+}
+
+static void vdiag(adns_state ads, const char *fmt, va_list al) {
+ if (ads->iflags & adns_if_noerrprint) return;
+ fputs("adns: ",stderr);
+ vfprintf(stderr,fmt,al);
+ fputc('\n',stderr);
+}
+
+static void diag(adns_state ads, const char *fmt, ...) {
+ va_list al;
+
+ va_start(al,fmt);
+ vdiag(ads,fmt,al);
+ va_end(al);
+}
+
+static void addserver(adns_state ads, struct in_addr addr) {
+ int i;
+
+ for (i=0; i<ads->nservers; i++) {
+ if (ads->servers[i].addr.s_addr == addr.s_addr) {
+ debug(ads,"duplicate nameserver %s ignored",inet_ntoa(addr));
+ return;
+ }
+ }
+
if (ads->nservers>=MAXSERVERS) {
- if (ads->flags & adns_if_debug)
- fprintf(stderr,"adns: too many nameservers, ignoring %s",
- inet_ntoa(addr));
- } else {
- ads->servers[ads->nservers].addr= addr;
- ads->servers[ads->nservers].tcpsocket= -1;
- ads->nservers++;
+ diag(ads,"too many nameservers, ignoring %s",inet_ntoa(addr));
+ return;
+ }
+
+ ads->servers[ads->nservers].addr= addr;
+ ads->servers[ads->nservers].tcpsocket= -1;
+ ads->nservers++;
+}
+
+static void configparseerr(adns_state ads, const char *fn, int lno,
+ const char *fmt, ...) {
+ va_list al;
+
+ if (ads->iflags & adns_if_noerrprint) return;
+ if (lno==-1) fprintf(stderr,"adns: %s: ",fn);
+ else fprintf(stderr,"adns: %s:%d: ",fn,lno);
+ va_start(al,fmt);
+ vfprintf(stderr,fmt,al);
+ va_end(al);
+ fputc('\n',stderr);
+}
+
+static void ccf_nameserver(adns_state ads, const char *fn, int lno, const char *buf) {
+ struct in_addr ia;
+
+ if (!inet_aton(buf,&ia)) {
+ configparseerr(ads,fn,lno,"invalid nameserver address `%s'",buf);
+ return;
+ }
+ debug(ads,"using nameserver %s",inet_ntoa(ia));
+ addserver(ads,ia);
+}
+
+static void ccf_search(adns_state ads, const char *fn, int lno, const char *buf) {
+ if (!buf) return;
+ diag(ads,"warning - `search' ignored FIXME");
+}
+
+static void ccf_sortlist(adns_state ads, const char *fn, int lno, const char *buf) {
+ diag(ads,"warning - `sortlist' ignored FIXME");
+}
+
+static void ccf_options(adns_state ads, const char *fn, int lno, const char *buf) {
+ if (!buf) return;
+ diag(ads,"warning - `options' ignored FIXME");
+}
+
+static void ccf_clearnss(adns_state ads, const char *fn, int lno, const char *buf) {
+ ads->nservers= 0;
+}
+
+static const struct configcommandinfo {
+ const char *name;
+ void (*fn)(adns_state ads, const char *fn, int lno, const char *buf);
+} configcommandinfos[]= {
+ { "nameserver", ccf_nameserver },
+ { "domain", ccf_search },
+ { "search", ccf_search },
+ { "sortlist", ccf_sortlist },
+ { "options", ccf_options },
+ { "clearnameservers", ccf_clearnss },
+ { 0 }
+};
+
+static int whitespace(int c) {
+ return c==' ' || c=='\n' || c=='\t';
+}
+
+static void readconfig(adns_state ads, const char *filename) {
+ char linebuf[2000], *p, *q;
+ FILE *file;
+ int lno, l, c;
+ const struct configcommandinfo *ccip;
+
+ file= fopen(filename,"r");
+ if (!file) {
+ if (errno == ENOENT) {
+ debug(ads,"configuration file `%s' does not exist",filename);
+ return;
+ }
+ diag(ads,"cannot open configuration file `%s': %s",filename,strerror(errno));
+ return;
}
+
+ for (lno=1; fgets(linebuf,sizeof(linebuf),file); lno++) {
+ l= strlen(linebuf);
+ if (!l) continue;
+ if (linebuf[l-1] != '\n' && !feof(file)) {
+ diag(ads,"%s:%d: line too long",filename,lno);
+ while ((c= getc(file)) != EOF && c != '\n') { }
+ if (c == EOF) break;
+ continue;
+ }
+ while (l>0 && whitespace(linebuf[l-1])) l--;
+ linebuf[l]= 0;
+ p= linebuf;
+ while (whitespace(*p)) p++;
+ if (*p == '#' || *p == '\n') continue;
+ q= p;
+ while (*q && !whitespace(*q)) q++;
+ for (ccip=configcommandinfos;
+ ccip->name && strncmp(ccip->name,p,q-p);
+ ccip++);
+ if (!ccip->name) {
+ diag(ads,"%s:%d: unknown configuration directive `%.*s'",filename,lno,q-p,p);
+ continue;
+ }
+ while (whitespace(*q)) q++;
+ ccip->fn(ads,filename,lno,q);
+ }
+ if (ferror(file)) {
+ diag(ads,"%s:%d: read error: %s",filename,lno,strerror(errno));
+ }
+ fclose(file);
}
-void readconfig(adns_state ads, const char *filename) {
+static const char *instrum_getenv(adns_state ads, const char *envvar) {
+ const char *value;
+
+ value= getenv(envvar);
+ if (!value) debug(ads,"environment variable %s not set",envvar);
+ else debug(ads,"environment variable %s set to `%s'",envvar,value);
+ return value;
}
-void readconfigenv(adns_state ads, const char *envvar) {
+static void readconfigenv(adns_state ads, const char *envvar) {
const char *filename;
- if (flags & adns_if_noenv) return;
- filename= getenv(envvar); if (!filename) return;
- readconfig(ads,filename);
+ if (ads->iflags & adns_if_noenv) {
+ debug(ads,"not checking environment variable `%s'",envvar);
+ return;
+ }
+ filename= instrum_getenv(ads,envvar);
+ if (filename) readconfig(ads,filename);
}
-int adns_init(adns_state *ads_r, int flags) {
+int adns_init(adns_state *ads_r, adns_initflags flags) {
adns_state ads;
- const char *cfile;
+ const char *res_options, *adns_res_options;
ads= malloc(sizeof(*ads)); if (!ads) return errno;
- ads->queue.head= ads->queue.tail= 0;
+ ads->input.head= ads->input.tail= 0;
ads->timew.head= ads->timew.tail= 0;
- ads->child.head= ads->child.tail= 0;
- ads->ready.head= ads->ready.tail= 0;
+ ads->childw.head= ads->childw.tail= 0;
+ ads->output.head= ads->output.tail= 0;
ads->udpsocket= -1;
ads->qbufavail= 0;
ads->qbuf= 0;
ads->tcpbufavail= ads->tcpbufused= ads->tcpbufdone= 0;
ads->tcpbuf= 0;
- ads->flags= flags;
+ ads->iflags= flags;
ads->nservers= 0;
+ ads->iflags= flags;
+
+ res_options= instrum_getenv(ads,"RES_OPTIONS");
+ adns_res_options= instrum_getenv(ads,"ADNS_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");
readconfigenv(ads,"RES_CONF");
readconfigenv(ads,"ADNS_RES_CONF");
+
+ ccf_options(ads,"RES_OPTIONS",-1,res_options);
+ ccf_options(ads,"ADNS_RES_OPTIONS",-1,adns_res_options);
+
+ ccf_search(ads,"LOCALDOMAIN",-1,instrum_getenv(ads,"LOCALDOMAIN"));
+ ccf_search(ads,"ADNS_LOCALDOMAIN",-1,instrum_getenv(ads,"ADNS_LOCALDOMAIN"));
+
if (!ads->nservers) {
- if (ads->flags & adns_if_debug)
+ struct in_addr ia;
+ if (ads->iflags & adns_if_debug)
fprintf(stderr,"adns: no nameservers, using localhost\n");
- addserver(ads,INADDR_LOOPBACK);
+ ia.s_addr= INADDR_LOOPBACK;
+ addserver(ads,ia);
}
*ads_r= ads;
return 0;
}
-void query_fail(adns_state ads, adns_query qu, ands_status stat) {
- struct adns_answer ans;
+static void query_fail(adns_state ads, adns_query qu, adns_status stat) {
+ adns_answer *ans;
ans= qu->answer;
if (!ans) ans= malloc(sizeof(*qu->answer));
ans->nrrs= 0;
}
qu->answer= ans;
- LIST_LINK_TAIL(ads.ready,qu);
+ LIST_LINK_TAIL(ads->input,qu);
+}
+
+void adns_interest(adns_state ads, int *maxfd,
+ fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
+ struct timeval **tv_io, struct timeval *tvbuf) {
+ abort(); /* FIXME */
+}
+
+static void autosys(adns_state ads) {
+ if (ads->iflags & adns_if_noautosys) return;
+ adns_callback(ads,-1,0,0,0);
+}
+
+void adns_cancel(adns_state ads, adns_query query) {
+ abort(); /* FIXME */
+}
+
+int adns_callback(adns_state ads, int maxfd,
+ const fd_set *readfds, const fd_set *writefds,
+ const fd_set *exceptfds) {
+ abort(); /* FIXME */
}
-void adns_event(adns_state ads,
- fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
- int *maxfd, struct timeval *tv) {
- for (
+static int internal_check(adns_state ads,
+ adns_query *query_io,
+ adns_answer *answer,
+ void *context_r) {
+ abort(); /* FIXME */
+}
+
+int adns_wait(adns_state ads,
+ adns_query *query_io,
+ adns_answer *answer,
+ void *context_r) {
+ int r, maxfd, rsel, rcb;
+ fd_set readfds, writefds, exceptfds;
+ struct timeval tvbuf, *tvp;
+
+ for (;;) {
+ r= internal_check(ads,query_io,answer,context_r);
+ if (r && r != EWOULDBLOCK) return r;
+ FD_ZERO(&readfds); FD_ZERO(&writefds); FD_ZERO(&exceptfds);
+ maxfd= 0; tvp= 0;
+ adns_interest(ads,&maxfd,&readfds,&writefds,&exceptfds,&tvp,&tvbuf);
+ rsel= select(maxfd,&readfds,&writefds,&exceptfds,tvp);
+ if (rsel==-1) return r;
+ rcb= adns_callback(ads,maxfd,&readfds,&writefds,&exceptfds);
+ assert(rcb==rsel);
+ }
+}
+
+int adns_check(adns_state ads,
+ adns_query *query_io,
+ adns_answer *answer,
+ void *context_r) {
+ autosys(ads);
+ return internal_check(ads,query_io,answer,context_r);
+}
+
+int adns_synchronous(adns_state ads,
+ const char *owner,
+ adns_rrtype type,
+ int flags,
+ adns_answer *answer) {
+ adns_query qu;
+ int r;
+
+ r= adns_submit(ads,owner,type,flags,0,&qu);
+ if (r) return r;
+
+ r= adns_wait(ads,&qu,answer,0);
+ if (r) adns_cancel(ads,qu);
+ return r;
}
int adns_submit(adns_state ads,
adns_query *query_r) {
adns_query qu;
adns_status stat;
- int ol, r;
+ int ol;
stat= 0;
ol= strlen(owner);
- if (ol>MAXDNAME+1) { stat= ands_s_invaliddomain; ol= 0; }
+ if (ol>MAXDNAME+1) { stat= adns_s_invaliddomain; ol= 0; }
if (ol>0 && owner[ol-1]=='.') { flags &= ~adns_f_search; ol--; }
qu= malloc(sizeof(*qu)+ol+1); if (!qu) return errno;
qu->next= qu->back= qu->parent= qu->child= 0;
qu->answer= 0;
qu->flags= flags;
qu->context= context;
- qu->retries= 0;
+ qu->udpretries= 0;
qu->server= 0;
memcpy(qu->owner,owner,ol); qu->owner[ol]= 0;
if (stat) {
query_fail(ads,qu,stat);
} else {
LIST_LINK_TAIL(ads->input,qu);
- adns_event(ads,0,0,0,0,0);
+ autosys(ads);
}
*query_r= qu;
+ return 0;
}
~ianmdlvl / adns.git / blobdiff