X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=client%2Fadnstest.c;h=59a3bbc810d335be0faa1634fdf62a8cf65d8743;hb=cd4a70625461f933beae7923520cef2523524e0d;hp=67f287e03ec808c277667da07301c17096d2489f;hpb=6d6822042d1a295ef510605a67e8174a43000fd2;p=adns.git diff --git a/client/adnstest.c b/client/adnstest.c index 67f287e..59a3bbc 100644 --- a/client/adnstest.c +++ b/client/adnstest.c @@ -3,11 +3,16 @@ * - simple test program, not part of the library */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is part of adns, which is + * Copyright (C) 1997-2000,2003,2006,2014 Ian Jackson + * Copyright (C) 2014 Mark Wooding + * Copyright (C) 1999-2000,2003,2006 Tony Finch + * Copyright (C) 1991 Massachusetts Institute of Technology + * (See the file INSTALL for full details.) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) + * the Free Software Foundation; either version 3, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, @@ -16,8 +21,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program; if not, write to the Free Software Foundation. */ #include @@ -28,19 +32,38 @@ #include #include -#include "adns.h" - +#define ADNS_FEATURE_MANYAF #include "config.h" +#include "adns.h" -#ifndef OUTPUTSTREAM -# define OUTPUTSTREAM stdout +#ifdef ADNS_REGRESS_TEST +# include "hredirect.h" #endif +struct myctx { + adns_query qu; + int doneyet, found; + const char *fdom; +}; + +static struct myctx *mcs; +static adns_state ads; +static adns_rrtype *types_a; + +static void quitnow(int rc) NONRETURNING; +static void quitnow(int rc) { + free(mcs); + free(types_a); + if (ads) adns_finish(ads); + + exit(rc); +} + #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); + quitnow(5); } #define adns_beforepoll(a,b,c,d,e) 0 #define adns_afterpoll(a,b,c,d) 0 @@ -49,13 +72,24 @@ int poll(struct pollfd *ufds, int nfds, int timeout) { 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); + quitnow(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); + switch (errnoval) { +#define CE(e) \ + case e: fprintf(stderr,"adns failure: %s: errno=" #e "\n",what); break + CE(EINVAL); + CE(EINTR); + CE(ESRCH); + CE(EAGAIN); + CE(ENOSYS); + CE(ERANGE); +#undef CE + default: fprintf(stderr,"adns failure: %s: errno=%d\n",what,errnoval); break; + } + quitnow(2); } static void usageerr(const char *why) NONRETURNING; @@ -68,6 +102,7 @@ static void usageerr(const char *why) { "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" + "typenum: may be 0x|, or 0x or \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" @@ -75,7 +110,7 @@ static void usageerr(const char *why) { " 4 usage error\n" " 5 operation not supported on this system\n", why); - exit(4); + quitnow(4); } static const adns_rrtype defaulttypes[]= { @@ -102,7 +137,7 @@ static const adns_rrtype defaulttypes[]= { static void dumptype(adns_status ri, const char *rrtn, const char *fmtn) { fprintf(stdout, "%s(%s)%s%s", - ri ? "?" : rrtn, ri ? "?" : fmtn ? fmtn : "-", + (!ri && rrtn) ? rrtn : "?", ri ? "?" : fmtn ? fmtn : "-", ri ? " " : "", ri ? adns_strerror(ri) : ""); } @@ -115,7 +150,7 @@ static void fdom_split(const char *fdom, const char **dom_r, int *qf_r, if (*ep == ',' && strchr(ep,'/')) { ep++; while (*ep != '/') { - if (--ownflags_l <= 0) { fputs("too many flags\n",stderr); exit(3); } + if (--ownflags_l <= 0) { fputs("too many flags\n",stderr); quitnow(3); } *ownflags++= *ep++; } } @@ -129,15 +164,8 @@ static int consistsof(const char *string, const char *accept) { } int main(int argc, char *const *argv) { - struct myctx { - adns_query qu; - int doneyet, found; - const char *fdom; - }; - - adns_state ads; adns_query qu; - struct myctx *mcs, *mc, *mcw; + struct myctx *mc, *mcw; void *mcr; adns_answer *ans; const char *initstring, *rrtn, *fmtn; @@ -148,7 +176,6 @@ int main(int argc, char *const *argv) { int r; const adns_rrtype *types; struct timeval now; - adns_rrtype *types_a; char ownflags[10]; char *ep; const char *initflags, *owninitflags; @@ -180,18 +207,26 @@ int main(int argc, char *const *argv) { for (cp= argv[1]+1, tc=1; (ch= *cp); cp++) if (ch==',') tc++; types_a= malloc(sizeof(*types_a)*(tc+1)); - if (!types_a) { perror("malloc types"); exit(3); } - for (cp= argv[1]+1, ti=0; tidoneyet= 0; mc->fdom= fdomlist[qi]; - fprintf(stdout,"%s flags %d type %d",domain,qflags,types[ti]); + fprintf(stdout,"%s flags %d type %d", + domain,qflags,types[ti]&adns_rrt_reprmask); r= adns_submit(ads,domain,types[ti],qflags,mc,&mc->qu); if (r == ENOSYS) { fprintf(stdout," not implemented\n"); @@ -288,7 +326,7 @@ int main(int argc, char *const *argv) { fdom_split(mc->fdom,&domain,&qflags,ownflags,sizeof(ownflags)); - if (gettimeofday(&now,0)) { perror("gettimeofday"); exit(3); } + if (gettimeofday(&now,0)) { perror("gettimeofday"); quitnow(3); } ri= adns_rr_info(ans->type, &rrtn,&fmtn,&len, 0,0); fprintf(stdout, "%s flags %d type ",domain,qflags); @@ -316,8 +354,5 @@ int main(int argc, char *const *argv) { mc->doneyet= 1; } - free(mcs); - adns_finish(ads); - - exit(0); + quitnow(0); }