X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=client%2Fadh-query.c;h=d17beab05a6ec7b8a159180a571e6aa8e6671f41;hp=14568b4a89537bed11c0c1de94f417c2a2ecdd42;hb=849075a00676ad04776f4fe3902e23cc2d8f70a3;hpb=d7449548b74b994a0d7390c5f153f40f02b46105 diff --git a/client/adh-query.c b/client/adh-query.c index 14568b4..d17beab 100644 --- a/client/adh-query.c +++ b/client/adh-query.c @@ -5,11 +5,11 @@ */ /* * This file is - * Copyright (C) 1997-1999 Ian Jackson + * Copyright (C) 1997-2000 Ian Jackson * * It is part of adns, which is - * Copyright (C) 1997-1999 Ian Jackson - * Copyright (C) 1999 Tony Finch + * Copyright (C) 1997-2000 Ian Jackson + * Copyright (C) 1999-2000 Tony Finch * * 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,17 +34,25 @@ struct outstanding_list outstanding; 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); - 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; } static void prep_query(struct query_node **qun_r, int *quflags_r) { @@ -67,7 +75,7 @@ static void prep_query(struct query_node **qun_r, int *quflags_r) { *quflags_r= (ov_search ? adns_qf_search : 0) | (ov_tcp ? adns_qf_usevc : 0) | - (ov_pqfr.show_owner ? adns_qf_owner : 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) | @@ -76,7 +84,7 @@ static void prep_query(struct query_node **qun_r, int *quflags_r) { *qun_r= qun; } -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 sockaddr_in sa; @@ -86,6 +94,7 @@ void of_ptr(const struct optioninfo *oi, const char *arg) { if (!inet_aton(arg,&sa.sin_addr)) usageerr("invalid IP address %s",arg); prep_query(&qun,&quflags); + qun->owner= xstrsave(arg); r= adns_submit_reverse(ads, (struct sockaddr*)&sa, ov_type == adns_r_none ? adns_r_ptr : ov_type, @@ -97,11 +106,35 @@ void of_ptr(const struct optioninfo *oi, const char *arg) { 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; + 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); + 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, + 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; prep_query(&qun,&quflags); + qun->owner= xstrsave(domain); r= adns_submit(ads, domain, ov_type == adns_r_none ? adns_r_addr : ov_type, quflags, @@ -115,6 +148,7 @@ void query_do(const char *domain) { static void dequeue_query(struct query_node *qun) { LIST_UNLINK(outstanding,qun); free(qun->id); + free(qun->owner); free(qun); } @@ -142,12 +176,16 @@ static void print_ttl(struct query_node *qun, adns_answer *answer) { if (printf("%lu ",ttl) == EOF) outerr(); } +static const char *owner_show(struct query_node *qun, adns_answer *answer) { + return answer->owner ? answer->owner : qun->owner; +} + static void print_owner_ttl(struct query_node *qun, adns_answer *answer) { - if (qun->pqfr.show_owner) print_withspace(answer->owner); + if (qun->pqfr.show_owner) print_withspace(owner_show(qun,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, @@ -155,16 +193,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,'"')); @@ -177,6 +218,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", owner_show(qun,answer)); + } 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", owner_show(qun,answer), typename); + } else { + statusstring= adns_strerror(st); + r= fprintf(stderr,"Error during DNS %s lookup for %s: %s\n", + typename, owner_show(qun,answer), 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; @@ -185,20 +252,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 : owner_show(qun,answer); assert(realowner); } else { realowner= 0; @@ -222,12 +292,12 @@ void query_done(struct query_node *qun, adns_answer *answer) { 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); } -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;