Can set query flags, and static version.

diff --git a/client/.cvsignore b/client/.cvsignore
index 777b57ab092ad5e42bea34b52278cf374d04e31f..e6b4fa8098f8dda3227dbebc599feaf82f7db8f0 100644 (file)
--- a/client/.cvsignore
+++ b/client/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 adnstest
+adnstest_s

diff --git a/client/Makefile.in b/client/Makefile.in
index 24a8a6e8e4a6a8fbe578dfe633a1d6d9fd834b51..a3a6327ef084106fd5480f1d75d1aee5327042bc 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -19,12 +19,16 @@
 srcdir=                @srcdir@
 VPATH=         @srcdir@
 
-TARGETS=       adnstest
+TARG_LOCAL=    adnstest_s
+TARG_INSTALL=  adnstest
+TARGETS=       $(TARG_LOCAL) $(TARG_INSTALL)
 include                $(srcdir)/../settings.make
 
 DIRCFLAGS=     -I$(srcdir)/../src
 
-install:       $(TARGETS)
+all:           $(TARGETS)
+
+install:       $(TARG_INSTALL)
                set -xe; for f in $(TARGETS); \
                        do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
 
@@ -32,3 +36,6 @@ uninstall:
                for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
 
 adnstest:      adnstest.o $(srcdir)/../dynamic/$(SHLIBFILE)
+
+adnstest_s:    adnstest.o $(srcdir)/../src/libadns.a
+               $(CC) $(LDFLAGS) $^ -o $@ $(LIBS)

diff --git a/client/adnstest.c b/client/adnstest.c
index 98caf2fd78de31db789a3b6e6e48cd6251703e24..6827cbd2787d2e0e9f867a1aa2002176f1d10af6 100644 (file)
--- a/client/adnstest.c
+++ b/client/adnstest.c
@@ -67,14 +67,23 @@ static void dumptype(adns_status ri, const char *rrtn, const char *fmtn) {
          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;
   const char *initstring, *rrtn, *fmtn;
-  const char *const *domlist;
+  const char *const *fdomlist, *domain;
   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;
   struct timeval now;
@@ -108,10 +117,10 @@ int main(int argc, char *const *argv) {
     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); }
@@ -124,9 +133,10 @@ int main(int argc, char *const *argv) {
   if (r) failure("init",r);
 
   for (qi=0; qi<qc; qi++) {
+    fdom_split(fdomlist[qi],&domain,&qflags);
     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]);
+      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;
@@ -142,19 +152,22 @@ int main(int argc, char *const *argv) {
   }
 
   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;
+      
       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);
-      fprintf(stdout, "%s type ", domlist[qi]);
+      fprintf(stdout, "%s type ",domain);
       dumptype(ri,rrtn,fmtn);
-      fprintf(stdout, ": %s; nrrs=%d; cname=%s; ttl=%ld\n",
-             adns_strerror(ans->status),
+      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) {