X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=client%2Fadnstest.c;h=59a3bbc810d335be0faa1634fdf62a8cf65d8743;hb=6222dbf02ff47840566359801db3cbde7c500b66;hp=cbb896a2a5b5b39afe25162ddd1e353506e172b6;hpb=8ce38e76272e9164cabef2c7fc1ea24f31364a86;p=adns.git

diff --git a/client/adnstest.c b/client/adnstest.c
index cbb896a..59a3bbc 100644
--- a/client/adnstest.c
+++ b/client/adnstest.c
@@ -1,13 +1,18 @@
 /*
- * dtest.c
+ * adnstest.c
  * - 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 <stdio.h>
@@ -27,25 +31,87 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/poll.h>
 
-#ifndef OUTPUTSTREAM
-# define OUTPUTSTREAM stdout
+#define ADNS_FEATURE_MANYAF
+#include "config.h"
+#include "adns.h"
+
+#ifdef ADNS_REGRESS_TEST
+# include "hredirect.h"
 #endif
 
-#include "adns.h"
+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);
+  quitnow(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);
+  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 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 [-<initflagsnum>[,<owninitflags>]] [/<initstring>]\n"
+	  "              [ :<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"
+	  "typenum:      may be 0x<hex>|<dec>, or 0x<hex> or <dec>\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);
+  quitnow(4);
+}
 
 static const adns_rrtype defaulttypes[]= {
   adns_r_a,
@@ -71,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) : "");
 }
 
@@ -84,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++;
     }
   }
@@ -98,26 +164,18 @@ 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;
   const char *const *fdomlist, *domain;
   char *show, *cp;
-  int len, i, qc, qi, tc, ti, ch, qflags, initflagsnum, npollfds, npollfdsavail, timeout;
-  struct pollfd *pollfds;
-  adns_status r, ri;
+  int len, i, qc, qi, tc, ti, ch, qflags, initflagsnum;
+  adns_status ri;
+  int r;
   const adns_rrtype *types;
   struct timeval now;
-  adns_rrtype *types_a;
   char ownflags[10];
   char *ep;
   const char *initflags, *owninitflags;
@@ -138,56 +196,54 @@ int main(int argc, char *const *argv) {
   initflagsnum= strtoul(initflags,&ep,0);
   if (*ep == ',') {
     owninitflags= ep+1;
-    if (!consistsof(owninitflags,"ps")) {
-      fputs("unknown owninitflag\n",stderr);
-      exit(4);
-    }
+    if (!consistsof(owninitflags,"ps")) usageerr("unknown owninitflag");
   } else if (!*ep) {
     owninitflags= "";
   } else {
-    fputs("bad <initflagsnum>[,<owninitflags>]\n",stderr);
-    exit(4);
+    usageerr("bad <initflagsnum>[,<owninitflags>]");
   }
   
   if (argv[0] && argv[1] && argv[1][0] == ':') {
     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; ti<tc; ti++) {
-      types_a[ti]= strtoul(cp,&cp,10);
-      if ((ch= *cp)) {
-	if (ch != ',') {
-	  fputs("usage: adnstest [-<initflagsnum>[,<owninitflags>]] [/<initstring>]\n"
-		"              [ :<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);
-	}
+    if (!types_a) { perror("malloc types"); quitnow(3); }
+    for (cp= argv[1]+1, ti=0; ti<tc; ) {
+      types_a[ti]= 0;
+      for (;;) {
+	types_a[ti] |= strtoul(cp,&cp,0);
+	ch= *cp;
+	if (!ch) break;
 	cp++;
+	if (ch=='|') continue;
+	if (ch==',') break;
+	usageerr("unexpected char (not comma) in or between types");
       }
+      ti++;
+      if (!ch) break;
     }
-    *cp++= adns_r_none;
+    types_a[ti]= adns_r_none;
     types= types_a;
     argv++;
   } else {
+    types_a= 0;
     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++);
-  mcs= malloc(sizeof(*mcs)*qc*tc);
-  if (!mcs) { perror("malloc mcs"); exit(3); }
+  mcs= malloc(tc ? sizeof(*mcs)*qc*tc : 1);
+  if (!mcs) { perror("malloc mcs"); quitnow(3); }
 
+  setvbuf(stdout,0,_IOLBF,0);
+  
   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,
@@ -196,23 +252,18 @@ int main(int argc, char *const *argv) {
   }
   if (r) failure_errno("init",r);
 
-  npollfdsavail= 0;
-  pollfds= 0;
-  
   for (qi=0; qi<qc; qi++) {
     fdom_split(fdomlist[qi],&domain,&qflags,ownflags,sizeof(ownflags));
-    if (!consistsof(ownflags,"a")) {
-      fputs("unknown ownqueryflag\n",stderr);
-      exit(4);
-    }
+    if (!consistsof(ownflags,"a")) usageerr("unknown ownqueryflag");
     for (ti=0; ti<tc; ti++) {
       mc= &mcs[qi*tc+ti];
       mc->doneyet= 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 == adns_s_unknownrrtype) {
+      if (r == ENOSYS) {
 	fprintf(stdout," not implemented\n");
 	mc->qu= 0;
 	mc->doneyet= 1;
@@ -262,23 +313,7 @@ int main(int argc, char *const *argv) {
     }
 
     if (strchr(owninitflags,'p')) {
-      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);
-      }
+      r= adns_wait_poll(ads,&qu,&ans,&mcr);
     } else {
       r= adns_wait(ads,&qu,&ans,&mcr);
     }
@@ -291,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);
@@ -308,8 +343,8 @@ int main(int argc, char *const *argv) {
     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);
       }
@@ -319,8 +354,5 @@ int main(int argc, char *const *argv) {
     mc->doneyet= 1;
   }
 
-  free(mcs);
-  adns_finish(ads);
-  
-  exit(0);
+  quitnow(0);
 }