2000-04-26 22:53:56 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2000 Internet Software Consortium.
|
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
|
|
* copyright notice and this permission notice appear in all copies.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
|
|
|
|
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
|
|
|
|
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
|
|
|
|
* CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
|
|
|
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
|
|
|
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|
|
|
* SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
|
|
|
extern int h_errno;
|
|
|
|
|
|
|
|
#include <isc/types.h>
|
|
|
|
#include <isc/app.h>
|
|
|
|
#include <isc/assertions.h>
|
|
|
|
#include <isc/error.h>
|
|
|
|
#include <isc/mem.h>
|
|
|
|
#include <isc/net.h>
|
|
|
|
#include <isc/netdb.h>
|
|
|
|
#include <isc/result.h>
|
|
|
|
#include <isc/sockaddr.h>
|
|
|
|
#include <isc/socket.h>
|
|
|
|
#include <isc/task.h>
|
|
|
|
#include <isc/timer.h>
|
|
|
|
#include <isc/time.h>
|
|
|
|
#include <isc/buffer.h>
|
|
|
|
#include <isc/list.h>
|
|
|
|
#include <isc/util.h>
|
|
|
|
#include <isc/commandline.h>
|
|
|
|
|
|
|
|
#include <dns/types.h>
|
|
|
|
#include <dns/message.h>
|
|
|
|
#include <dns/name.h>
|
|
|
|
#include <dns/fixedname.h>
|
|
|
|
#include <dns/rdata.h>
|
|
|
|
#include <dns/rdatalist.h>
|
|
|
|
#include <dns/rdataset.h>
|
|
|
|
#include <dns/rdataclass.h>
|
|
|
|
#include <dns/rdatatype.h>
|
|
|
|
#include <dns/result.h>
|
|
|
|
|
|
|
|
#include <dig/dig.h>
|
|
|
|
|
|
|
|
extern ISC_LIST(dig_lookup_t) lookup_list;
|
|
|
|
extern ISC_LIST(dig_server_t) server_list;
|
2000-05-02 23:23:12 +00:00
|
|
|
extern ISC_LIST(dig_searchlist_t) search_list;
|
2000-04-26 22:53:56 +00:00
|
|
|
|
|
|
|
extern isc_boolean_t tcp_mode,
|
2000-05-04 21:40:47 +00:00
|
|
|
have_ipv6, show_details;
|
2000-04-26 22:53:56 +00:00
|
|
|
extern in_port_t port;
|
|
|
|
extern unsigned int timeout;
|
|
|
|
extern isc_mem_t *mctx;
|
|
|
|
extern isc_taskmgr_t *taskmgr;
|
|
|
|
extern isc_task_t *task;
|
|
|
|
extern isc_timermgr_t *timermgr;
|
|
|
|
extern isc_socketmgr_t *socketmgr;
|
|
|
|
extern dns_messageid_t id;
|
|
|
|
extern dns_name_t rootorg;
|
|
|
|
extern char *rootspace[BUFSIZE];
|
|
|
|
extern isc_buffer_t rootbuf;
|
|
|
|
extern int sendcount;
|
2000-05-02 23:23:12 +00:00
|
|
|
extern int ndots;
|
|
|
|
extern int tries;
|
2000-05-06 01:16:07 +00:00
|
|
|
extern int lookup_counter;
|
2000-04-26 22:53:56 +00:00
|
|
|
|
|
|
|
isc_boolean_t short_form=ISC_TRUE,
|
2000-04-27 23:20:29 +00:00
|
|
|
filter=ISC_FALSE,
|
|
|
|
showallsoa=ISC_FALSE;
|
2000-04-26 22:53:56 +00:00
|
|
|
|
|
|
|
static char *opcodetext[] = {
|
|
|
|
"QUERY",
|
|
|
|
"IQUERY",
|
|
|
|
"STATUS",
|
|
|
|
"RESERVED3",
|
|
|
|
"NOTIFY",
|
|
|
|
"UPDATE",
|
|
|
|
"RESERVED6",
|
|
|
|
"RESERVED7",
|
|
|
|
"RESERVED8",
|
|
|
|
"RESERVED9",
|
|
|
|
"RESERVED10",
|
|
|
|
"RESERVED11",
|
|
|
|
"RESERVED12",
|
|
|
|
"RESERVED13",
|
|
|
|
"RESERVED14",
|
|
|
|
"RESERVED15"
|
|
|
|
};
|
|
|
|
|
|
|
|
static char *rcodetext[] = {
|
|
|
|
"NOERROR",
|
|
|
|
"FORMERR",
|
|
|
|
"SERVFAIL",
|
|
|
|
"NXDOMAIN",
|
|
|
|
"NOTIMPL",
|
|
|
|
"REFUSED",
|
|
|
|
"YXDOMAIN",
|
|
|
|
"YXRRSET",
|
|
|
|
"NXRRSET",
|
|
|
|
"NOTAUTH",
|
|
|
|
"NOTZONE",
|
|
|
|
"RESERVED11",
|
|
|
|
"RESERVED12",
|
|
|
|
"RESERVED13",
|
|
|
|
"RESERVED14",
|
|
|
|
"RESERVED15",
|
|
|
|
"BADVERS"
|
|
|
|
};
|
|
|
|
|
2000-04-27 23:20:29 +00:00
|
|
|
static char *rtypetext[] = {
|
|
|
|
"zero", /* 0 */
|
|
|
|
"has address", /* 1 */
|
|
|
|
"name server", /* 2 */
|
|
|
|
"MD", /* 3 */
|
|
|
|
"MF", /* 4 */
|
|
|
|
"is an alias for", /* 5 */
|
2000-04-28 21:41:19 +00:00
|
|
|
"SOA", /* 6 */
|
2000-04-27 23:20:29 +00:00
|
|
|
"MB", /* 7 */
|
|
|
|
"MG", /* 8 */
|
|
|
|
"MR", /* 9 */
|
|
|
|
"NULL", /* 10 */
|
|
|
|
"has well known services", /* 11 */
|
|
|
|
"domain name pointer", /* 12 */
|
|
|
|
"host information", /* 13 */
|
|
|
|
"MINFO", /* 14 */
|
|
|
|
"mail is handled by", /* 15 */
|
|
|
|
"text", /* 16 */
|
|
|
|
"RP", /* 17 */
|
|
|
|
"AFSDB", /* 18 */
|
|
|
|
"x25 address", /* 19 */
|
|
|
|
"isdn address", /* 20 */
|
|
|
|
"RT" /* 21 */
|
|
|
|
"NSAP", /* 22 */
|
|
|
|
"NSAP_PTR", /* 23 */
|
|
|
|
"has signature", /* 24 */
|
|
|
|
"has key", /* 25 */
|
|
|
|
"PX", /* 26 */
|
|
|
|
"GPOS", /* 27 */
|
|
|
|
"has AAAA address", /* 28 */
|
|
|
|
"LOC", /* 29 */
|
|
|
|
"has next record", /* 30 */
|
|
|
|
"has 31 record", /* 31 */
|
|
|
|
"has 32 record", /* 32 */
|
|
|
|
"SRV", /* 33 */
|
|
|
|
"has 34 record", /* 34 */
|
|
|
|
"NAPTR", /* 35 */
|
|
|
|
"KX", /* 36 */
|
|
|
|
"CERT", /* 37 */
|
|
|
|
"has v6 address", /* 38 */
|
|
|
|
"DNAME", /* 39 */
|
|
|
|
"has 40 record", /* 40 */
|
|
|
|
"has optional information"}; /* 41 */
|
|
|
|
|
2000-04-26 22:53:56 +00:00
|
|
|
void
|
2000-05-06 01:16:07 +00:00
|
|
|
check_next_lookup(dig_lookup_t *lookup) {
|
2000-04-26 22:53:56 +00:00
|
|
|
dig_lookup_t *next;
|
|
|
|
dig_query_t *query;
|
|
|
|
isc_boolean_t still_working=ISC_FALSE;
|
|
|
|
|
2000-05-06 01:16:07 +00:00
|
|
|
debug("In check_next_lookup", stderr);
|
2000-04-26 22:53:56 +00:00
|
|
|
for (query = ISC_LIST_HEAD(lookup->q);
|
|
|
|
query != NULL;
|
|
|
|
query = ISC_LIST_NEXT(query, link)) {
|
|
|
|
if (query->working) {
|
2000-05-06 01:16:07 +00:00
|
|
|
debug("Still have a worker.", stderr);
|
2000-04-26 22:53:56 +00:00
|
|
|
still_working=ISC_TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (still_working)
|
|
|
|
return;
|
|
|
|
|
2000-05-02 23:23:12 +00:00
|
|
|
next = ISC_LIST_NEXT(lookup, link);
|
|
|
|
debug ("Have %d retries left for %s\n",
|
|
|
|
lookup->retries, lookup->textname);
|
|
|
|
if ((next == NULL)&&((lookup->retries <= 1)
|
2000-05-06 01:16:07 +00:00
|
|
|
||tcp_mode || !lookup->pending)) {
|
2000-05-03 23:07:30 +00:00
|
|
|
debug("Shutting Down.", stderr);
|
2000-05-02 23:23:12 +00:00
|
|
|
isc_app_shutdown();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tcp_mode) {
|
|
|
|
setup_lookup(next);
|
|
|
|
do_lookup_tcp(next);
|
|
|
|
} else {
|
2000-05-06 01:16:07 +00:00
|
|
|
if ((lookup->retries > 1) && (lookup->pending)) {
|
2000-05-02 23:23:12 +00:00
|
|
|
lookup->retries --;
|
|
|
|
send_udp(lookup);
|
|
|
|
} else {
|
2000-05-06 01:16:07 +00:00
|
|
|
ENSURE (next != NULL);
|
2000-05-02 23:23:12 +00:00
|
|
|
setup_lookup(next);
|
|
|
|
do_lookup_udp(next);
|
|
|
|
}
|
|
|
|
}
|
2000-04-26 22:53:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
show_usage() {
|
2000-05-02 23:23:12 +00:00
|
|
|
fputs (
|
|
|
|
"Usage: host [-aCdlrTwv] [-c class] [-N ndots] [-t type] [-W time]\n"
|
|
|
|
" [-R number] hostname [server]\n"
|
|
|
|
" -a is equivalent to -v -t *\n"
|
|
|
|
" -c specifies query class for non-IN data\n"
|
|
|
|
" -C compares SOA records on authorative nameservers\n"
|
|
|
|
" -d is equivalent to -v\n"
|
|
|
|
" -l lists all hosts in a domain, using AXFR\n"
|
|
|
|
" -N changes the number of dots allowed before root lookup is done\n"
|
|
|
|
" -r disables recursive processing\n"
|
|
|
|
" -R specifies number of retries for UDP packets\n"
|
|
|
|
" -t specifies the query type\n"
|
|
|
|
" -T enables TCP/IP mode\n"
|
|
|
|
" -v enables verbose output\n"
|
|
|
|
" -w specifies to wait forever for a reply\n"
|
2000-05-03 23:07:30 +00:00
|
|
|
" -W specifies how long to wait for a reply\n", stderr);
|
2000-05-02 23:23:12 +00:00
|
|
|
exit (0);
|
2000-04-26 22:53:56 +00:00
|
|
|
}
|
|
|
|
|
2000-05-02 23:23:12 +00:00
|
|
|
void
|
|
|
|
received(int bytes, int frmsize, char *frm, dig_query_t *query) {
|
2000-05-04 21:40:47 +00:00
|
|
|
isc_time_t now;
|
|
|
|
isc_result_t result;
|
|
|
|
int diff;
|
|
|
|
|
|
|
|
if ((!short_form) || (show_details)) {
|
|
|
|
result = isc_time_now(&now);
|
|
|
|
check_result (result, "isc_time_now");
|
|
|
|
diff = isc_time_microdiff(&now, &query->time_sent);
|
|
|
|
printf("Received %u bytes from %.*s in %d ms\n",
|
|
|
|
bytes, frmsize, frm, diff/1000);
|
|
|
|
}
|
2000-05-02 23:23:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
trying(int frmsize, char *frm, dig_lookup_t *lookup) {
|
|
|
|
UNUSED (lookup);
|
|
|
|
|
|
|
|
if (!short_form)
|
|
|
|
printf ("Trying \"%.*s\"\n", frmsize, frm);
|
|
|
|
}
|
|
|
|
|
2000-04-26 22:53:56 +00:00
|
|
|
static void
|
2000-04-28 21:41:19 +00:00
|
|
|
say_message(dns_name_t *name, char *msg, dns_rdata_t *rdata,
|
|
|
|
dig_query_t *query)
|
|
|
|
{
|
|
|
|
isc_buffer_t *b=NULL, *b2=NULL;
|
2000-04-27 23:20:29 +00:00
|
|
|
isc_region_t r, r2;
|
2000-04-26 22:53:56 +00:00
|
|
|
isc_result_t result;
|
|
|
|
|
2000-04-28 21:41:19 +00:00
|
|
|
result = isc_buffer_allocate(mctx, &b, BUFSIZE);
|
|
|
|
check_result (result, "isc_buffer_allocate");
|
|
|
|
result = isc_buffer_allocate(mctx, &b2, BUFSIZE);
|
|
|
|
check_result (result, "isc_buffer_allocate");
|
|
|
|
result = dns_name_totext(name, ISC_FALSE, b);
|
2000-04-27 23:20:29 +00:00
|
|
|
check_result(result, "dns_name_totext");
|
|
|
|
isc_buffer_usedregion(b, &r);
|
|
|
|
result = dns_rdata_totext(rdata, NULL, b2);
|
2000-04-26 22:53:56 +00:00
|
|
|
check_result(result, "dns_rdata_totext");
|
2000-04-27 23:20:29 +00:00
|
|
|
isc_buffer_usedregion(b2, &r2);
|
2000-04-28 21:41:19 +00:00
|
|
|
printf ( "%.*s %s %.*s", (int)r.length, (char *)r.base,
|
2000-04-27 23:20:29 +00:00
|
|
|
msg, (int)r2.length, (char *)r2.base);
|
2000-04-28 21:41:19 +00:00
|
|
|
if (query->lookup->identify) {
|
2000-05-03 23:07:30 +00:00
|
|
|
printf (" on server %s", query->servname);
|
2000-04-28 21:41:19 +00:00
|
|
|
}
|
|
|
|
printf ("\n");
|
2000-04-27 23:20:29 +00:00
|
|
|
isc_buffer_free(&b);
|
|
|
|
isc_buffer_free(&b2);
|
|
|
|
}
|
|
|
|
|
2000-04-26 22:53:56 +00:00
|
|
|
|
|
|
|
static isc_result_t
|
|
|
|
printsection(dns_message_t *msg, dns_section_t sectionid, char *section_name,
|
2000-04-28 21:41:19 +00:00
|
|
|
isc_boolean_t headers, dig_query_t *query)
|
2000-04-26 22:53:56 +00:00
|
|
|
{
|
|
|
|
dns_name_t *name, *print_name;
|
|
|
|
dns_rdataset_t *rdataset;
|
|
|
|
dns_rdata_t rdata;
|
|
|
|
isc_buffer_t target;
|
|
|
|
isc_result_t result, loopresult;
|
|
|
|
isc_region_t r;
|
|
|
|
dns_name_t empty_name;
|
|
|
|
char t[4096];
|
|
|
|
isc_boolean_t first;
|
|
|
|
isc_boolean_t no_rdata;
|
2000-04-27 23:20:29 +00:00
|
|
|
char *rtt;
|
2000-04-26 22:53:56 +00:00
|
|
|
|
|
|
|
if (sectionid == DNS_SECTION_QUESTION)
|
|
|
|
no_rdata = ISC_TRUE;
|
|
|
|
else
|
|
|
|
no_rdata = ISC_FALSE;
|
|
|
|
|
|
|
|
if (headers)
|
|
|
|
printf(";; %s SECTION:\n", section_name);
|
|
|
|
|
|
|
|
dns_name_init(&empty_name, NULL);
|
|
|
|
|
|
|
|
result = dns_message_firstname(msg, sectionid);
|
|
|
|
if (result == ISC_R_NOMORE)
|
|
|
|
return (ISC_R_SUCCESS);
|
|
|
|
else if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
name = NULL;
|
|
|
|
dns_message_currentname(msg, sectionid, &name);
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_init(&target, t, sizeof(t));
|
2000-04-26 22:53:56 +00:00
|
|
|
first = ISC_TRUE;
|
|
|
|
print_name = name;
|
|
|
|
|
|
|
|
for (rdataset = ISC_LIST_HEAD(name->list);
|
|
|
|
rdataset != NULL;
|
|
|
|
rdataset = ISC_LIST_NEXT(rdataset, link)) {
|
|
|
|
if (!short_form) {
|
|
|
|
result = dns_rdataset_totext(rdataset,
|
|
|
|
print_name,
|
|
|
|
ISC_FALSE,
|
|
|
|
no_rdata,
|
|
|
|
&target);
|
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
|
|
|
#ifdef USEINITALWS
|
|
|
|
if (first) {
|
|
|
|
print_name = &empty_name;
|
|
|
|
first = ISC_FALSE;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
} else {
|
|
|
|
loopresult = dns_rdataset_first(rdataset);
|
|
|
|
while (loopresult == ISC_R_SUCCESS) {
|
|
|
|
dns_rdataset_current(rdataset, &rdata);
|
2000-04-27 23:20:29 +00:00
|
|
|
if (rdata.type <= 41)
|
|
|
|
rtt=rtypetext[rdata.type];
|
|
|
|
else if (rdata.type == 103)
|
|
|
|
rtt="unspecified data";
|
|
|
|
else if (rdata.type == 249)
|
|
|
|
rtt="key";
|
|
|
|
else if (rdata.type == 250)
|
|
|
|
rtt="signature";
|
|
|
|
else
|
|
|
|
rtt="unknown";
|
|
|
|
say_message(print_name,
|
|
|
|
rtypetext[rdata.type],
|
2000-04-28 21:41:19 +00:00
|
|
|
&rdata, query);
|
2000-04-26 22:53:56 +00:00
|
|
|
loopresult = dns_rdataset_next(
|
|
|
|
rdataset);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!short_form) {
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_usedregion(&target, &r);
|
2000-04-26 22:53:56 +00:00
|
|
|
if (no_rdata)
|
|
|
|
printf(";%.*s", (int)r.length,
|
|
|
|
(char *)r.base);
|
|
|
|
else
|
|
|
|
printf("%.*s", (int)r.length, (char *)r.base);
|
|
|
|
}
|
|
|
|
|
|
|
|
result = dns_message_nextname(msg, sectionid);
|
|
|
|
if (result == ISC_R_NOMORE)
|
|
|
|
break;
|
|
|
|
else if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
|
|
|
}
|
|
|
|
|
|
|
|
return (ISC_R_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
static isc_result_t
|
|
|
|
printrdata(dns_message_t *msg, dns_rdataset_t *rdataset, dns_name_t *owner,
|
|
|
|
char *set_name, isc_boolean_t headers)
|
|
|
|
{
|
|
|
|
isc_buffer_t target;
|
|
|
|
isc_result_t result;
|
|
|
|
isc_region_t r;
|
|
|
|
char t[4096];
|
|
|
|
|
|
|
|
UNUSED(msg);
|
|
|
|
if (headers)
|
|
|
|
printf(";; %s SECTION:\n", set_name);
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_init(&target, t, sizeof(t));
|
2000-04-26 22:53:56 +00:00
|
|
|
|
|
|
|
result = dns_rdataset_totext(rdataset, owner, ISC_FALSE, ISC_FALSE,
|
|
|
|
&target);
|
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_usedregion(&target, &r);
|
2000-04-26 22:53:56 +00:00
|
|
|
printf("%.*s", (int)r.length, (char *)r.base);
|
|
|
|
|
|
|
|
return (ISC_R_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
isc_result_t
|
2000-04-28 21:41:19 +00:00
|
|
|
printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
|
2000-04-26 22:53:56 +00:00
|
|
|
isc_boolean_t did_flag = ISC_FALSE;
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
dns_rdataset_t *opt, *tsig = NULL;
|
2000-04-26 22:53:56 +00:00
|
|
|
dns_name_t *tsigname;
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_result_t result = ISC_R_SUCCESS;
|
2000-05-04 21:40:47 +00:00
|
|
|
isc_buffer_t *b;
|
|
|
|
isc_region_t r;
|
2000-04-26 22:53:56 +00:00
|
|
|
|
2000-04-28 21:53:50 +00:00
|
|
|
UNUSED (headers);
|
|
|
|
|
2000-04-27 23:20:29 +00:00
|
|
|
if (msg->rcode != 0) {
|
2000-05-04 21:40:47 +00:00
|
|
|
result = isc_buffer_allocate(mctx, &b, MXNAME);
|
|
|
|
check_result (result, "isc_buffer_allocate");
|
|
|
|
result = dns_name_totext(query->lookup->name, ISC_FALSE,
|
|
|
|
b);
|
|
|
|
check_result (result, "dns_name_totext");
|
|
|
|
isc_buffer_usedregion (b, &r);
|
|
|
|
printf ("Host %.*s not found: %d(%s)\n",
|
|
|
|
(int)r.length, (char *)r.base,
|
2000-04-27 23:20:29 +00:00
|
|
|
msg->rcode, rcodetext[msg->rcode]);
|
2000-05-04 21:40:47 +00:00
|
|
|
isc_buffer_free (&b);
|
2000-04-27 23:20:29 +00:00
|
|
|
return (ISC_R_SUCCESS);
|
|
|
|
}
|
2000-04-26 22:53:56 +00:00
|
|
|
if (!short_form) {
|
|
|
|
printf(";; ->>HEADER<<- opcode: %s, status: %s, id: %u\n",
|
|
|
|
opcodetext[msg->opcode], rcodetext[msg->rcode],
|
|
|
|
msg->id);
|
|
|
|
printf(";; flags: ");
|
|
|
|
if ((msg->flags & DNS_MESSAGEFLAG_QR) != 0) {
|
|
|
|
printf("qr");
|
|
|
|
did_flag = ISC_TRUE;
|
|
|
|
}
|
|
|
|
if ((msg->flags & DNS_MESSAGEFLAG_AA) != 0) {
|
|
|
|
printf("%saa", did_flag ? " " : "");
|
|
|
|
did_flag = ISC_TRUE;
|
|
|
|
}
|
|
|
|
if ((msg->flags & DNS_MESSAGEFLAG_TC) != 0) {
|
|
|
|
printf("%stc", did_flag ? " " : "");
|
|
|
|
did_flag = ISC_TRUE;
|
|
|
|
}
|
|
|
|
if ((msg->flags & DNS_MESSAGEFLAG_RD) != 0) {
|
|
|
|
printf("%srd", did_flag ? " " : "");
|
|
|
|
did_flag = ISC_TRUE;
|
|
|
|
}
|
|
|
|
if ((msg->flags & DNS_MESSAGEFLAG_RA) != 0) {
|
|
|
|
printf("%sra", did_flag ? " " : "");
|
|
|
|
did_flag = ISC_TRUE;
|
|
|
|
}
|
|
|
|
if ((msg->flags & DNS_MESSAGEFLAG_AD) != 0) {
|
|
|
|
printf("%sad", did_flag ? " " : "");
|
|
|
|
did_flag = ISC_TRUE;
|
|
|
|
}
|
|
|
|
if ((msg->flags & DNS_MESSAGEFLAG_CD) != 0) {
|
|
|
|
printf("%scd", did_flag ? " " : "");
|
|
|
|
did_flag = ISC_TRUE;
|
|
|
|
}
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
printf("; QUERY: %u, ANSWER: %u, "
|
|
|
|
"AUTHORITY: %u, ADDITIONAL: %u\n",
|
2000-04-26 22:53:56 +00:00
|
|
|
msg->counts[DNS_SECTION_QUESTION],
|
|
|
|
msg->counts[DNS_SECTION_ANSWER],
|
|
|
|
msg->counts[DNS_SECTION_AUTHORITY],
|
|
|
|
msg->counts[DNS_SECTION_ADDITIONAL]);
|
|
|
|
opt = dns_message_getopt(msg);
|
|
|
|
if (opt != NULL)
|
|
|
|
printf(";; EDNS: version: %u, udp=%u\n",
|
|
|
|
(unsigned int)((opt->ttl & 0x00ff0000) >> 16),
|
|
|
|
(unsigned int)opt->rdclass);
|
|
|
|
tsigname = NULL;
|
|
|
|
tsig = dns_message_gettsig(msg, &tsigname);
|
|
|
|
if (tsig != NULL)
|
|
|
|
printf(";; PSEUDOSECTIONS: TSIG\n");
|
|
|
|
}
|
|
|
|
if (! ISC_LIST_EMPTY(msg->sections[DNS_SECTION_QUESTION]) &&
|
|
|
|
!short_form ) {
|
|
|
|
printf("\n");
|
|
|
|
result = printsection(msg, DNS_SECTION_QUESTION, "QUESTION",
|
2000-04-28 21:41:19 +00:00
|
|
|
ISC_TRUE, query);
|
2000-04-26 22:53:56 +00:00
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
|
|
|
}
|
|
|
|
if (! ISC_LIST_EMPTY(msg->sections[DNS_SECTION_ANSWER])) {
|
|
|
|
if (!short_form)
|
|
|
|
printf("\n");
|
|
|
|
result = printsection(msg, DNS_SECTION_ANSWER, "ANSWER",
|
2000-04-28 21:41:19 +00:00
|
|
|
!short_form, query);
|
2000-04-26 22:53:56 +00:00
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
|
|
|
}
|
|
|
|
if (! ISC_LIST_EMPTY(msg->sections[DNS_SECTION_AUTHORITY]) &&
|
|
|
|
!short_form ) {
|
|
|
|
printf("\n");
|
|
|
|
result = printsection(msg, DNS_SECTION_AUTHORITY, "AUTHORITY",
|
2000-04-28 21:41:19 +00:00
|
|
|
ISC_TRUE, query);
|
2000-04-26 22:53:56 +00:00
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
|
|
|
}
|
|
|
|
if (! ISC_LIST_EMPTY(msg->sections[DNS_SECTION_ADDITIONAL]) &&
|
|
|
|
!short_form ) {
|
|
|
|
printf("\n");
|
|
|
|
result = printsection(msg, DNS_SECTION_ADDITIONAL,
|
2000-04-28 21:41:19 +00:00
|
|
|
"ADDITIONAL", ISC_TRUE, query);
|
2000-04-26 22:53:56 +00:00
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
|
|
|
}
|
|
|
|
if ((tsig != NULL) && !short_form) {
|
|
|
|
printf("\n");
|
|
|
|
result = printrdata(msg, tsig, tsigname,
|
|
|
|
"PSEUDOSECTION TSIG", ISC_TRUE);
|
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
|
|
|
}
|
|
|
|
if (!short_form)
|
|
|
|
printf("\n");
|
|
|
|
|
|
|
|
return (result);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
parse_args(isc_boolean_t is_batchfile, int argc, char **argv) {
|
|
|
|
isc_boolean_t have_host=ISC_FALSE,
|
|
|
|
recursion=ISC_TRUE,
|
2000-04-29 00:12:56 +00:00
|
|
|
xfr_mode=ISC_FALSE,
|
|
|
|
nsfind=ISC_FALSE;
|
2000-04-26 22:53:56 +00:00
|
|
|
char hostname[MXNAME];
|
2000-04-28 21:41:19 +00:00
|
|
|
char querytype[32]="";
|
|
|
|
char queryclass[32]="";
|
2000-04-26 22:53:56 +00:00
|
|
|
dig_server_t *srv;
|
|
|
|
dig_lookup_t *lookup;
|
|
|
|
int c;
|
|
|
|
|
2000-04-28 21:53:50 +00:00
|
|
|
UNUSED(is_batchfile);
|
|
|
|
|
2000-05-03 23:07:30 +00:00
|
|
|
while ((c = isc_commandline_parse(argc, argv, "lvwrdt:c:aTCN:R:W:"))
|
2000-05-02 23:23:12 +00:00
|
|
|
!= EOF) {
|
2000-04-26 22:53:56 +00:00
|
|
|
switch (c) {
|
|
|
|
case 'l':
|
|
|
|
tcp_mode = ISC_TRUE;
|
|
|
|
xfr_mode = ISC_TRUE;
|
|
|
|
filter = ISC_TRUE;
|
|
|
|
strcpy (querytype, "axfr");
|
|
|
|
break;
|
|
|
|
case 'v':
|
|
|
|
case 'd':
|
|
|
|
short_form = ISC_FALSE;
|
|
|
|
break;
|
|
|
|
case 'r':
|
|
|
|
recursion = ISC_FALSE;
|
|
|
|
break;
|
|
|
|
case 't':
|
|
|
|
strncpy (querytype, isc_commandline_argument, 32);
|
|
|
|
break;
|
2000-04-27 23:20:29 +00:00
|
|
|
case 'c':
|
|
|
|
strncpy (queryclass, isc_commandline_argument, 32);
|
|
|
|
break;
|
2000-04-26 22:53:56 +00:00
|
|
|
case 'a':
|
|
|
|
strcpy (querytype, "any");
|
|
|
|
short_form = ISC_FALSE;
|
|
|
|
break;
|
|
|
|
case 'w':
|
|
|
|
/* XXXMWS This should be a system-indep.
|
2000-05-03 23:07:30 +00:00
|
|
|
* thing! */
|
2000-04-26 22:53:56 +00:00
|
|
|
timeout = 32767;
|
|
|
|
break;
|
2000-05-02 23:23:12 +00:00
|
|
|
case 'W':
|
|
|
|
timeout = atoi(isc_commandline_argument);
|
|
|
|
if (timeout < 1)
|
|
|
|
timeout = 1;
|
|
|
|
break;
|
|
|
|
case 'R':
|
|
|
|
tries = atoi(isc_commandline_argument);
|
|
|
|
if (tries < 1)
|
|
|
|
tries = 1;
|
|
|
|
break;
|
2000-04-28 21:41:19 +00:00
|
|
|
case 'T':
|
|
|
|
tcp_mode = ISC_TRUE;
|
|
|
|
break;
|
2000-04-27 23:20:29 +00:00
|
|
|
case 'C':
|
2000-04-29 00:12:56 +00:00
|
|
|
debug ("Showing all SOA's");
|
2000-04-28 21:41:19 +00:00
|
|
|
if (querytype[0] == 0)
|
|
|
|
strcpy (querytype, "soa");
|
|
|
|
if (queryclass[0] == 0)
|
|
|
|
strcpy (queryclass, "in");
|
2000-04-29 00:12:56 +00:00
|
|
|
nsfind = ISC_TRUE;
|
2000-04-27 23:20:29 +00:00
|
|
|
showallsoa = ISC_TRUE;
|
2000-05-04 21:40:47 +00:00
|
|
|
show_details = ISC_TRUE;
|
2000-04-27 23:20:29 +00:00
|
|
|
break;
|
2000-05-02 23:23:12 +00:00
|
|
|
case 'N':
|
|
|
|
debug ("Setting NDOTS to %s",
|
|
|
|
isc_commandline_argument);
|
|
|
|
ndots = atoi(isc_commandline_argument);
|
|
|
|
break;
|
2000-04-26 22:53:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (isc_commandline_index >= argc) {
|
|
|
|
show_usage();
|
|
|
|
}
|
|
|
|
strncpy (hostname, argv[isc_commandline_index], MXNAME);
|
|
|
|
if (argc > isc_commandline_index+1) {
|
|
|
|
srv=isc_mem_allocate(mctx, sizeof(struct dig_server));
|
|
|
|
if (srv == NULL)
|
|
|
|
fatal ("Memory allocation failure.");
|
|
|
|
strncpy(srv->servername,
|
2000-05-03 23:07:30 +00:00
|
|
|
argv[isc_commandline_index+1], MXNAME-1);
|
|
|
|
debug("Server is %s", srv->servername);
|
2000-04-26 22:53:56 +00:00
|
|
|
ISC_LIST_APPEND(server_list, srv, link);
|
|
|
|
}
|
|
|
|
|
2000-04-28 21:41:19 +00:00
|
|
|
if (querytype[0] == 0)
|
|
|
|
strcpy (querytype, "a");
|
|
|
|
if (queryclass[0] == 0)
|
|
|
|
strcpy (queryclass, "in");
|
|
|
|
|
2000-05-06 01:16:07 +00:00
|
|
|
lookup_counter++;
|
|
|
|
if (lookup_counter > LOOKUP_LIMIT)
|
|
|
|
fatal ("Too many lookups.");
|
2000-04-26 22:53:56 +00:00
|
|
|
lookup = isc_mem_allocate (mctx,
|
|
|
|
sizeof(struct dig_lookup));
|
|
|
|
if (lookup == NULL)
|
|
|
|
fatal ("Memory allocation failure.");
|
|
|
|
lookup->pending = ISC_FALSE;
|
|
|
|
strncpy (lookup->textname, hostname, MXNAME);
|
|
|
|
strncpy (lookup->rttext, querytype, 32);
|
2000-05-03 23:07:30 +00:00
|
|
|
strncpy (lookup->rctext, queryclass, 32);
|
2000-04-26 22:53:56 +00:00
|
|
|
lookup->namespace[0]=0;
|
|
|
|
lookup->sendspace[0]=0;
|
|
|
|
lookup->sendmsg=NULL;
|
|
|
|
lookup->name=NULL;
|
2000-05-02 23:23:12 +00:00
|
|
|
lookup->oname=NULL;
|
2000-04-26 22:53:56 +00:00
|
|
|
lookup->timer = NULL;
|
|
|
|
lookup->xfr_q = NULL;
|
2000-05-04 21:40:47 +00:00
|
|
|
lookup->origin = NULL;
|
2000-04-26 22:53:56 +00:00
|
|
|
lookup->doing_xfr = ISC_FALSE;
|
2000-04-28 21:41:19 +00:00
|
|
|
lookup->identify = ISC_FALSE;
|
2000-05-03 20:27:13 +00:00
|
|
|
lookup->recurse = recursion;
|
2000-04-28 21:41:19 +00:00
|
|
|
lookup->ns_search_only = showallsoa;
|
|
|
|
lookup->use_my_server_list = ISC_FALSE;
|
2000-05-02 23:23:12 +00:00
|
|
|
lookup->retries = tries;
|
2000-05-06 01:16:07 +00:00
|
|
|
lookup->nsfound = 0;
|
|
|
|
lookup->trace = showallsoa;
|
|
|
|
lookup->trace_root = ISC_FALSE;
|
2000-04-26 22:53:56 +00:00
|
|
|
ISC_LIST_INIT(lookup->q);
|
|
|
|
ISC_LIST_APPEND(lookup_list, lookup, link);
|
2000-05-02 23:23:12 +00:00
|
|
|
lookup->origin = NULL;
|
|
|
|
ISC_LIST_INIT(lookup->my_server_list);
|
2000-04-26 22:53:56 +00:00
|
|
|
have_host = ISC_TRUE;
|
|
|
|
}
|
|
|
|
|