#include <errno.h>
#include <string.h>
#include <stdlib.h>
+#include <assert.h>
+#include <unistd.h>
+#include <netdb.h>
#include <arpa/nameser.h>
#include <sys/socket.h>
#include <netinet/in.h>
}
static void addserver(adns_state ads, struct in_addr addr) {
+ int i;
+ struct server *ss;
+
+ 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) {
diag(ads,"too many nameservers, ignoring %s",inet_ntoa(addr));
- } else {
- ads->servers[ads->nservers].addr= addr;
- ads->servers[ads->nservers].tcpsocket= -1;
- ads->nservers++;
+ 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 *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);
+ if (!value) debug(ads,"environment variable %s not set",envvar);
+ else debug(ads,"environment variable %s set to `%s'",envvar,value);
return value;
}
int adns_init(adns_state *ads_r, adns_initflags flags) {
adns_state ads;
const char *res_options, *adns_res_options;
+ struct protoent *proto;
+ struct sockaddr_in udpaddr;
+ int udpaddrlen, r;
ads= malloc(sizeof(*ads)); if (!ads) return errno;
ads->input.head= ads->input.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;
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; }
+
+ memset(&udpaddr,0,sizeof(udpaddr));
+ udpaddr.sin_family= AF_INET;
+ udpaddr.sin_addr.s_addr= INADDR_ANY;
+ udpaddr.sin_port= 0;
+ r= bind(ads->udpsocket,&udpaddr,sizeof(udpaddr));
+ if (r) { r= errno; goto x_closeudp; }
+
+ udpaddrlen= sizeof(udpaddr);
+ r= getsockname(ads->udpsocket,&udpaddr,&udpaddrlen);
+ if (r) { r= errno; goto x_closeudp; }
+ if (udpaddr.sin_family != AF_INET) {
+ diag(ads,"network API error: UDP socket not AF_INET but %lu",
+ (unsigned long)udpaddr.sin_family);
+ r= EPROTOTYPE; goto x_closeudp;
+ }
+ debug(ads,"UDP socket is %s:%u",inet_ntoa(udpaddr.sin_addr),ntohs(udpaddr.sin_port));
*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) {
- struct adns_answer *ans;
+ adns_answer *ans;
ans= qu->answer;
if (!ans) ans= malloc(sizeof(*qu->answer));
LIST_LINK_TAIL(ads->input,qu);
}
-void adns_interest(adns_state ads,
+int adns_finish(adns_state ads) {
+ abort(); /* FIXME */
+}
+
+void adns_interest(adns_state ads, int *maxfd,
fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
- int *maxfd, struct timeval **tv_io, struct timeval *tvbuf) {
+ 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 */
}
+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,
+ adns_queryflags flags,
+ adns_answer *answer) {
+ 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,0);
+ } while (r==EINTR);
+ if (r) adns_cancel(ads,qu);
+ return r;
+}
+
+static int mkquery(adns_state ads,
+ const char *owner,
+ adns_rrtype type) {
+ abort();
+}
+
int adns_submit(adns_state ads,
const char *owner,
adns_rrtype type,
- int flags,
+ adns_queryflags flags,
void *context,
adns_query *query_r) {
adns_query qu;
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->id= ads->nextid++;
qu->type= type;
qu->answer= 0;
qu->flags= flags;
qu->context= context;
qu->udpretries= 0;
- qu->server= 0;
+ qu->sentudp= qu->senttcp= 0;
+ qu->nextserver= 0;
memcpy(qu->owner,owner,ol); qu->owner[ol]= 0;
+
+
+ mkquery(ads,owner,type);
+
if (stat) {
query_fail(ads,qu,stat);
} else {
LIST_LINK_TAIL(ads->input,qu);
- adns_interest(ads,0,0,0,0,0,0);
+ autosys(ads);
}
*query_r= qu;
-
- abort(); /* FIXME */
+ return 0;
}