X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/31e55c1b4a5fb6847df198d4bc81add025502695..d1278f10fdfb2f247322c4b62078602a7596816b:/client/adh-query.c

diff --git a/client/adh-query.c b/client/adh-query.c
index 1edf160..d8bcb7b 100644
--- a/client/adh-query.c
+++ b/client/adh-query.c
@@ -33,20 +33,6 @@ struct outstanding_list outstanding;
 
 static unsigned long idcounter;
 
-#define STATUSTYPEMAX(v) { adns_s_max_##v, #v }
-static const struct statustypemax {
-  adns_status smax;
-  const char *abbrev;
-} statustypemaxes[]= {
-  { adns_s_ok, "ok" },
-  STATUSTYPEMAX(localfail),
-  STATUSTYPEMAX(remotefail),
-  STATUSTYPEMAX(tempfail),
-  STATUSTYPEMAX(misconfig),
-  STATUSTYPEMAX(misquery),
-  STATUSTYPEMAX(permfail),
-};
-
 void ensure_adns_init(void) {
   int r;
   
@@ -61,11 +47,13 @@ void ensure_adns_init(void) {
   if (r) sysfail("adns_init",r);
 }
 
-void query_do(const char *domain) {
+static void prep_query(struct query_node **qun_r, int *quflags_r) {
   struct query_node *qun;
   char idbuf[20];
-  int r;
-
+  
+  if (ov_pipe && !ads) usageerr("-f/--pipe not consistent with domains on command line");
+  ensure_adns_init();
+  
   qun= malloc(sizeof(*qun));
   qun->pqfr= ov_pqfr;
   if (ov_id) {
@@ -75,16 +63,48 @@ void query_do(const char *domain) {
     idcounter &= 0x0fffffffflu;
     qun->id= xstrsave(idbuf);
   }
+
+  *quflags_r=
+    (ov_search ? adns_qf_search : 0) |
+    (ov_tcp ? adns_qf_usevc : 0) |
+    (ov_pqfr.show_owner ? adns_qf_owner : 0) |
+    (ov_qc_query ? adns_qf_quoteok_query : 0) |
+    (ov_qc_anshost ? adns_qf_quoteok_anshost : 0) |
+    (ov_qc_cname ? 0 : adns_qf_quoteok_cname) |
+    ov_cname,
+    
+  *qun_r= qun;
+}
   
+void of_ptr(const struct optioninfo *oi, const char *arg) {
+  struct query_node *qun;
+  int quflags, r;
+  struct sockaddr_in sa;
+
+  memset(&sa,0,sizeof(sa));
+  sa.sin_family= AF_INET;
+  if (!inet_aton(arg,&sa.sin_addr)) usageerr("invalid IP address %s",arg);
+
+  prep_query(&qun,&quflags);
+  r= adns_submit_reverse(ads,
+			 (struct sockaddr*)&sa,
+			 ov_type == adns_r_none ? adns_r_ptr : ov_type,
+			 quflags,
+			 qun,
+			 &qun->qu);
+  if (r) sysfail("adns_submit_reverse",r);
+
+  LIST_LINK_TAIL(outstanding,qun);
+}
+
+void query_do(const char *domain) {
+  struct query_node *qun;
+  int quflags, r;
+
+  prep_query(&qun,&quflags);
   r= adns_submit(ads, domain,
 		 ov_type == adns_r_none ? adns_r_addr : ov_type,
-		 (ov_search ? adns_qf_search : 0) |
-		 (ov_tcp ? adns_qf_usevc : 0) |
-		 (ov_pqfr.show_owner ? adns_qf_owner : 0) |
-		 (ov_qc_query ? adns_qf_quoteok_query : 0) |
-		 (ov_qc_anshost ? adns_qf_quoteok_anshost : 0) |
-		 (ov_qc_cname ? 0 : adns_qf_quoteok_cname) |
-		 ov_cname,
+		 quflags,
 		 qun,
 		 &qun->qu);
   if (r) sysfail("adns_submit",r);
@@ -92,6 +112,12 @@ void query_do(const char *domain) {
   LIST_LINK_TAIL(outstanding,qun);
 }
 
+static void dequeue_query(struct query_node *qun) {
+  LIST_UNLINK(outstanding,qun);
+  free(qun->id);
+  free(qun);
+}
+
 static void print_withspace(const char *str) {
   if (printf("%s ", str) == EOF) outerr();
 }
@@ -122,25 +148,28 @@ static void print_owner_ttl(struct query_node *qun, adns_answer *answer) {
 }
 
 static void print_status(adns_status st, struct query_node *qun, adns_answer *answer) {
-  int stnmin, stnmax, stn;
-  const char *statusabbrev, *statusstring;
-
-  stnmin= 0;
-  stnmax= sizeof(statustypemaxes)/sizeof(statustypemaxes[0]);
-  while (stnmin < stnmax) {
-    stn= (stnmin+stnmax)>>1;
-    if (st > statustypemaxes[stn].smax) stnmin= stn+1; else stnmax= stn;
-  }
-  stn= stnmin;
-  assert(statustypemaxes[stn].smax >= st);
-  
-  if (rcode < stn) rcode= stn;
+  static const adns_status statuspoints[]= {
+    adns_s_ok,
+    adns_s_max_localfail, adns_s_max_remotefail, adns_s_max_tempfail,
+    adns_s_max_misconfig, adns_s_max_misquery
+  };
+
+  const adns_status *spp;
+  const char *statustypeabbrev, *statusabbrev, *statusstring;
+  int minrcode;
+
+  statustypeabbrev= adns_errtypeabbrev(st);
+  for (minrcode=0, spp=statuspoints;
+       spp < statuspoints + (sizeof(statuspoints)/sizeof(statuspoints[0]));
+       spp++)
+    if (st > *spp) minrcode++;
+  if (rcode < minrcode) rcode= minrcode;
 
   statusabbrev= adns_errabbrev(st);
   statusstring= adns_strerror(st);
   assert(!strchr(statusstring,'"'));
 
-  if (printf("%s %d %s ", statustypemaxes[stn].abbrev, st, statusabbrev)
+  if (printf("%s %d %s ", statustypeabbrev, st, statusabbrev)
       == EOF) outerr();
   print_owner_ttl(qun,answer);
   if (qun->pqfr.show_cname)
@@ -154,8 +183,6 @@ void query_done(struct query_node *qun, adns_answer *answer) {
   const char *rrp, *realowner, *typename;
   char *datastr;
 
-  if (ov_pipe) setnonblock(1,0);
-
   st= answer->status;
   nrrs= answer->nrrs;
   if (ov_asynch) {
@@ -165,13 +192,13 @@ void query_done(struct query_node *qun, adns_answer *answer) {
     if (st) {
       if (fputs("; failed ",stdout) == EOF) outerr();
       print_status(st,qun,answer);
-    } else if (answer->cname) {
+    } else if (qun->pqfr.show_cname && answer->cname) {
       print_owner_ttl(qun,answer);
       if (printf("CNAME %s\n",answer->cname) == EOF) outerr();
     }
   }
   if (qun->pqfr.show_owner) {
-    realowner= answer->cname ? answer->cname : answer->owner;;
+    realowner= answer->cname ? answer->cname : answer->owner;
     assert(realowner);
   } else {
     realowner= 0;
@@ -191,10 +218,8 @@ void query_done(struct query_node *qun, adns_answer *answer) {
     }
   }
   if (fflush(stdout)) outerr();
-  LIST_UNLINK(outstanding,qun);
   free(answer);
-  free(qun->id);
-  free(qun);
+  dequeue_query(qun);
 }
 
 void of_asynch_id(const struct optioninfo *oi, const char *arg) {
@@ -203,6 +228,12 @@ void of_asynch_id(const struct optioninfo *oi, const char *arg) {
 }
 
 void of_cancel_id(const struct optioninfo *oi, const char *arg) {
-  assert(!"implemented");
-}
+  struct query_node *qun;
 
+  for (qun= outstanding.head;
+       qun && strcmp(qun->id,arg);
+       qun= qun->next);
+  if (!qun) return;
+  adns_cancel(qun->qu);
+  dequeue_query(qun);
+}