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=88875d2c43eabd767acce5e15b66cb33150313ee;hb=33ae0dddfdde95bedb160eae8059ba1a271cf7ea;hpb=16cf5367e3a455f322328315f3c13ed23d68b690

diff --git a/client/adnstest.c b/client/adnstest.c
index 88875d2..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
  */
 /*
@@ -40,23 +40,43 @@
 #undef poll
 int poll(struct pollfd *ufds, int nfds, int timeout) {
   fputs("poll(2) not supported on this system\n",stderr);
-  exit(3);
+  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 [-<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"
+	  "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,
@@ -125,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;
@@ -149,15 +170,11 @@ 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] == ':') {
@@ -168,16 +185,7 @@ int main(int argc, char *const *argv) {
     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 (ch != ',') usageerr("unexpected char (not comma) in or between types");
 	cp++;
       }
     }
@@ -188,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++);
@@ -198,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,
@@ -212,10 +221,7 @@ int main(int argc, char *const *argv) {
   
   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;
@@ -223,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;
@@ -319,8 +325,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);
       }