#include <stdlib.h>
#include <string.h>
#include <errno.h>
-#include <sys/poll.h>
+
+#include "adns.h"
+
+#include "config.h"
#ifndef OUTPUTSTREAM
# define OUTPUTSTREAM stdout
#endif
-#include "adns.h"
+#ifndef HAVE_POLL
+#undef poll
+int poll(struct pollfd *ufds, int nfds, int timeout) {
+ fputs("poll(2) not supported on this system\n",stderr);
+ exit(3);
+}
+#define adns_beforepoll(a,b,c,d,e) 0
+#define adns_afterpoll(a,b,c,d) 0
+#endif
static void failure_status(const char *what, adns_status st) {
fprintf(stderr,"adns failure: %s: %s\n",what,adns_strerror(st));
char *show, *cp;
int len, i, qc, qi, tc, ti, ch, qflags, initflagsnum, npollfds, npollfdsavail, timeout;
struct pollfd *pollfds;
- adns_status r, ri;
+ adns_status ri;
+ int r;
const adns_rrtype *types;
struct timeval now;
adns_rrtype *types_a;
initflagsnum= strtoul(initflags,&ep,0);
if (*ep == ',') {
owninitflags= ep+1;
- if (!consistsof(owninitflags,"p")) {
+ if (!consistsof(owninitflags,"ps")) {
fputs("unknown owninitflag\n",stderr);
exit(4);
}
" [ :<typenum>,... ]\n"
" [ [<queryflagsnum>[,<ownqueryflags>]/]<domain> ... ]\n"
"initflags: p use poll(2) instead of select(2)\n"
+ " s use adns_wait with specified query, instead of 0\n"
"queryflags: a print status abbrevs instead of strings\n",
stderr);
exit(4);
fprintf(stdout,"%s flags %d type %d",domain,qflags,types[ti]);
r= adns_submit(ads,domain,types[ti],qflags,mc,&mc->qu);
- if (r == adns_s_unknownrrtype) {
+ if (r == ENOSYS) {
fprintf(stdout," not implemented\n");
mc->qu= 0;
mc->doneyet= 1;
}
if (!mcw) break;
- mc= mcw;
- qu= mcw->qu;
+ if (strchr(owninitflags,'s')) {
+ qu= mcw->qu;
+ mc= mcw;
+ } else {
+ qu= 0;
+ mc= 0;
+ }
if (strchr(owninitflags,'p')) {
for (;;) {
}
if (r) failure_errno("wait/check",r);
- assert(mcr==mc);
+ if (mc) assert(mcr==mc);
+ else mc= mcr;
+ assert(qu==mc->qu);
+ assert(!mc->doneyet);
+
fdom_split(mc->fdom,&domain,&qflags,ownflags,sizeof(ownflags));
if (gettimeofday(&now,0)) { perror("gettimeofday"); exit(3); }
if (ans->nrrs) {
assert(!ri);
for (i=0; i<ans->nrrs; i++) {
- r= adns_rr_info(ans->type, 0,0,0, ans->rrs.bytes + i*len, &show);
- if (r) failure_status("info",r);
+ ri= adns_rr_info(ans->type, 0,0,0, ans->rrs.bytes + i*len, &show);
+ if (ri) failure_status("info",ri);
fprintf(stdout," %s\n",show);
free(show);
}