X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/e42ce2b231bd9954414fa8a00a543b931ecd6f67..02b47faadfe03c3b302dadb78422e14648f07b50:/client/adnstest.c

diff --git a/client/adnstest.c b/client/adnstest.c
index 671cd1e..cbb896a 100644
--- a/client/adnstest.c
+++ b/client/adnstest.c
@@ -138,7 +138,7 @@ int main(int argc, char *const *argv) {
   initflagsnum= strtoul(initflags,&ep,0);
   if (*ep == ',') {
     owninitflags= ep+1;
-    if (!consistsof(owninitflags,"p")) {
+    if (!consistsof(owninitflags,"ps")) {
       fputs("unknown owninitflag\n",stderr);
       exit(4);
     }
@@ -162,6 +162,7 @@ int main(int argc, char *const *argv) {
 		"              [ :<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);
@@ -252,61 +253,70 @@ int main(int argc, char *const *argv) {
     }
     if (!mcw) break;
 
-    mc= mcw;
-    qu= mcw->qu;
+    if (strchr(owninitflags,'s')) {
+      qu= mcw->qu;
+      mc= mcw;
+    } else {
+      qu= 0;
+      mc= 0;
+    }
 
-      if (strchr(owninitflags,'p')) {
+    if (strchr(owninitflags,'p')) {
+      for (;;) {
+	r= adns_check(ads,&qu,&ans,&mcr);
+	if (r != EWOULDBLOCK) break;
 	for (;;) {
-	  r= adns_check(ads,&qu,&ans,&mcr);
-	  if (r != EWOULDBLOCK) break;
-	  for (;;) {
-	    npollfds= npollfdsavail;
-	    timeout= -1;
-	    r= adns_beforepoll(ads, pollfds, &npollfds, &timeout, 0);
-	    if (r != ERANGE) break;
-	    pollfds= realloc(pollfds,sizeof(*pollfds)*npollfds);
-	    if (!pollfds) failure_errno("realloc pollfds",errno);
-	    npollfdsavail= npollfds;
-	  }
-	  if (r) failure_errno("beforepoll",r);
-	  r= poll(pollfds,npollfds,timeout);
-	  if (r == -1) failure_errno("poll",errno);
-	  adns_afterpoll(ads,pollfds, r?npollfds:0, 0);
+	  npollfds= npollfdsavail;
+	  timeout= -1;
+	  r= adns_beforepoll(ads, pollfds, &npollfds, &timeout, 0);
+	  if (r != ERANGE) break;
+	  pollfds= realloc(pollfds,sizeof(*pollfds)*npollfds);
+	  if (!pollfds) failure_errno("realloc pollfds",errno);
+	  npollfdsavail= npollfds;
 	}
-      } else {
-	r= adns_wait(ads,&qu,&ans,&mcr);
+	if (r) failure_errno("beforepoll",r);
+	r= poll(pollfds,npollfds,timeout);
+	if (r == -1) failure_errno("poll",errno);
+	adns_afterpoll(ads,pollfds, r?npollfds:0, 0);
       }
-      if (r) failure_errno("wait/check",r);
-
-      assert(mcr==mc);
-      fdom_split(mc->fdom,&domain,&qflags,ownflags,sizeof(ownflags));
+    } else {
+      r= adns_wait(ads,&qu,&ans,&mcr);
+    }
+    if (r) failure_errno("wait/check",r);
+    
+    if (mc) assert(mcr==mc);
+    else mc= mcr;
+    assert(qu==mc->qu);
+    assert(!mc->doneyet);
+    
+    fdom_split(mc->fdom,&domain,&qflags,ownflags,sizeof(ownflags));
 
-      if (gettimeofday(&now,0)) { perror("gettimeofday"); exit(3); }
+    if (gettimeofday(&now,0)) { perror("gettimeofday"); exit(3); }
       
-      ri= adns_rr_info(ans->type, &rrtn,&fmtn,&len, 0,0);
-      fprintf(stdout, "%s flags %d type ",domain,qflags);
-      dumptype(ri,rrtn,fmtn);
-      fprintf(stdout, "%s%s: %s; nrrs=%d; cname=%s; owner=%s; ttl=%ld\n",
-	      ownflags[0] ? " ownflags=" : "", ownflags,
-	      strchr(ownflags,'a')
-	      ? adns_errabbrev(ans->status)
-	      : adns_strerror(ans->status),
-	      ans->nrrs,
-	      ans->cname ? ans->cname : "$",
-	      ans->owner ? ans->owner : "$",
-	      (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_status("info",r);
-	  fprintf(stdout," %s\n",show);
-	  free(show);
-	}
+    ri= adns_rr_info(ans->type, &rrtn,&fmtn,&len, 0,0);
+    fprintf(stdout, "%s flags %d type ",domain,qflags);
+    dumptype(ri,rrtn,fmtn);
+    fprintf(stdout, "%s%s: %s; nrrs=%d; cname=%s; owner=%s; ttl=%ld\n",
+	    ownflags[0] ? " ownflags=" : "", ownflags,
+	    strchr(ownflags,'a')
+	    ? adns_errabbrev(ans->status)
+	    : adns_strerror(ans->status),
+	    ans->nrrs,
+	    ans->cname ? ans->cname : "$",
+	    ans->owner ? ans->owner : "$",
+	    (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_status("info",r);
+	fprintf(stdout," %s\n",show);
+	free(show);
       }
-      free(ans);
+    }
+    free(ans);
 
-      mc->doneyet= 1;
+    mc->doneyet= 1;
   }
 
   free(mcs);