* make queries and print answers
*/
/*
- * 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 file is part of adns, which is Copyright Ian Jackson
+ * and contributors (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
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, write to the Free Software Foundation.
*/
#include "adnshost.h"
if (signal(SIGPIPE,SIG_IGN) == SIG_ERR) sysfail("ignore SIGPIPE",errno);
- initflags= adns_if_noautosys|adns_if_nosigpipe|ov_verbose;
+ initflags= adns_if_noautosys|adns_if_nosigpipe|ov_verbose|ov_checkc;
if (!ov_env) initflags |= adns_if_noenv;
if (config_text) {
(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 | ov_afflags;
*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, const char *arg2) {
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);
- 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,
void of_reverse(const struct optioninfo *oi, const char *arg, const char *arg2) {
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= xmalloc(strlen(arg) + strlen(arg2) + 2);
sprintf(qun->owner, "%s %s", arg,arg2);
- r= adns_submit_reverse_any(ads,
- (struct sockaddr*)&sa, arg2,
+ r= adns_submit_reverse_any(ads, &a.addr.sa,arg2,
ov_type == adns_r_none ? adns_r_txt : ov_type,
quflags,
qun,