From: ian Date: Sat, 3 Oct 1998 21:44:12 +0000 (+0000) Subject: Shuffle stuff around. X-Git-Tag: abandon.1998-10-04.rrtypenoenum~8 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=commitdiff_plain;h=656b2da98fe9588cf3d9a229fb00c7d64e84c8d2 Shuffle stuff around. --- diff --git a/src/Makefile b/src/Makefile index 7e5312e..2c72323 100644 --- a/src/Makefile +++ b/src/Makefile @@ -7,4 +7,4 @@ WERROR=-Werror all: dtest -dtest: dtest.o adns.o +dtest: dtest.o event.o query.o setup.o submit.o diff --git a/src/Makefile.in b/src/Makefile.in index 7e5312e..2c72323 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -7,4 +7,4 @@ WERROR=-Werror all: dtest -dtest: dtest.o adns.o +dtest: dtest.o event.o query.o setup.o submit.o diff --git a/src/adns-internal.h b/src/adns-internal.h index 08a2948..4da72bc 100644 --- a/src/adns-internal.h +++ b/src/adns-internal.h @@ -7,12 +7,16 @@ #include "adns.h" +/* Configuration and constants */ + #define MAXSERVERS 5 #define MAXUDPRETRIES 15 #define UDPRETRYMS 2000 #define TCPMS 30000 #define LOCALRESOURCEMS 20 +/* Shared data structures */ + union adns__align { adns_status status; char *cp; @@ -68,4 +72,50 @@ struct adns__state { } servers[MAXSERVERS]; }; +/* From setup.c: */ + +void adns__debug(adns_state ads, const char *fmt, ...) PRINTFFORMAT(2,3); +void adns__diag(adns_state ads, const char *fmt, ...) PRINTFFORMAT(2,3); + +/* From submit.c: */ + +void adns__query_fail(adns_state ads, adns_query qu, adns_status stat); + +/* From query.c: */ + +void adns__quproc_tosend(adns_state ads, adns_query qu, struct timeval now) { + +/* Useful static inline functions: */ + +static inline void timevaladd(struct timeval *tv_io, long ms) { + struct timeval tmp; + assert(ms>=0); + tmp= *tv_io; + tmp.tv_usec += (ms%1000)*1000; + tmp.tv_sec += ms/1000; + if (tmp.tv_usec >= 1000) { tmp.tv_sec++; tmp.tv_usec -= 1000; } + *tv_io= tmp; +} + +/* Useful macros */ + +#define LIST_UNLINK_PART(list,node,part) \ + do { \ + if ((node)->back) (node)->back->part next= (node)->part next; \ + else (list).head= (node)->part next; \ + if ((node)->next) (node)->next->part back= (node)->part back; \ + else (list).tail= (node)->part back; \ + } while(0) + +#define LIST_LINK_TAIL_PART(list,node,part) \ + do { \ + (node)->part back= 0; \ + (node)->part next= (list).tail; \ + if ((list).tail) (list).tail->part back= (node); else (list).part head= (node); \ + (list).tail= (node); \ + } while(0) + +#define LIST_UNLINK(list,node) LIST_UNLINK_PART(list,node,) +#define LIST_LINK_TAIL_PART(list,node) LIST_LINK_TAIL(list,node,) + #endif diff --git a/src/adns.c b/src/adns.c index c810935..6c4a7cf 100644 --- a/src/adns.c +++ b/src/adns.c @@ -15,771 +15,3 @@ #include #include "adns-internal.h" - -#define LIST_UNLINK_PART(list,node,part) \ - do { \ - if ((node)->back) (node)->back->part next= (node)->part next; \ - else (list).head= (node)->part next; \ - if ((node)->next) (node)->next->part back= (node)->part back; \ - else (list).tail= (node)->part back; \ - } while(0) - -#define LIST_LINK_TAIL_PART(list,node,part) \ - do { \ - (node)->part back= 0; \ - (node)->part next= (list).tail; \ - if ((list).tail) (list).tail->part back= (node); else (list).part head= (node); \ - (list).tail= (node); \ - } while(0) - -#define LIST_UNLINK(list,node) LIST_UNLINK_PART(list,node,) -#define LIST_LINK_TAIL_PART(list,node) LIST_LINK_TAIL(list,node,) - -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; - struct server *ss; - - for (i=0; inservers; 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) { - diag(ads,"too many nameservers, ignoring %s",inet_ntoa(addr)); - return; - } - - ss= ads->servers+ads->nservers; - ss->addr= addr; - ss->state= server_disc; - ss->connw.head= ss->connw.tail= 0; - 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 ctype_whitespace(int c) { return c==' ' || c=='\n' || c=='\t'; } -static int ctype_digit(int c) { return c>='0' && c<='9'; } - -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 && ctype_whitespace(linebuf[l-1])) l--; - linebuf[l]= 0; - p= linebuf; - while (ctype_whitespace(*p)) p++; - if (*p == '#' || *p == '\n') continue; - q= p; - while (*q && !ctype_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 (ctype_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); -} - -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; -} - -static void readconfigenv(adns_state ads, const char *envvar) { - const char *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, adns_initflags flags) { - adns_state ads; - const char *res_options, *adns_res_options; - struct protoent *proto; - int r; - - ads= malloc(sizeof(*ads)); if (!ads) return errno; - ads->tosend.head= ads->tosend.tail= 0; - ads->timew.head= ads->timew.tail= 0; - ads->childw.head= ads->childw.tail= 0; - ads->output.head= ads->output.tail= 0; - ads->nextid= 0x311f; - ads->udpsocket= -1; - ads->qbufavail= 0; - ads->qbuf= 0; - ads->tcpbufavail= ads->tcpbufused= ads->tcpbufdone= 0; - ads->tcpbuf= 0; - 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) { - struct in_addr ia; - if (ads->iflags & adns_if_debug) - fprintf(stderr,"adns: no nameservers, using localhost\n"); - ia.s_addr= INADDR_LOOPBACK; - addserver(ads,ia); - } - - proto= getprotobyname("udp"); if (!proto) { r= ENOPROTOOPT; goto x_free; } - ads->udpsocket= socket(AF_INET,SOCK_DGRAM,proto->p_proto); - if (!ads->udpsocket) { r= errno; goto x_closeudp; } - - *ads_r= ads; - return 0; - - x_closeudp: - close(ads->udpsocket); - x_free: - free(ads); - return r; -} - -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)); - if (ans) { - ans->status= stat; - ans->cname= 0; - ans->type= qu->type; - ans->nrrs= 0; - } - qu->answer= ans; - qu->id= -1; - LIST_LINK_TAIL(ads->output,qu); -} - -int adns_finish(adns_state ads) { - abort(); /* FIXME */ -} - -static void autosys(adns_state ads, struct timeval now) { - 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 */ -} - -static int callb_checkfd(int maxfd, const fd_set *fds, int fd) { - return maxfd<0 || !fds ? 1 : - fdtcpstate; - - if (ads->tcpstate == server_connecting) { - if (callb_checkfd(maxfd,writefds,ads->tcpsocket)) { - count++; - assert(ads->tcprecv.used==0); - vbuf_ensure(&ads->tcprecv,1); - if (ads->tcprecv.buf) { - r= read(ads->tcpsocket,&ads->tcprecv.buf,1); - if (r==0 || (r<0 && (errno==EAGAIN || errno==EWOULDBLOCK))) { - diag("nameserver %s TCP connection made", - inet_ntoa(ads->servers[ads->tcpserver].addr)); - ads->tcpstate= server_connected; - } else if (r>0) { - tcpserver_broken(ads,"connect/read","sent data before first request"); - } else if (errno!=EINTR) { - tcpserver_broken(ads,"connect",strerror(errno)); - } - } - } - } - if (ads->tcpstate == server_connected) { - if (oldtcpstate == server_connected) - count+= callb_checkfd(maxfd,readfds,ads->tcpsocket) + - callb_checkfd(maxfd,exceptfds,ads->tcpsocket) + - (ads->tcpsend.used && callb_checkfd(maxfd,writefds,ads->tcpsocket)); - if (oldtcpstate != server_connected || callb_checkfd(maxfd,readfds,ads->tcpsocket)) { - skip= 0; - for (;;) { - if (ads->tcprecv.usedtcprecv.buf[skip]<<8) | ads->tcprecv.buf[skip+1]; - if (ads->tcprecv.usedtcprecv.buf+skip+2,dgramlen,-1); - skip+= 2+dgramlen; continue; - } - } - Ads->tcprecv.used -= skip; - memmove(ads->tcprecv.buf,ads->tcprecv.buf+skip,ads->tcprecv.used); - vbuf_ensure(&ads->tcprecv,want); - if (ads->tcprecv.used >= ads->tcprecv.avail) break; - r= read(ads->tcpsocket, - ads->tcprecv.buf+ads->tcprecv.used, - ads->tcprecv.avail-ads->tcprecv.used); - if (r>0) { - ads->tcprecv.used+= r; - } else { - if (r<0) { - if (errno==EAGAIN || errno==EWOULDBLOCK || errno==ENOMEM) break; - if (errno==EINTR) continue; - } - tcpserver_broken(ads->tcpserver,"read",r?strerror(errno):"closed"); - break; - } - } - } else if (callb_checkfd(maxfd,exceptfds,ads->tcpsocket)) { - tcpserver_broken(ads->tcpserver,"select","exceptional condition detected"); - } else if (ads->tcpsend.used && callb_checkfd(maxfd,writefds,ads->tcpsocket)) { - r= write(ads->tcpsocket,ads->tcpsend.buf,ads->tcpsend.used); - if (r<0) { - if (errno!=EAGAIN && errno!=EWOULDBLOCK && errno!=ENOMEM && errno!=EINTR) { - tcpserver_broken(ads->tcpserver,"write",strerror(errno)); - } - } else if (r>0) { - ads->tcpsend.used -= r; - memmove(ads->tcpsend.buf,ads->tcpsend.buf+r,ads->tcpsend.used); - } - } - } - - if ( - break; - - - } - - tcpserver_broken( - - if (ads- - used= 0; - for (;;) { - vbuf_ensure(&ads->tcprecv,2); - vbuf_ensure(&ads->tcprecv, - if (ads->tcprecv.avail<2) break; - if (ads->tcprecv.used - - if (ads->tcprecv.used<2 && ads->tcprecv.avail - if (ads->tcprecv.used<2 && ads->tcprecv.avail - r= read(ads->tcpsocket, - if (adns->tcprecv.used<2) { - if ( - - if (ads->tcpstate != server_disc) { - - - } - if (maxfd<0 || !readfds || (FD_ISSET - ads-> - - abort(); /* FIXME */ -} - diag("nameserver #%d (%s) TCP connection died: %s", - inet_ntoa(ads->servers[tcpserver].addr), - -static void inter_maxto(struct timeval **tv_io, struct timeval *tvbuf, - struct timeval maxto) { - struct timeval rbuf; - - rbuf= *tv_io; - if (!rbuf) { *tvbuf= maxto; *tv_io= tvbuf; return; } - if (timercmp(rbuf,&maxto,>)) *rbuf= maxto; -} - -static void inter_maxtoabs(struct timeval **tv_io, struct timeval *tvbuf, - struct timeval now, struct timeval maxtime) { - ldiv_t dr; - - maxtime.tv_sec -= (now.tv_sec-1); - maxtime.tv_usec += (1000-now.tv_usec); - dr= ldiv(maxtime.tv_usec,1000); - maxtime.tv_sec += dr.quot; - maxtime.tv_usec -= dr.rem; - inter_maxto(tv_io,tvbuf,maxtime); -} - -static void localresourcerr(struct timeval **tv_io, struct timeval *tvbuf, - const char *syscall) { - struct timeval tvto_lr; - - diag(ads,"local system resources scarce (during %s): %s",syscall,strerror(errno)); - timerclear(&tvto_lr); timevaladd(&tvto_lr,LOCALRESOURCEMS); - inter_maxto(tv_io, tvbuf, tvto_lr); - return; -} - -static inline void timevaladd(struct timeval *tv_io, long ms) { - struct timeval tmp; - assert(ms>=0); - tmp= *tv_io; - tmp.tv_usec += (ms%1000)*1000; - tmp.tv_sec += ms/1000; - if (tmp.tv_usec >= 1000) { tmp.tv_sec++; tmp.tv_usec -= 1000; } - *tv_io= tmp; -} - -static void inter_addfd(int *maxfd, fd_set *fds, int fd) { - if (fd>=*maxfd) *maxfd= fd+1; - FD_SET(fd,fds); -} - -void adns_interest(adns_state ads, int *maxfd, - fd_set *readfds, fd_set *writefds, fd_set *exceptfds, - struct timeval **tv_io, struct timeval *tvbuf) { - struct timeval now; - adns_query qu; - int r; - - r= gettimeofday(&now,0); - if (r) { localresourcerr(tv_io,tvbuf,"gettimeofday"); return; } - - for (qu= ads->timew; qu; qu= nqu) { - nqu= qu->next; - if (timercmp(&now,qu->timeout,>)) { - DLIST_UNLINK(ads->timew,qu); - if (qu->nextudpserver == -1) { - query_fail(ads,qu,adns_s_notresponding); - } else { - DLIST_LINKTAIL(ads->tosend,qu); - } - } else { - inter_maxtoabs(tv_io,tvbuf,now,qu->timeout); - } - } - - for (qu= ads->tosend; qu; qu= nqu) { - nqu= qu->next; - quproc_tosend(ads,qu,now); - } - - inter_addfd(maxfd,readfds,ads->udpsocket); - switch (ads->tcpstate) { - case server_disc: - break; - case server_connecting: - inter_addfd(maxfd,writefds,ads->tcpsocket); - break; - case server_connected: - inter_addfd(maxfd,readfds,ads->tcpsocket); - inter_addfd(maxfd,exceptfds,ads->tcpsocket); - if (ads->opbufused) inter_addfd(maxfd,writefds,ads->tcpsocket); - default: - abort(); - } - -} - -static int internal_check(adns_state ads, - adns_query *query_io, - adns_answer **answer, - void **context_r) { - adns_query qu; - - qu= *query_io; - if (!qu) { - if (!ads->output.head) return EWOULDBLOCK; - qu= ads->output.head; - } else { - if (qu->id>=0) return EWOULDBLOCK; - } - LIST_UNLINK(ads->output,qu); - *answer= qu->answer; - if (context_r) *context_r= qu->context; - free(qu); - return 0; -} - -int adns_wait(adns_state ads, - adns_query *query_io, - adns_answer **answer_r, - 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_r,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_r, - void **context_r) { - autosys(ads); - return internal_check(ads,query_io,answer_r,context_r); -} - -int adns_synchronous(adns_state ads, - const char *owner, - adns_rrtype type, - adns_queryflags flags, - adns_answer **answer_r) { - adns_query qu; - int r; - - r= adns_submit(ads,owner,type,flags,0,&qu); - if (r) return r; - - do { - r= adns_wait(ads,&qu,answer_r,0); - } while (r==EINTR); - if (r) adns_cancel(ads,qu); - return r; -} - -static adns_status mkquery(adns_state ads, const char *owner, int ol, int id, - adns_rrtype type, adns_queryflags flags, int *qml_r) { - int ll, c, nlabs, qbufreq; - unsigned char label[255], *nqbuf; - const char *p, *pe; - -#define MKQUERY_ADDB(b) *nqbuf++= (b) -#define MKQUERY_ADDW(w) (MKQUERY_ADDB(((w)>>8)&0x0ff), MKQUERY_ADDB((w)&0x0ff)) - - qbufreq= 12+strlen(owner)+3; - if (ads->qbufavail < qbufreq) { - nqbuf= realloc(ads->qbuf,qbufreq); - if (!nqbuf) return adns_s_nolocalmem; - ads->qbuf= nqbuf; ads->qbufavail= qbufreq; - } - nqbuf= ads->qbuf; - - MKQUERY_ADDW(id); - MKQUERY_ADDB(0x01); /* QR=Q(0), OPCODE=QUERY(0000), !AA, !TC, RD */ - MKQUERY_ADDB(0x00); /* !RA, Z=000, RCODE=NOERROR(0000) */ - MKQUERY_ADDW(1); /* QDCOUNT=1 */ - MKQUERY_ADDW(0); /* ANCOUNT=0 */ - MKQUERY_ADDW(0); /* NSCOUNT=0 */ - MKQUERY_ADDW(0); /* ARCOUNT=0 */ - p= owner; pe= owner+ol; - nlabs= 0; - if (!*p) return adns_s_invaliddomain; - do { - ll= 0; - while (p!=pe && (c= *p++)!='.') { - if (c=='\\') { - if (!(flags & adns_f_anyquote)) return adns_s_invaliddomain; - if (ctype_digit(p[0])) { - if (ctype_digit(p[1]) && ctype_digit(p[2])) { - c= (*p++ - '0')*100 + (*p++ - '0')*10 + (*p++ - '0'); - if (c >= 256) return adns_s_invaliddomain; - } else { - return adns_s_invaliddomain; - } - } else if (!(c= *p++)) { - return adns_s_invaliddomain; - } - } - if (!(flags & adns_f_anyquote)) { - if ((c >= '0' && c <= '9') || c == '-') { - if (!ll) return adns_s_invaliddomain; - } else if ((c < 'a' || c > 'z') && (c < 'A' && c > 'Z')) { - return adns_s_invaliddomain; - } - } - if (ll == sizeof(label)) return adns_s_invaliddomain; - label[ll++]= c; - } - if (!ll) return adns_s_invaliddomain; - if (nlabs++ > 63) return adns_s_invaliddomain; - MKQUERY_ADDB(ll); - memcpy(nqbuf,label,ll); nqbuf+= ll; - } while (p!=pe); - - MKQUERY_ADDB(0); - MKQUERY_ADDW(type & adns__rrt_typemask); /* QTYPE */ - MKQUERY_ADDW(1); /* QCLASS=IN */ - - *qml_r= nqbuf - ads->qbuf; - - return adns_s_ok; -} - -static adns_query allocquery(adns_state ads, const char *owner, int ol, - int qml, int id, adns_rrtype type, - adns_queryflags flags, void *context) { - adns_query qu; - unsigned char *qm; - - qu= malloc(sizeof(*qu)+ol+1+qml); if (!qu) return 0; - qu->next= qu->back= qu->parent= 0; - qu->children.head= qu->children.tail= 0; - qu->siblings.next= qu->siblings.back= 0; - qu->id= id; - qu->type= type; - qu->answer= 0; - qu->flags= flags; - qu->context= context; - qu->udpretries= 0; - qu->sentudp= qu->senttcp= 0; - qu->nextserver= 0; - memcpy(qu->owner,owner,ol); qu->owner[ol]= 0; - qu->querymsg= qm= qu->owner+ol+1; - memcpy(qm,ads->qbuf,qml); - qu->querylen= qml; - return qu; -} - -static int failsubmit(adns_state ads, void *context, adns_query *query_r, - adns_rrtype type, adns_queryflags flags, - int id, adns_status stat) { - adns_query qu; - - qu= allocquery(ads,0,0,0,id,type,flags,context); if (!qu) return errno; - query_fail(ads,qu,stat); - *query_r= qu; - return 0; -} - -static void quproc_tosend(adns_state ads, adns_query qu, struct timeval now) { - /* Query must be on the `tosend' queue, and guarantees to remove it. */ - struct sockaddr_in servaddr; - int serv; - - if (qu->nextudpserver != -1) { - if (qu->udpretries >= UDPMAXRETRIES) { - DLIST_UNLINK(ads->tosend,qu); - query_fail(ads,qu,adns_s_notresponding); - return; - } - serv= qu->nextudpserver; - memset(&servaddr,0,sizeof(servaddr)); - servaddr.sin_family= AF_INET; - servaddr.sin_addr= ads->servers[serv].addr; - servaddr.sin_port= htons(53); - r= sendto(ads->udpsocket,qu->querymsg,qu->querylen,0,&servaddr,sizeof(servaddr)); - if (r<0 && errno == EMSGSIZE) { - qu->nextudpserver= -1; - } else { - if (r<0) { - diag("sendto %s failed: %s",inet_ntoa(servaddr.sin_addr),strerror(errno)); - } - DLIST_UNLINK(ads->tosend,qu); - timevaladd(&now,UDPRETRYMS); - qu->timeout= now; - qu->sentudp |= (1<nextudpserver= (serv+1)%ads->nservers; - qu->udpretries++; - DLIST_LINKTAIL(ads->timew,qu); - return; - } - } - - for (;;) { - serv= tcpserver_get(ads); - if (serv<0) { r=0; break; } - if (ads->opbufused) { r=0; break; } - r= write(ads->tcpsocket,qu->querymsg,qu->querylen); - if (r >= 0) break; - if (errno == EAGAIN || errno == EINTR || errno == ENOSPC || - errno == ENOBUFS || errno == ENOMEM) { - r= 0; break; - } - tcpserver_broken(serv); - } - if (r < qu->querylen) { - newopbufused= qu->opbufused + (qu->querylen-r); - if (newopbufused > ads->opbufavail) { - newopbufavail= ads->newopbufused<<1; - newopbuf= realloc(newopbufavail); - if (!newopbuf) { - DLIST_UNLINK(ads->tosend,qu); - query_fail(ads,qu,adns_s_nolocalmem); - return; - } - ads->opbuf= newopbuf; - ads->opbufavail= newopbufavail; - } - memcpy(ads->opbuf+ads->opbufused,qu->querymsg+r,qu->querylen-r); - ads->opbufused= newopbufused; - } - DLIST_UNLINK(ads->tosend,qu); - timevaladd(&now,TCPMS); - qu->timeout= now; - qu->senttcp |= (1<nextserver); - DLIST_LINKTAIL(ads->timew,qu); -} - -int adns_submit(adns_state ads, - const char *owner, - adns_rrtype type, - adns_queryflags flags, - void *context, - adns_query *query_r) { - adns_query qu; - adns_status stat; - int ol, id, qml; - - id= ads->nextid++; - - ol= strlen(owner); - if (ol<=1 || ol>MAXDNAME+1) - return failsubmit(ads,context,query_r,type,flags,id,adns_s_invaliddomain); - if (owner[ol-1]=='.' && owner[ol-2]!='\\') { flags &= ~adns_f_search; ol--; } - - stat= mkquery(ads,owner,ol,id,type,flags,&qml); - if (stat) return failsubmit(ads,context,query_r,type,flags,id,stat); - - qu= allocquery(ads,owner,ol,qml,id,type,flags,context); if (!qu) return errno; - if (qu->flags & adns_f_usevc) qu->udpretries= -1; - LIST_LINK_TAIL(ads->tosend,qu); - - r= gettimeofday(&now,0); if (r) return; - quproc_tosend(ads,qu,now); - autosys(ads,now); - - *query_r= qu; - return 0; -} diff --git a/src/event.c b/src/event.c new file mode 100644 index 0000000..33998a8 --- /dev/null +++ b/src/event.c @@ -0,0 +1,256 @@ +/**/ + +static void autosys(adns_state ads, struct timeval now) { + if (ads->iflags & adns_if_noautosys) return; + adns_callback(ads,-1,0,0,0); +} + +static int callb_checkfd(int maxfd, const fd_set *fds, int fd) { + return maxfd<0 || !fds ? 1 : + fdtcpstate; + + if (ads->tcpstate == server_connecting) { + if (callb_checkfd(maxfd,writefds,ads->tcpsocket)) { + count++; + assert(ads->tcprecv.used==0); + vbuf_ensure(&ads->tcprecv,1); + if (ads->tcprecv.buf) { + r= read(ads->tcpsocket,&ads->tcprecv.buf,1); + if (r==0 || (r<0 && (errno==EAGAIN || errno==EWOULDBLOCK))) { + diag("nameserver %s TCP connection made", + inet_ntoa(ads->servers[ads->tcpserver].addr)); + ads->tcpstate= server_connected; + } else if (r>0) { + tcpserver_broken(ads,"connect/read","sent data before first request"); + } else if (errno!=EINTR) { + tcpserver_broken(ads,"connect",strerror(errno)); + } + } + } + } + if (ads->tcpstate == server_connected) { + if (oldtcpstate == server_connected) + count+= callb_checkfd(maxfd,readfds,ads->tcpsocket) + + callb_checkfd(maxfd,exceptfds,ads->tcpsocket) + + (ads->tcpsend.used && callb_checkfd(maxfd,writefds,ads->tcpsocket)); + if (oldtcpstate != server_connected || callb_checkfd(maxfd,readfds,ads->tcpsocket)) { + skip= 0; + for (;;) { + if (ads->tcprecv.usedtcprecv.buf[skip]<<8) | ads->tcprecv.buf[skip+1]; + if (ads->tcprecv.usedtcprecv.buf+skip+2,dgramlen,-1); + skip+= 2+dgramlen; continue; + } + } + Ads->tcprecv.used -= skip; + memmove(ads->tcprecv.buf,ads->tcprecv.buf+skip,ads->tcprecv.used); + vbuf_ensure(&ads->tcprecv,want); + if (ads->tcprecv.used >= ads->tcprecv.avail) break; + r= read(ads->tcpsocket, + ads->tcprecv.buf+ads->tcprecv.used, + ads->tcprecv.avail-ads->tcprecv.used); + if (r>0) { + ads->tcprecv.used+= r; + } else { + if (r<0) { + if (errno==EAGAIN || errno==EWOULDBLOCK || errno==ENOMEM) break; + if (errno==EINTR) continue; + } + tcpserver_broken(ads->tcpserver,"read",r?strerror(errno):"closed"); + break; + } + } + } else if (callb_checkfd(maxfd,exceptfds,ads->tcpsocket)) { + tcpserver_broken(ads->tcpserver,"select","exceptional condition detected"); + } else if (ads->tcpsend.used && callb_checkfd(maxfd,writefds,ads->tcpsocket)) { + r= write(ads->tcpsocket,ads->tcpsend.buf,ads->tcpsend.used); + if (r<0) { + if (errno!=EAGAIN && errno!=EWOULDBLOCK && errno!=ENOMEM && errno!=EINTR) { + tcpserver_broken(ads->tcpserver,"write",strerror(errno)); + } + } else if (r>0) { + ads->tcpsend.used -= r; + memmove(ads->tcpsend.buf,ads->tcpsend.buf+r,ads->tcpsend.used); + } + } + } + + if ( + break; + + + } + + tcpserver_broken( + + if (ads- + used= 0; + for (;;) { + vbuf_ensure(&ads->tcprecv,2); + vbuf_ensure(&ads->tcprecv, + if (ads->tcprecv.avail<2) break; + if (ads->tcprecv.used + + if (ads->tcprecv.used<2 && ads->tcprecv.avail + if (ads->tcprecv.used<2 && ads->tcprecv.avail + r= read(ads->tcpsocket, + if (adns->tcprecv.used<2) { + if ( + + if (ads->tcpstate != server_disc) { + + + } + if (maxfd<0 || !readfds || (FD_ISSET + ads-> + + abort(); /* FIXME */ +} + diag("nameserver #%d (%s) TCP connection died: %s", + inet_ntoa(ads->servers[tcpserver].addr), + +static void inter_maxto(struct timeval **tv_io, struct timeval *tvbuf, + struct timeval maxto) { + struct timeval rbuf; + + rbuf= *tv_io; + if (!rbuf) { *tvbuf= maxto; *tv_io= tvbuf; return; } + if (timercmp(rbuf,&maxto,>)) *rbuf= maxto; +} + +static void inter_maxtoabs(struct timeval **tv_io, struct timeval *tvbuf, + struct timeval now, struct timeval maxtime) { + ldiv_t dr; + + maxtime.tv_sec -= (now.tv_sec-1); + maxtime.tv_usec += (1000-now.tv_usec); + dr= ldiv(maxtime.tv_usec,1000); + maxtime.tv_sec += dr.quot; + maxtime.tv_usec -= dr.rem; + inter_maxto(tv_io,tvbuf,maxtime); +} + +static void localresourcerr(struct timeval **tv_io, struct timeval *tvbuf, + const char *syscall) { + struct timeval tvto_lr; + + diag(ads,"local system resources scarce (during %s): %s",syscall,strerror(errno)); + timerclear(&tvto_lr); timevaladd(&tvto_lr,LOCALRESOURCEMS); + inter_maxto(tv_io, tvbuf, tvto_lr); + return; +} + +static void inter_addfd(int *maxfd, fd_set *fds, int fd) { + if (fd>=*maxfd) *maxfd= fd+1; + FD_SET(fd,fds); +} + +void adns_interest(adns_state ads, int *maxfd, + fd_set *readfds, fd_set *writefds, fd_set *exceptfds, + struct timeval **tv_io, struct timeval *tvbuf) { + struct timeval now; + adns_query qu; + int r; + + r= gettimeofday(&now,0); + if (r) { localresourcerr(tv_io,tvbuf,"gettimeofday"); return; } + + for (qu= ads->timew; qu; qu= nqu) { + nqu= qu->next; + if (timercmp(&now,qu->timeout,>)) { + DLIST_UNLINK(ads->timew,qu); + if (qu->nextudpserver == -1) { + query_fail(ads,qu,adns_s_notresponding); + } else { + DLIST_LINKTAIL(ads->tosend,qu); + } + } else { + inter_maxtoabs(tv_io,tvbuf,now,qu->timeout); + } + } + + for (qu= ads->tosend; qu; qu= nqu) { + nqu= qu->next; + quproc_tosend(ads,qu,now); + } + + inter_addfd(maxfd,readfds,ads->udpsocket); + switch (ads->tcpstate) { + case server_disc: + break; + case server_connecting: + inter_addfd(maxfd,writefds,ads->tcpsocket); + break; + case server_connected: + inter_addfd(maxfd,readfds,ads->tcpsocket); + inter_addfd(maxfd,exceptfds,ads->tcpsocket); + if (ads->opbufused) inter_addfd(maxfd,writefds,ads->tcpsocket); + default: + abort(); + } + +} + +static int internal_check(adns_state ads, + adns_query *query_io, + adns_answer **answer, + void **context_r) { + adns_query qu; + + qu= *query_io; + if (!qu) { + if (!ads->output.head) return EWOULDBLOCK; + qu= ads->output.head; + } else { + if (qu->id>=0) return EWOULDBLOCK; + } + LIST_UNLINK(ads->output,qu); + *answer= qu->answer; + if (context_r) *context_r= qu->context; + free(qu); + return 0; +} + +int adns_wait(adns_state ads, + adns_query *query_io, + adns_answer **answer_r, + 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_r,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_r, + void **context_r) { + autosys(ads); + return internal_check(ads,query_io,answer_r,context_r); +} diff --git a/src/query.c b/src/query.c new file mode 100644 index 0000000..667ec6d --- /dev/null +++ b/src/query.c @@ -0,0 +1,156 @@ +/**/ + +#include "adns-internal.h" + +static adns_status mkquery(adns_state ads, const char *owner, int ol, int id, + adns_rrtype type, adns_queryflags flags, int *qml_r) { + int ll, c, nlabs, qbufreq; + unsigned char label[255], *nqbuf; + const char *p, *pe; + +#define MKQUERY_ADDB(b) *nqbuf++= (b) +#define MKQUERY_ADDW(w) (MKQUERY_ADDB(((w)>>8)&0x0ff), MKQUERY_ADDB((w)&0x0ff)) + + qbufreq= 12+strlen(owner)+3; + if (ads->qbufavail < qbufreq) { + nqbuf= realloc(ads->qbuf,qbufreq); + if (!nqbuf) return adns_s_nolocalmem; + ads->qbuf= nqbuf; ads->qbufavail= qbufreq; + } + nqbuf= ads->qbuf; + + MKQUERY_ADDW(id); + MKQUERY_ADDB(0x01); /* QR=Q(0), OPCODE=QUERY(0000), !AA, !TC, RD */ + MKQUERY_ADDB(0x00); /* !RA, Z=000, RCODE=NOERROR(0000) */ + MKQUERY_ADDW(1); /* QDCOUNT=1 */ + MKQUERY_ADDW(0); /* ANCOUNT=0 */ + MKQUERY_ADDW(0); /* NSCOUNT=0 */ + MKQUERY_ADDW(0); /* ARCOUNT=0 */ + p= owner; pe= owner+ol; + nlabs= 0; + if (!*p) return adns_s_invaliddomain; + do { + ll= 0; + while (p!=pe && (c= *p++)!='.') { + if (c=='\\') { + if (!(flags & adns_f_anyquote)) return adns_s_invaliddomain; + if (ctype_digit(p[0])) { + if (ctype_digit(p[1]) && ctype_digit(p[2])) { + c= (*p++ - '0')*100 + (*p++ - '0')*10 + (*p++ - '0'); + if (c >= 256) return adns_s_invaliddomain; + } else { + return adns_s_invaliddomain; + } + } else if (!(c= *p++)) { + return adns_s_invaliddomain; + } + } + if (!(flags & adns_f_anyquote)) { + if ((c >= '0' && c <= '9') || c == '-') { + if (!ll) return adns_s_invaliddomain; + } else if ((c < 'a' || c > 'z') && (c < 'A' && c > 'Z')) { + return adns_s_invaliddomain; + } + } + if (ll == sizeof(label)) return adns_s_invaliddomain; + label[ll++]= c; + } + if (!ll) return adns_s_invaliddomain; + if (nlabs++ > 63) return adns_s_invaliddomain; + MKQUERY_ADDB(ll); + memcpy(nqbuf,label,ll); nqbuf+= ll; + } while (p!=pe); + + MKQUERY_ADDB(0); + MKQUERY_ADDW(type & adns__rrt_typemask); /* QTYPE */ + MKQUERY_ADDW(1); /* QCLASS=IN */ + + *qml_r= nqbuf - ads->qbuf; + + return adns_s_ok; +} + +void adns__quproc_tosend(adns_state ads, adns_query qu, struct timeval now) { + /* Query must be on the `tosend' queue, and guarantees to remove it. */ + struct sockaddr_in servaddr; + int serv; + + if (qu->nextudpserver != -1) { + if (qu->udpretries >= UDPMAXRETRIES) { + DLIST_UNLINK(ads->tosend,qu); + query_fail(ads,qu,adns_s_notresponding); + return; + } + serv= qu->nextudpserver; + memset(&servaddr,0,sizeof(servaddr)); + servaddr.sin_family= AF_INET; + servaddr.sin_addr= ads->servers[serv].addr; + servaddr.sin_port= htons(53); + r= sendto(ads->udpsocket,qu->querymsg,qu->querylen,0,&servaddr,sizeof(servaddr)); + if (r<0 && errno == EMSGSIZE) { + qu->nextudpserver= -1; + } else { + if (r<0) { + diag("sendto %s failed: %s",inet_ntoa(servaddr.sin_addr),strerror(errno)); + } + DLIST_UNLINK(ads->tosend,qu); + timevaladd(&now,UDPRETRYMS); + qu->timeout= now; + qu->sentudp |= (1<nextudpserver= (serv+1)%ads->nservers; + qu->udpretries++; + DLIST_LINKTAIL(ads->timew,qu); + return; + } + } + + for (;;) { + serv= tcpserver_get(ads); + if (serv<0) { r=0; break; } + if (ads->opbufused) { r=0; break; } + r= write(ads->tcpsocket,qu->querymsg,qu->querylen); + if (r >= 0) break; + if (errno == EAGAIN || errno == EINTR || errno == ENOSPC || + errno == ENOBUFS || errno == ENOMEM) { + r= 0; break; + } + tcpserver_broken(serv); + } + if (r < qu->querylen) { + newopbufused= qu->opbufused + (qu->querylen-r); + if (newopbufused > ads->opbufavail) { + newopbufavail= ads->newopbufused<<1; + newopbuf= realloc(newopbufavail); + if (!newopbuf) { + DLIST_UNLINK(ads->tosend,qu); + query_fail(ads,qu,adns_s_nolocalmem); + return; + } + ads->opbuf= newopbuf; + ads->opbufavail= newopbufavail; + } + memcpy(ads->opbuf+ads->opbufused,qu->querymsg+r,qu->querylen-r); + ads->opbufused= newopbufused; + } + DLIST_UNLINK(ads->tosend,qu); + timevaladd(&now,TCPMS); + qu->timeout= now; + qu->senttcp |= (1<nextserver); + DLIST_LINKTAIL(ads->timew,qu); +} + +void adns__query_fail(adns_state ads, adns_query qu, adns_status stat) { + adns_answer *ans; + + ans= qu->answer; + if (!ans) ans= malloc(sizeof(*qu->answer)); + if (ans) { + ans->status= stat; + ans->cname= 0; + ans->type= qu->type; + ans->nrrs= 0; + } + qu->answer= ans; + qu->id= -1; + LIST_LINK_TAIL(ads->output,qu); +} diff --git a/src/setup.c b/src/setup.c new file mode 100644 index 0000000..ecf92a2 --- /dev/null +++ b/src/setup.c @@ -0,0 +1,244 @@ +/**/ + +#include "adns-internal.h" + +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); +} + +void adns__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); +} + +void adns__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; + struct server *ss; + + for (i=0; inservers; 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) { + diag(ads,"too many nameservers, ignoring %s",inet_ntoa(addr)); + return; + } + + ss= ads->servers+ads->nservers; + ss->addr= addr; + ss->state= server_disc; + ss->connw.head= ss->connw.tail= 0; + 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 ctype_whitespace(int c) { return c==' ' || c=='\n' || c=='\t'; } +static int ctype_digit(int c) { return c>='0' && c<='9'; } + +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 && ctype_whitespace(linebuf[l-1])) l--; + linebuf[l]= 0; + p= linebuf; + while (ctype_whitespace(*p)) p++; + if (*p == '#' || *p == '\n') continue; + q= p; + while (*q && !ctype_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 (ctype_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); +} + +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; +} + +static void readconfigenv(adns_state ads, const char *envvar) { + const char *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, adns_initflags flags) { + adns_state ads; + const char *res_options, *adns_res_options; + struct protoent *proto; + int r; + + ads= malloc(sizeof(*ads)); if (!ads) return errno; + ads->tosend.head= ads->tosend.tail= 0; + ads->timew.head= ads->timew.tail= 0; + ads->childw.head= ads->childw.tail= 0; + ads->output.head= ads->output.tail= 0; + ads->nextid= 0x311f; + ads->udpsocket= -1; + ads->qbufavail= 0; + ads->qbuf= 0; + ads->tcpbufavail= ads->tcpbufused= ads->tcpbufdone= 0; + ads->tcpbuf= 0; + 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) { + struct in_addr ia; + if (ads->iflags & adns_if_debug) + fprintf(stderr,"adns: no nameservers, using localhost\n"); + ia.s_addr= INADDR_LOOPBACK; + addserver(ads,ia); + } + + proto= getprotobyname("udp"); if (!proto) { r= ENOPROTOOPT; goto x_free; } + ads->udpsocket= socket(AF_INET,SOCK_DGRAM,proto->p_proto); + if (!ads->udpsocket) { r= errno; goto x_closeudp; } + + *ads_r= ads; + return 0; + + x_closeudp: + close(ads->udpsocket); + x_free: + free(ads); + return r; +} + +int adns_finish(adns_state ads) { + abort(); /* FIXME */ +} diff --git a/src/submit.c b/src/submit.c new file mode 100644 index 0000000..576c437 --- /dev/null +++ b/src/submit.c @@ -0,0 +1,93 @@ +/**/ + +#include "adns-internal.h" + +static adns_query allocquery(adns_state ads, const char *owner, int ol, + int qml, int id, adns_rrtype type, + adns_queryflags flags, void *context) { + adns_query qu; + unsigned char *qm; + + qu= malloc(sizeof(*qu)+ol+1+qml); if (!qu) return 0; + qu->next= qu->back= qu->parent= 0; + qu->children.head= qu->children.tail= 0; + qu->siblings.next= qu->siblings.back= 0; + qu->id= id; + qu->type= type; + qu->answer= 0; + qu->flags= flags; + qu->context= context; + qu->udpretries= 0; + qu->sentudp= qu->senttcp= 0; + qu->nextserver= 0; + memcpy(qu->owner,owner,ol); qu->owner[ol]= 0; + qu->querymsg= qm= qu->owner+ol+1; + memcpy(qm,ads->qbuf,qml); + qu->querylen= qml; + return qu; +} + +static int failsubmit(adns_state ads, void *context, adns_query *query_r, + adns_rrtype type, adns_queryflags flags, + int id, adns_status stat) { + adns_query qu; + + qu= allocquery(ads,0,0,0,id,type,flags,context); if (!qu) return errno; + query_fail(ads,qu,stat); + *query_r= qu; + return 0; +} + +int adns_submit(adns_state ads, + const char *owner, + adns_rrtype type, + adns_queryflags flags, + void *context, + adns_query *query_r) { + adns_query qu; + adns_status stat; + int ol, id, qml; + + id= ads->nextid++; + + ol= strlen(owner); + if (ol<=1 || ol>MAXDNAME+1) + return failsubmit(ads,context,query_r,type,flags,id,adns_s_invaliddomain); + if (owner[ol-1]=='.' && owner[ol-2]!='\\') { flags &= ~adns_f_search; ol--; } + + stat= mkquery(ads,owner,ol,id,type,flags,&qml); + if (stat) return failsubmit(ads,context,query_r,type,flags,id,stat); + + qu= allocquery(ads,owner,ol,qml,id,type,flags,context); if (!qu) return errno; + if (qu->flags & adns_f_usevc) qu->udpretries= -1; + LIST_LINK_TAIL(ads->tosend,qu); + + r= gettimeofday(&now,0); if (r) return; + quproc_tosend(ads,qu,now); + autosys(ads,now); + + *query_r= qu; + return 0; +} + +int adns_synchronous(adns_state ads, + const char *owner, + adns_rrtype type, + adns_queryflags flags, + adns_answer **answer_r) { + adns_query qu; + int r; + + r= adns_submit(ads,owner,type,flags,0,&qu); + if (r) return r; + + do { + r= adns_wait(ads,&qu,answer_r,0); + } while (r==EINTR); + if (r) adns_cancel(ads,qu); + return r; +} + +void adns_cancel(adns_state ads, adns_query query) { + abort(); /* FIXME */ +}