X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/e0d855e1cf6273d258889c11551976f42a6c79b4..2953d358511ac5d196362f6b339c010d4e9cae3e:/client/adh-query.c

diff --git a/client/adh-query.c b/client/adh-query.c
index 58b1561..bae71f4 100644
--- a/client/adh-query.c
+++ b/client/adh-query.c
@@ -45,13 +45,18 @@ void ensure_adns_init(void) {
 	       ov_verbose,
 	       0);
   if (r) sysfail("adns_init",r);
+
+  if (ov_format == fmt_default)
+    ov_format= ov_asynch ? fmt_asynch : fmt_simple;
 }
 
-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) {
@@ -61,16 +66,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 || ov_format == fmt_simple) ? 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);
@@ -113,7 +150,7 @@ static void print_owner_ttl(struct query_node *qun, adns_answer *answer) {
   print_ttl(qun,answer);
 }
 
-static void print_status(adns_status st, struct query_node *qun, adns_answer *answer) {
+static void check_status(adns_status st) {
   static const adns_status statuspoints[]= {
     adns_s_ok,
     adns_s_max_localfail, adns_s_max_remotefail, adns_s_max_tempfail,
@@ -121,16 +158,19 @@ static void print_status(adns_status st, struct query_node *qun, adns_answer *an
   };
 
   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;
+}
+
+static void print_status(adns_status st, struct query_node *qun, adns_answer *answer) {
+  const char *statustypeabbrev, *statusabbrev, *statusstring;
 
+  statustypeabbrev= adns_errtypeabbrev(st);
   statusabbrev= adns_errabbrev(st);
   statusstring= adns_strerror(st);
   assert(!strchr(statusstring,'"'));
@@ -143,6 +183,32 @@ static void print_status(adns_status st, struct query_node *qun, adns_answer *an
   if (printf("\"%s\"\n", statusstring) == EOF) outerr();
 }
 
+static void print_dnsfail(adns_status st, struct query_node *qun, adns_answer *answer) {
+  int r;
+  const char *typename, *statusstring;
+  adns_status ist;
+  
+  if (ov_format == fmt_inline) {
+    if (fputs("; failed ",stdout) == EOF) outerr();
+    print_status(st,qun,answer);
+    return;
+  }
+  assert(ov_format == fmt_simple);
+  if (st == adns_s_nxdomain) {
+    r= fprintf(stderr,"%s does not exist\n", answer->owner);
+  } else {
+    ist= adns_rr_info(answer->type, &typename, 0,0,0,0);
+    if (st == adns_s_nodata) {
+      r= fprintf(stderr,"%s has no %s record\n", answer->owner, typename);
+    } else {
+      statusstring= adns_strerror(st);
+      r= fprintf(stderr,"Error during DNS %s lookup for %s: %s\n",
+		 typename, answer->owner, statusstring);
+    }
+  }
+  if (r == EOF) sysfail("write error message to stderr",errno);
+}
+    
 void query_done(struct query_node *qun, adns_answer *answer) {
   adns_status st, ist;
   int rrn, nrrs;
@@ -151,20 +217,23 @@ void query_done(struct query_node *qun, adns_answer *answer) {
 
   st= answer->status;
   nrrs= answer->nrrs;
-  if (ov_asynch) {
+  if (ov_format == fmt_asynch) {
+    check_status(st);
     if (printf("%s %d ", qun->id, nrrs) == EOF) outerr();
     print_status(st,qun,answer);
   } else {
-    if (st) {
-      if (fputs("; failed ",stdout) == EOF) outerr();
-      print_status(st,qun,answer);
-    } else if (qun->pqfr.show_cname && answer->cname) {
+    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_type) print_withspace("CNAME");
+      if (printf("%s\n", answer->cname) == EOF) outerr();
+    }
+    if (st) {
+      check_status(st);
+      print_dnsfail(st,qun,answer);
     }
   }
   if (qun->pqfr.show_owner) {
-    realowner= answer->cname ? answer->cname : answer->owner;;
+    realowner= answer->cname ? answer->cname : answer->owner;
     assert(realowner);
   } else {
     realowner= 0;