Can set query flags, and static version.

[adns.git] / client / adnstest.c

diff --git a/client/adnstest.c b/client/adnstest.c
index 95955cba4ab8d7d236c75fc523a7a2197d8dd461..6827cbd2787d2e0e9f867a1aa2002176f1d10af6 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


@@ -21,10 +21,15 @@
  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

+#include <sys/time.h>

 #include <unistd.h>
 #include <assert.h>
 #include <stdlib.h>
 
 #include <unistd.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,11 +43,21 @@ 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_mx_raw,

-  adns_r_rp_raw,

   adns_r_txt,
   adns_r_txt,

+  adns_r_rp_raw,
+  

   adns_r_addr,
   adns_r_addr,

+  adns_r_ns,
+  adns_r_ptr,
+  adns_r_mx,
+  
+  adns_r_soa,
+  adns_r_rp,
+

   adns_r_none
 };
 
   adns_r_none
 };
 


@@ -52,17 +67,35 @@ static void dumptype(adns_status ri, const char *rrtn, const char *fmtn) {
          ri ? " " : "", ri ? adns_strerror(ri) : "");
 }
 
          ri ? " " : "", ri ? adns_strerror(ri) : "");
 }
 

+static void fdom_split(const char *fdom, const char **dom_r, int *qf_r) {
+  int qf;
+  char *ep;
+
+  qf= strtoul(fdom,&ep,0);
+  if (*ep != '/') { *dom_r= fdom; *qf_r= 0; }
+  else { *dom_r= ep+1; *qf_r= qf; }
+}
+

 int main(int argc, char *const *argv) {
   adns_state ads;
   adns_query *qus, qu;
   adns_answer *ans;
 int main(int argc, char *const *argv) {
   adns_state ads;
   adns_query *qus, qu;
   adns_answer *ans;

-  const char *rrtn, *fmtn, *const *domlist;
+  const char *initstring, *rrtn, *fmtn;
+  const char *const *fdomlist, *domain;

   char *show, *cp;
   char *show, *cp;

-  int len, i, qc, qi, tc, ti, ch;
+  int len, i, qc, qi, tc, ti, ch, qflags;

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

+  struct timeval now;

   adns_rrtype *types_a;
 
   adns_rrtype *types_a;
 

+  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++;
   if (argv[0] && argv[1] && argv[1][0] == ':') {
     for (cp= argv[1]+1, tc=1; (ch= *cp); cp++)
       if (ch==',') tc++;


@@ -71,8 +104,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)) {
     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 [/<initstring>] [:<typenum>,...] [<domain> ...]\n",stderr);

          exit(4);
        }
        cp++;
          exit(4);
        }
        cp++;


@@ -84,29 +117,34 @@ int main(int argc, char *const *argv) {
     types= defaulttypes;
   }
   
     types= defaulttypes;
   }
   

-  if (argv[0] && argv[1]) domlist= (const char *const*)argv+1;
-  else domlist= defaultargv;
+  if (argv[0] && argv[1]) fdomlist= (const char *const*)argv+1;
+  else fdomlist= defaultargv;

 
 

-  for (qc=0; qc[domlist]; qc++);
+  for (qc=0; fdomlist[qc]; 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++) {
   if (r) failure("init",r);
 
   for (qi=0; qi<qc; qi++) {

+    fdom_split(fdomlist[qi],&domain,&qflags);

     for (ti=0; ti<tc; ti++) {
     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) {
+      fprintf(stdout,"%s type %d flags %d",domain,types[ti],qflags);
+      r= adns_submit(ads,domain,types[ti],qflags,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);
        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");
       }
        dumptype(ri,rrtn,fmtn);
        fprintf(stdout," submitted\n");
       }


@@ -114,24 +152,30 @@ int main(int argc, char *const *argv) {
   }
 
   for (qi=0; qi<qc; qi++) {
   }
 
   for (qi=0; qi<qc; qi++) {

+    fdom_split(fdomlist[qi],&domain,&qflags);
+      

     for (ti=0; ti<tc; ti++) {
       qu= qus[qi*tc+ti];
       if (!qu) continue;
     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);
 
       r= adns_wait(ads,&qu,&ans,0);
       if (r) failure("wait",r);
 

+      if (gettimeofday(&now,0)) { perror("gettimeofday"); exit(3); }
+      

       ri= adns_rr_info(ans->type, &rrtn,&fmtn,&len, 0,0);
       ri= adns_rr_info(ans->type, &rrtn,&fmtn,&len, 0,0);

-      fprintf(stdout, "%s type ", domlist[qi]);
+      fprintf(stdout, "%s type ",domain);

       dumptype(ri,rrtn,fmtn);
       dumptype(ri,rrtn,fmtn);

-      fprintf(stdout, ": %s; nrrs=%d; cname=%s\n",
-             adns_strerror(ans->status),
-             ans->nrrs, ans->cname ? ans->cname : "$");
+      fprintf(stdout, " flags %d: %s; nrrs=%d; cname=%s; ttl=%ld\n",
+             qflags, adns_strerror(ans->status),
+             ans->nrrs, ans->cname ? ans->cname : "$",
+             (long)ans->expires - (long)now.tv_sec);

       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("info",r);
       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("info",r);

-         printf(" %s\n",show);
+         fprintf(stdout," %s\n",show);

          free(show);
        }
       }
          free(show);
        }
       }


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

+  adns_finish(ads);
+  

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