X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/669f9df5e36143bc0a86d7fb9e8eaf5eb5ffaadc..636b69b1a03bec395d304c354f4f2f8121b97150:/client/adnstest.c diff --git a/client/adnstest.c b/client/adnstest.c index 1d99a69..4d86803 100644 --- a/client/adnstest.c +++ b/client/adnstest.c @@ -27,13 +27,24 @@ #include #include #include -#include + +#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)); @@ -100,12 +111,13 @@ static int consistsof(const char *string, const char *accept) { int main(int argc, char *const *argv) { struct myctx { adns_query qu; - int doneyet; + int doneyet, found; + const char *fdom; }; adns_state ads; adns_query qu; - struct myctx *mcs, *mc; + struct myctx *mcs, *mc, *mcw; void *mcr; adns_answer *ans; const char *initstring, *rrtn, *fmtn; @@ -113,7 +125,8 @@ int main(int argc, char *const *argv) { 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; @@ -137,7 +150,7 @@ int main(int argc, char *const *argv) { 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); } @@ -161,6 +174,7 @@ int main(int argc, char *const *argv) { " [ :,... ]\n" " [ [[,]/] ... ]\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); @@ -206,10 +220,11 @@ int main(int argc, char *const *argv) { for (ti=0; tidoneyet= 0; + mc->fdom= fdomlist[qi]; 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; @@ -224,64 +239,96 @@ int main(int argc, char *const *argv) { } } - for (qi=0; qifound= 0; + } + } + for (adns_forallqueries_begin(ads); + (qu= adns_forallqueries_next(ads,&mcr)); + ) { + mc= mcr; + assert(qu == mc->qu); + assert(!mc->doneyet); + mc->found= 1; + } + mcw= 0; + for (qi=0; qidoneyet) continue; + assert(mc->found); + if (!mcw) mcw= mc; + } + } + if (!mcw) break; - for (ti=0; tidoneyet) continue; - qu= mc->qu; + if (strchr(owninitflags,'s')) { + qu= mcw->qu; + mc= mcw; + } else { + qu= 0; + mc= 0; + } - if (strchr(owninitflags,'p')) { + if (strchr(owninitflags,'p')) { + for (;;) { + r= adns_check(ads,&qu,&ans,&mcr); + if (r != EWOULDBLOCK) break; for (;;) { - r= adns_check(ads,&qu,&ans,&mcr); - if (r != EWOULDBLOCK) break; - for (;;) { - npollfds= npollfdsavail; - timeout= -1; - r= adns_beforepoll(ads, pollfds, &npollfds, &timeout, 0); - if (r != ERANGE) break; - pollfds= realloc(pollfds,sizeof(*pollfds)*npollfds); - if (!pollfds) failure_errno("realloc pollfds",errno); - npollfdsavail= npollfds; - } - if (r) failure_errno("beforepoll",r); - r= poll(pollfds,npollfds,timeout); - if (r == -1) failure_errno("poll",errno); - adns_afterpoll(ads,pollfds, r?npollfds:0, 0); + npollfds= npollfdsavail; + timeout= -1; + r= adns_beforepoll(ads, pollfds, &npollfds, &timeout, 0); + if (r != ERANGE) break; + pollfds= realloc(pollfds,sizeof(*pollfds)*npollfds); + if (!pollfds) failure_errno("realloc pollfds",errno); + npollfdsavail= npollfds; } - } else { - r= adns_wait(ads,&qu,&ans,&mcr); + if (r) failure_errno("beforepoll",r); + r= poll(pollfds,npollfds,timeout); + if (r == -1) failure_errno("poll",errno); + adns_afterpoll(ads,pollfds, r?npollfds:0, 0); } - if (r) failure_errno("wait/check",r); - - assert(mcr==mc); + } else { + r= adns_wait(ads,&qu,&ans,&mcr); + } + if (r) failure_errno("wait/check",r); + + 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 (gettimeofday(&now,0)) { perror("gettimeofday"); exit(3); } - ri= adns_rr_info(ans->type, &rrtn,&fmtn,&len, 0,0); - fprintf(stdout, "%s flags %d type ",domain,qflags); - dumptype(ri,rrtn,fmtn); - fprintf(stdout, "%s%s: %s; nrrs=%d; cname=%s; owner=%s; ttl=%ld\n", - ownflags[0] ? " ownflags=" : "", ownflags, - strchr(ownflags,'a') - ? adns_errabbrev(ans->status) - : adns_strerror(ans->status), - ans->nrrs, - ans->cname ? ans->cname : "$", - ans->owner ? ans->owner : "$", - (long)ans->expires - (long)now.tv_sec); - if (ans->nrrs) { - assert(!ri); - for (i=0; inrrs; i++) { - r= adns_rr_info(ans->type, 0,0,0, ans->rrs.bytes + i*len, &show); - if (r) failure_status("info",r); - fprintf(stdout," %s\n",show); - free(show); - } + ri= adns_rr_info(ans->type, &rrtn,&fmtn,&len, 0,0); + fprintf(stdout, "%s flags %d type ",domain,qflags); + dumptype(ri,rrtn,fmtn); + fprintf(stdout, "%s%s: %s; nrrs=%d; cname=%s; owner=%s; ttl=%ld\n", + ownflags[0] ? " ownflags=" : "", ownflags, + strchr(ownflags,'a') + ? adns_errabbrev(ans->status) + : adns_strerror(ans->status), + ans->nrrs, + ans->cname ? ans->cname : "$", + ans->owner ? ans->owner : "$", + (long)ans->expires - (long)now.tv_sec); + if (ans->nrrs) { + assert(!ri); + for (i=0; inrrs; i++) { + 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); } - free(ans); } + free(ans); + + mc->doneyet= 1; } free(mcs);