X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/828d89bd4196ad8ef825cdf2db26afe2eb797b69..70a778e57fbc29a2d2bc8976745a18f4edd1a03a:/client/adnstest.c?ds=inline

diff --git a/client/adnstest.c b/client/adnstest.c
index 95955cb..9768d74 100644
--- a/client/adnstest.c
+++ b/client/adnstest.c
@@ -25,6 +25,10 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#ifndef OUTPUTSTREAM
+# define OUTPUTSTREAM stdout
+#endif
+
 #include "adns.h"
 
 static void failure(const char *what, adns_status st) {
@@ -38,11 +42,21 @@ static const adns_rrtype defaulttypes[]= {
   adns_r_a,
   adns_r_ns_raw,
   adns_r_cname,
+  adns_r_soa_raw,
   adns_r_ptr_raw,
+  adns_r_hinfo,
   adns_r_mx_raw,
-  adns_r_rp_raw,
   adns_r_txt,
+  adns_r_rp_raw,
+  
   adns_r_addr,
+  adns_r_ns,
+  adns_r_ptr,
+  adns_r_mx,
+  
+  adns_r_soa,
+  adns_r_rp,
+
   adns_r_none
 };
 
@@ -71,8 +85,8 @@ 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: dtest [:<typenum>,...] [<domain> ...]",stderr);
+	if (ch != ',') {
+	  fputs("usage: dtest [:<typenum>,...] [<domain> ...]\n",stderr);
 	  exit(4);
 	}
 	cp++;
@@ -99,14 +113,14 @@ int main(int argc, char *const *argv) {
     for (ti=0; ti<tc; ti++) {
       fprintf(stdout,"%s type %d",domlist[qi],types[ti]);
       r= adns_submit(ads,domlist[qi],types[ti],0,0,&qus[qi*tc+ti]);
-      if (r == adns_s_notimplemented) {
+      if (r == adns_s_unknownrrtype) {
 	fprintf(stdout," not implemented\n");
 	qus[qi*tc+ti]= 0;
       } else if (r) {
 	failure("submit",r);
       } else {
 	ri= adns_rr_info(types[ti], &rrtn,&fmtn,0, 0,0);
-	putchar(' ');
+	putc(' ',stdout);
 	dumptype(ri,rrtn,fmtn);
 	fprintf(stdout," submitted\n");
       }
@@ -131,7 +145,7 @@ int main(int argc, char *const *argv) {
 	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("info",r);
-	  printf(" %s\n",show);
+	  fprintf(stdout," %s\n",show);
 	  free(show);
 	}
       }
@@ -140,5 +154,7 @@ int main(int argc, char *const *argv) {
   }
 
   free(qus);
+  adns_finish(ads);
+  
   exit(0);
 }