Copyright dates fixed; various TODOs added.

[adns] / client / adnstest.c

diff --git a/client/adnstest.c b/client/adnstest.c
index 92e8a9f028e09a4381760814e5d8ad90915df1bc..ea9ed2a35bd1e7c98ca41fa164d281f0356b1a3d 100644 (file)
--- a/client/adnstest.c
+++ b/client/adnstest.c
@@ -3,7 +3,7 @@
  * - simple test program, not part of the library
  */
 /*
  * - simple test program, not part of the library
  */
 /*

- *  This file is part of adns, which is Copyright (C) 1997, 1998 Ian Jackson
+ *  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson

  *  
  *  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
  *  
  *  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


@@ -25,6 +25,10 @@
 #include <assert.h>
 #include <stdlib.h>
 
 #include <assert.h>
 #include <stdlib.h>
 

+#ifndef OUTPUTSTREAM
+# define OUTPUTSTREAM stdout
+#endif
+

 #include "adns.h"
 
 static void failure(const char *what, adns_status st) {
 #include "adns.h"
 
 static void failure(const char *what, adns_status st) {


@@ -38,54 +42,114 @@ static const adns_rrtype defaulttypes[]= {
   adns_r_a,
   adns_r_ns_raw,
   adns_r_cname,
   adns_r_a,
   adns_r_ns_raw,
   adns_r_cname,

+  adns_r_soa_raw,

   adns_r_ptr_raw,
   adns_r_ptr_raw,

+  adns_r_hinfo,
+  adns_r_mx_raw,

   adns_r_txt,
   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
 };
 
   adns_r_none
 };
 

-int main(int argc, const char *const *argv) {
+static void dumptype(adns_status ri, const char *rrtn, const char *fmtn) {
+  fprintf(stdout, "%s(%s)%s%s",
+         ri ? "?" : rrtn, ri ? "?" : fmtn ? fmtn : "-",
+         ri ? " " : "", ri ? adns_strerror(ri) : "");
+}
+
+int main(int argc, char *const *argv) {

   adns_state ads;
   adns_query *qus, qu;
   adns_answer *ans;
   adns_state ads;
   adns_query *qus, qu;
   adns_answer *ans;

-  const char *rrtn, *fmtn;
-  char *show;
-  int len, i, qc, qi, tc, ti;
+  const char *initstring, *rrtn, *fmtn;
+  const char *const *domlist;
+  char *show, *cp;
+  int len, i, qc, qi, tc, ti, ch;

   adns_status r, ri;
   const adns_rrtype *types;
   adns_status r, ri;
   const adns_rrtype *types;

+  adns_rrtype *types_a;

 
 

-  if (argv[0] && argv[1]) argv++;
-  else argv= defaultargv;
-
-  types= defaulttypes;
+  if (argv[0] && argv[1] && argv[1][0] == '/') {
+    initstring= argv[1]+1;
+    argv++;
+  } else {
+    initstring= 0;
+  }
+  
+  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);
+    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: dtest [/<initstring>] [:<typenum>,...] [<domain> ...]\n",stderr);
+         exit(4);
+       }
+       cp++;
+      }
+    }
+    types= types_a;
+    argv++;
+  } else {
+    types= defaulttypes;
+  }
+  
+  if (argv[0] && argv[1]) domlist= (const char *const*)argv+1;
+  else domlist= defaultargv;

 
 

-  for (qc=0; qc[argv]; qc++);
+  for (qc=0; qc[domlist]; qc++);

   for (tc=0; types[tc] != adns_r_none; tc++);
   qus= malloc(sizeof(qus)*qc*tc);
   if (!qus) { perror("malloc qus"); exit(3); }
 
   for (tc=0; types[tc] != adns_r_none; tc++);
   qus= malloc(sizeof(qus)*qc*tc);
   if (!qus) { perror("malloc qus"); exit(3); }
 

-  r= adns_init(&ads,adns_if_debug|adns_if_noautosys,0);
+  if (initstring) {
+    r= adns_init_strcfg(&ads,adns_if_debug|adns_if_noautosys,stdout,initstring);
+  } else {
+    r= adns_init(&ads,adns_if_debug|adns_if_noautosys,0);
+  }

   if (r) failure("init",r);
 
   for (qi=0; qi<qc; qi++) {
     for (ti=0; ti<tc; ti++) {
   if (r) failure("init",r);
 
   for (qi=0; qi<qc; qi++) {
     for (ti=0; ti<tc; ti++) {

-      fprintf(stdout,"submitting %s %d\n",argv[qi],types[ti]);
-      r= adns_submit(ads,argv[qi],types[ti],0,0,&qus[qi*tc+ti]);
-      if (r) failure("submit",r);
+      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_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);
+       putc(' ',stdout);
+       dumptype(ri,rrtn,fmtn);
+       fprintf(stdout," submitted\n");
+      }

     }
   }
 
   for (qi=0; qi<qc; qi++) {
     for (ti=0; ti<tc; ti++) {
       qu= qus[qi*tc+ti];
     }
   }
 
   for (qi=0; qi<qc; qi++) {
     for (ti=0; ti<tc; ti++) {
       qu= qus[qi*tc+ti];

+      if (!qu) continue;

       r= adns_wait(ads,&qu,&ans,0);
       if (r) failure("wait",r);
 
       ri= adns_rr_info(ans->type, &rrtn,&fmtn,&len, 0,0);
       r= adns_wait(ads,&qu,&ans,0);
       if (r) failure("wait",r);
 
       ri= adns_rr_info(ans->type, &rrtn,&fmtn,&len, 0,0);

-      fprintf(stdout, "%s type %s(%s)%s%s: ",
-             argv[qi],
-             ri ? "?" : rrtn, ri ? "?" : fmtn ? fmtn : "-",
-             ri ? " " : "", ri ? adns_strerror(ri) : "");
-      fprintf(stdout, "%s; nrrs=%d; cname=%s\n",
+      fprintf(stdout, "%s type ", domlist[qi]);
+      dumptype(ri,rrtn,fmtn);
+      fprintf(stdout, ": %s; nrrs=%d; cname=%s\n",

              adns_strerror(ans->status),
              ans->nrrs, ans->cname ? ans->cname : "$");
       if (ans->nrrs) {
              adns_strerror(ans->status),
              ans->nrrs, ans->cname ? ans->cname : "$");
       if (ans->nrrs) {


@@ -93,7 +157,7 @@ int main(int argc, const 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);
        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);
        }
       }
          free(show);
        }
       }


@@ -102,5 +166,7 @@ int main(int argc, const char *const *argv) {
   }
 
   free(qus);
   }
 
   free(qus);

+  adns_finish(ads);
+  

   exit(0);
 }
   exit(0);
 }