X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=client%2Fadnstest.c;h=c4dd6b120709b28fa3bc15f0a57aea722f2673cc;hp=671cd1e7c3556d6f4fb70eb5e1fe2c87f79e68bd;hb=33ae0dddfdde95bedb160eae8059ba1a271cf7ea;hpb=e42ce2b231bd9954414fa8a00a543b931ecd6f67 diff --git a/client/adnstest.c b/client/adnstest.c index 671cd1e..c4dd6b1 100644 --- a/client/adnstest.c +++ b/client/adnstest.c @@ -1,5 +1,5 @@ /* - * dtest.c + * adnstest.c * - simple test program, not part of the library */ /* @@ -27,25 +27,56 @@ #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(5); +} +#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) NONRETURNING; static void failure_status(const char *what, adns_status st) { fprintf(stderr,"adns failure: %s: %s\n",what,adns_strerror(st)); exit(2); } +static void failure_errno(const char *what, int errnoval) NONRETURNING; static void failure_errno(const char *what, int errnoval) { fprintf(stderr,"adns failure: %s: errno=%d\n",what,errnoval); exit(2); } -static const char *defaultargv[]= { "ns.chiark.greenend.org.uk", 0 }; +static void usageerr(const char *why) NONRETURNING; +static void usageerr(const char *why) { + fprintf(stderr, + "bad usage: %s\n" + "usage: adnstest [-[,]] [/]\n" + " [ :,... ]\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" + "exit status: 0 ok (though some queries may have failed)\n" + " 1 used by test harness to indicate test failed\n" + " 2 unable to submit or init or some such\n" + " 3 unexpected failure\n" + " 4 usage error\n" + " 5 operation not supported on this system\n", + why); + exit(4); +} static const adns_rrtype defaulttypes[]= { adns_r_a, @@ -114,7 +145,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; @@ -138,15 +170,11 @@ int main(int argc, char *const *argv) { initflagsnum= strtoul(initflags,&ep,0); if (*ep == ',') { owninitflags= ep+1; - if (!consistsof(owninitflags,"p")) { - fputs("unknown owninitflag\n",stderr); - exit(4); - } + if (!consistsof(owninitflags,"ps")) usageerr("unknown owninitflag"); } else if (!*ep) { owninitflags= ""; } else { - fputs("bad [,]\n",stderr); - exit(4); + usageerr("bad [,]"); } if (argv[0] && argv[1] && argv[1][0] == ':') { @@ -157,15 +185,7 @@ int main(int argc, char *const *argv) { for (cp= argv[1]+1, ti=0; ti[,]] [/]\n" - " [ :,... ]\n" - " [ [[,]/] ... ]\n" - "initflags: p use poll(2) instead of select(2)\n" - "queryflags: a print status abbrevs instead of strings\n", - stderr); - exit(4); - } + if (ch != ',') usageerr("unexpected char (not comma) in or between types"); cp++; } } @@ -176,8 +196,8 @@ int main(int argc, char *const *argv) { types= defaulttypes; } - if (argv[0] && argv[1]) fdomlist= (const char *const*)argv+1; - else fdomlist= defaultargv; + if (!(argv[0] && argv[1])) usageerr("no query domains supplied"); + fdomlist= (const char *const*)argv+1; for (qc=0; fdomlist[qc]; qc++); for (tc=0; types[tc] != adns_r_none; tc++); @@ -186,7 +206,8 @@ int main(int argc, char *const *argv) { if (initstring) { r= adns_init_strcfg(&ads, - (adns_if_debug|adns_if_noautosys)^initflagsnum, + (adns_if_debug|adns_if_noautosys|adns_if_checkc_freq) + ^initflagsnum, stdout,initstring); } else { r= adns_init(&ads, @@ -200,10 +221,7 @@ int main(int argc, char *const *argv) { for (qi=0; qidoneyet= 0; @@ -211,7 +229,7 @@ int main(int argc, char *const *argv) { 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; @@ -252,61 +270,70 @@ int main(int argc, char *const *argv) { } 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')) { + 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); - fdom_split(mc->fdom,&domain,&qflags,ownflags,sizeof(ownflags)); + } 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; + mc->doneyet= 1; } free(mcs);