Support v6-mapping IPv4 addresses found doing addr lookups.

[adns.git] / client / adh-query.c

diff --git a/client/adh-query.c b/client/adh-query.c
index cc5dc122f2846f194aaee48244063b43b9e7b0d7..aa2918e430dff8b57fe4e0200a718e663145082c 100644 (file)
--- a/client/adh-query.c
+++ b/client/adh-query.c
@@ -4,12 +4,11 @@
  *   make queries and print answers
  */
 /*
  *   make queries and print answers
  */
 /*

- *  This file is
- *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
- *
- *  It is part of adns, which is
- *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
- *    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+ *  This file is part of adns, which is
+ *    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+ *    Copyright (C) 1999-2000,2003,2006  Tony Finch
+ *    Copyright (C) 1991 Massachusetts Institute of Technology
+ *  (See the file INSTALL for full details.)

  *  
  *  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


@@ -34,22 +33,41 @@ struct outstanding_list outstanding;
 static unsigned long idcounter;
 
 void ensure_adns_init(void) {
 static unsigned long idcounter;
 
 void ensure_adns_init(void) {

+  adns_initflags initflags;

   int r;
   
   if (ads) return;
 
   if (signal(SIGPIPE,SIG_IGN) == SIG_ERR) sysfail("ignore SIGPIPE",errno);
   int r;
   
   if (ads) return;
 
   if (signal(SIGPIPE,SIG_IGN) == SIG_ERR) sysfail("ignore SIGPIPE",errno);

-  r= adns_init(&ads,
-              adns_if_noautosys|adns_if_nosigpipe |
-              (ov_env ? 0 : adns_if_noenv) |
-              ov_verbose,
-              0);
+
+  initflags= adns_if_noautosys|adns_if_nosigpipe|ov_verbose;
+  if (!ov_env) initflags |= adns_if_noenv;
+
+  if (config_text) {
+    r= adns_init_strcfg(&ads, initflags, stderr, config_text);
+  } else {
+    r= adns_init(&ads, initflags, 0);
+  }

   if (r) sysfail("adns_init",r);
 
   if (ov_format == fmt_default)
     ov_format= ov_asynch ? fmt_asynch : fmt_simple;
 }
 
   if (r) sysfail("adns_init",r);
 
   if (ov_format == fmt_default)
     ov_format= ov_asynch ? fmt_asynch : fmt_simple;
 }
 

+void type_info(adns_rrtype type, const char **typename_r,
+              const void *datap, char **data_r) {
+  static char buf[12];
+  adns_status st;
+  
+  st= adns_rr_info(type, typename_r, 0,0, datap,data_r);
+  if (st == adns_s_nomemory) sysfail("adns_rr_info failed",ENOMEM);
+  assert(!st);
+  if (typename_r && !*typename_r) {
+    sprintf(buf,"TYPE%d", (int)(type & adns_rrt_typemask));
+    *typename_r= buf;
+  }
+}
+

 static void prep_query(struct query_node **qun_r, int *quflags_r) {
   struct query_node *qun;
   char idbuf[20];
 static void prep_query(struct query_node **qun_r, int *quflags_r) {
   struct query_node *qun;
   char idbuf[20];


@@ -74,24 +92,31 @@ static void prep_query(struct query_node **qun_r, int *quflags_r) {
     (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_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,
+    (ov_v6map ? adns_qf_ipv6_mapv4 : 0) |
+    ov_cname;

     
   *qun_r= qun;
 }
     
   *qun_r= qun;
 }

+
+static void sockaddr_aton(const char *text, adns_rr_addr *a) {
+  int err;
+
+  a->len= sizeof(a->addr);
+  err= adns_text2addr(text,0,adns_qf_addrlit_scope_forbid,
+                     &a->addr.sa,&a->len);
+  if (err == EINVAL) usageerr("invalid IP address %s",text);
+  else if (err) sysfail("adns_text2addr",err);
+}

   
   

-void of_ptr(const struct optioninfo *oi, const char *arg) {
+void of_ptr(const struct optioninfo *oi, const char *arg, const char *arg2) {

   struct query_node *qun;
   int quflags, r;
   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);
+  adns_rr_addr a;

 
 

+  sockaddr_aton(arg,&a);

   prep_query(&qun,&quflags);
   qun->owner= xstrsave(arg);
   prep_query(&qun,&quflags);
   qun->owner= xstrsave(arg);

-  r= adns_submit_reverse(ads,
-                        (struct sockaddr*)&sa,
+  r= adns_submit_reverse(ads, &a.addr.sa,

                         ov_type == adns_r_none ? adns_r_ptr : ov_type,
                         quflags,
                         qun,
                         ov_type == adns_r_none ? adns_r_ptr : ov_type,
                         quflags,
                         qun,


@@ -101,6 +126,25 @@ void of_ptr(const struct optioninfo *oi, const char *arg) {
   LIST_LINK_TAIL(outstanding,qun);
 }
 
   LIST_LINK_TAIL(outstanding,qun);
 }
 

+void of_reverse(const struct optioninfo *oi, const char *arg, const char *arg2) {
+  struct query_node *qun;
+  int quflags, r;
+  adns_rr_addr a;
+
+  sockaddr_aton(arg,&a);
+  prep_query(&qun,&quflags);
+  qun->owner= xmalloc(strlen(arg) + strlen(arg2) + 2);
+  sprintf(qun->owner, "%s %s", arg,arg2);
+  r= adns_submit_reverse_any(ads, &a.addr.sa,arg2,
+                            ov_type == adns_r_none ? adns_r_txt : 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;
 void query_do(const char *domain) {
   struct query_node *qun;
   int quflags, r;


@@ -120,6 +164,7 @@ void query_do(const char *domain) {
 static void dequeue_query(struct query_node *qun) {
   LIST_UNLINK(outstanding,qun);
   free(qun->id);
 static void dequeue_query(struct query_node *qun) {
   LIST_UNLINK(outstanding,qun);
   free(qun->id);

+  free(qun->owner);

   free(qun);
 }
 
   free(qun);
 }
 


@@ -192,7 +237,6 @@ static void print_status(adns_status st, struct query_node *qun, adns_answer *an
 static void print_dnsfail(adns_status st, struct query_node *qun, adns_answer *answer) {
   int r;
   const char *typename, *statusstring;
 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();
   
   if (ov_format == fmt_inline) {
     if (fputs("; failed ",stdout) == EOF) outerr();


@@ -203,7 +247,7 @@ static void print_dnsfail(adns_status st, struct query_node *qun, adns_answer *a
   if (st == adns_s_nxdomain) {
     r= fprintf(stderr,"%s does not exist\n", owner_show(qun,answer));
   } else {
   if (st == adns_s_nxdomain) {
     r= fprintf(stderr,"%s does not exist\n", owner_show(qun,answer));
   } else {

-    ist= adns_rr_info(answer->type, &typename, 0,0,0,0);
+    type_info(answer->type, &typename, 0,0);

     if (st == adns_s_nodata) {
       r= fprintf(stderr,"%s has no %s record\n", owner_show(qun,answer), typename);
     } else {
     if (st == adns_s_nodata) {
       r= fprintf(stderr,"%s has no %s record\n", owner_show(qun,answer), typename);
     } else {


@@ -216,7 +260,7 @@ static void print_dnsfail(adns_status st, struct query_node *qun, adns_answer *a
 }
     
 void query_done(struct query_node *qun, adns_answer *answer) {
 }
     
 void query_done(struct query_node *qun, adns_answer *answer) {

-  adns_status st, ist;
+  adns_status st;

   int rrn, nrrs;
   const char *rrp, *realowner, *typename;
   char *datastr;
   int rrn, nrrs;
   const char *rrp, *realowner, *typename;
   char *datastr;


@@ -250,9 +294,7 @@ void query_done(struct query_node *qun, adns_answer *answer) {
         rrn++, rrp += answer->rrsz) {
       if (realowner) print_withspace(realowner);
       print_ttl(qun,answer);
         rrn++, rrp += answer->rrsz) {
       if (realowner) print_withspace(realowner);
       print_ttl(qun,answer);

-      ist= adns_rr_info(answer->type, &typename, 0, 0, rrp, &datastr);
-      if (ist == adns_s_nomemory) sysfail("adns_rr_info failed",ENOMEM);
-      assert(!ist);
+      type_info(answer->type,&typename, rrp,&datastr);

       if (qun->pqfr.show_type) print_withspace(typename);
       if (printf("%s\n",datastr) == EOF) outerr();
       free(datastr);
       if (qun->pqfr.show_type) print_withspace(typename);
       if (printf("%s\n",datastr) == EOF) outerr();
       free(datastr);


@@ -263,12 +305,12 @@ void query_done(struct query_node *qun, adns_answer *answer) {
   dequeue_query(qun);
 }
 
   dequeue_query(qun);
 }
 

-void of_asynch_id(const struct optioninfo *oi, const char *arg) {
+void of_asynch_id(const struct optioninfo *oi, const char *arg, const char *arg2) {

   free(ov_id);
   ov_id= xstrsave(arg);
 }
 
   free(ov_id);
   ov_id= xstrsave(arg);
 }
 

-void of_cancel_id(const struct optioninfo *oi, const char *arg) {
+void of_cancel_id(const struct optioninfo *oi, const char *arg, const char *arg2) {

   struct query_node *qun;
 
   for (qun= outstanding.head;
   struct query_node *qun;
 
   for (qun= outstanding.head;