upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 14:02:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor error in return codes fixed in dighost.c

Browse source 
Additional functionality to nslookup
This commit is contained in:
Michael Sawyer 2000-05-16 17:53:35 +00:00
parent 876753d5ce
commit 844eaa56d6
4 changed files with 198 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bin/dig/dig.c
View file

@ -358,7 +358,8 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
result = ISC_R_SUCCESS;
if (query->lookup->comments && !short_form) {
if (query->lookup->comments && !short_form &&
!query->lookup->doing_xfr) {
if (msg == query->lookup->sendmsg)
printf (";; Sending:\n");
else
@ -1146,6 +1147,6 @@ main(int argc, char **argv) {
start_lookup();
isc_app_run();
free_lists(0);
return (0);
return (exitcode);
}

10
bin/dig/dighost.c
View file

@ -24,6 +24,7 @@
* functions in most applications.
*/
#include <config.h>
#include <stdlib.h>
@ -1450,7 +1451,7 @@ recv_done(isc_task_t *task, isc_event_t *event) {
isc_result_totext(sevent->result));
}
static void
void
get_address(char *host, in_port_t port, isc_sockaddr_t *sockaddr) {
struct in_addr in4;
struct in6_addr in6;
@ -1557,7 +1558,7 @@ start_lookup(void) {
}
void
free_lists(int exitcode) {
free_lists(int _exitcode) {
void *ptr;
dig_lookup_t *l;
dig_query_t *q;
@ -1637,6 +1638,7 @@ free_lists(int exitcode) {
if (mctx != NULL)
isc_mem_destroy(&mctx);
if (exitcode != 0)
exit(exitcode);
debug("Getting ready to exit, code=%d",_exitcode);
if (_exitcode != 0)
exit(_exitcode);
}

2
bin/dig/include/dig/dig.h
View file

@ -133,6 +133,8 @@ struct dig_searchlist {
/* Routines in dighost.c */
void
get_address(char *host, in_port_t port, isc_sockaddr_t *sockaddr);
void
fatal(char *format, ...) ;
void
debug(char *format, ...) ;

198
bin/dig/nslookup.c
View file

@ -59,7 +59,7 @@ extern int lookup_counter;
extern char fixeddomain[MXNAME];
extern int exitcode;
isc_boolean_t short_form = ISC_FALSE, printcmd = ISC_TRUE,
isc_boolean_t short_form = ISC_TRUE, printcmd = ISC_TRUE,
filter = ISC_FALSE, showallsoa = ISC_FALSE,
tcpmode = ISC_FALSE;
@ -336,6 +336,152 @@ printsection(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers,
return (ISC_R_SUCCESS);
}
static isc_result_t
detailsection(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers,
dns_section_t section) {
isc_result_t result, loopresult;
isc_buffer_t *b = NULL;
dns_name_t *name;
dns_rdataset_t *rdataset = NULL;
dns_rdata_t rdata;
char *ptr;
UNUSED (query);
debug("printsection()");
/*
* Exitcode 9 means we timed out, but if we're printing a message,
* we much have recovered. Go ahead and reset it to code 0, and
* call this a success.
*/
if (exitcode == 9)
exitcode = 0;
if (headers) {
switch (section) {
case DNS_SECTION_QUESTION:
puts (" QUESTIONS:");
break;
case DNS_SECTION_ANSWER:
puts (" ANSWERS:");
break;
case DNS_SECTION_AUTHORITY:
puts (" AUTHORITY RECORDS:");
break;
case DNS_SECTION_ADDITIONAL:
puts (" ADDITIONAL RECORDS:");
break;
}
}
result = dns_message_firstname(msg, section);
if (result == ISC_R_NOMORE)
return (ISC_R_SUCCESS);
else if (result != ISC_R_SUCCESS)
return (result);
result = isc_buffer_allocate(mctx, &b, MXNAME);
check_result(result, "isc_buffer_allocate");
for (;;) {
name = NULL;
dns_message_currentname(msg, section,
&name);
for (rdataset = ISC_LIST_HEAD(name->list);
rdataset != NULL;
rdataset = ISC_LIST_NEXT(rdataset, link)) {
loopresult = dns_rdataset_first(rdataset);
while (loopresult == ISC_R_SUCCESS) {
dns_rdataset_current(rdataset, &rdata);
isc_buffer_clear(b);
result = dns_name_totext(name,
ISC_TRUE,
b);
check_result(result,
"dns_name_totext");
printf(" -> %.*s\n",
(int)isc_buffer_usedlength(b),
(char*)isc_buffer_base(b));
switch (rdata.type) {
case dns_rdatatype_soa:
isc_buffer_clear(b);
result = dns_rdata_totext(&rdata,
NULL,
b);
check_result(result,
"dns_rdata_totext");
isc_buffer_used(b)[0]=0;
ptr = strtok(isc_buffer_base(b),
" \t\r\n");
if (ptr == NULL)
break;
printf("\torigin = %s\n",
ptr);
ptr = strtok(NULL, " \t\r\n");
if (ptr == NULL)
break;
printf("\tmail addr = %s\n",
ptr);
ptr = strtok(NULL, " \t\r\n");
if (ptr == NULL)
break;
ptr = strtok(NULL, " \t\r\n");
if (ptr == NULL)
break;
printf("\tserial = %s\n",
ptr);
ptr = strtok(NULL, " \t\r\n");
if (ptr == NULL)
break;
printf("\trefresh = %s\n",
ptr);
ptr = strtok(NULL, " \t\r\n");
if (ptr == NULL)
break;
printf("\tretry = %s\n",
ptr);
ptr = strtok(NULL, " \t\r\n");
if (ptr == NULL)
break;
printf("\texpire = %s\n",
ptr);
ptr = strtok(NULL, " \t\r\n");
if (ptr == NULL)
break;
printf("\tminimum = %s\n",
ptr);
break;
default:
isc_buffer_clear(b);
if (rdata.type <= 41)
printf ("\t%s",
rtypetext[rdata.type]);
else
printf ("\trdata_%d = ",
rdata.type);
isc_buffer_clear(b);
result = dns_rdata_totext(&rdata,
NULL, b);
check_result(result,
"dns_rdata_totext");
printf("%.*s\n",
(int)isc_buffer_usedlength(b),
(char*)isc_buffer_base(b));
}
loopresult = dns_rdataset_next(rdataset);
}
}
result = dns_message_nextname(msg, section);
if (result == ISC_R_NOMORE)
break;
else if (result != ISC_R_SUCCESS) {
isc_buffer_free (&b);
return (result);
}
}
isc_buffer_free(&b);
return (ISC_R_SUCCESS);
}
isc_result_t
printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
isc_buffer_t *b = NULL;
@ -366,29 +512,54 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
check_result(result, "isc_sockaddr_totext");
printf("Address:\t%.*s\n", (int)isc_buffer_usedlength(b),
(char*)isc_buffer_base(b));
isc_buffer_free(&b);
puts("");
if (!short_form){
puts ("------------");
/* detailheader(query, msg);*/
detailsection(query, msg, headers, DNS_SECTION_QUESTION);
detailsection(query, msg, headers, DNS_SECTION_ANSWER);
detailsection(query, msg, headers, DNS_SECTION_AUTHORITY);
detailsection(query, msg, headers, DNS_SECTION_ADDITIONAL);
puts ("------------");
}
if ((msg->flags & DNS_MESSAGEFLAG_AA) == 0)
puts ("Non-authorative answer:");
isc_buffer_free(&b);
printsection(query, msg, headers, DNS_SECTION_ANSWER);
if (((msg->flags & DNS_MESSAGEFLAG_AA) == 0) &&
(strcasecmp(query->lookup->rttext,"a") != 0)) {
puts ("\nAuthorative answers can be found from:");
printsection(query, msg, headers, DNS_SECTION_AUTHORITY);
printsection(query, msg, headers, DNS_SECTION_ADDITIONAL);
printsection(query, msg, headers,
DNS_SECTION_AUTHORITY);
printsection(query, msg, headers,
DNS_SECTION_ADDITIONAL);
}
return (ISC_R_SUCCESS);
}
static void
showsettings() {
show_settings(isc_boolean_t full) {
dig_server_t *srv;
isc_sockaddr_t sockaddr;
isc_buffer_t *b = NULL;
isc_result_t result;
srv = ISC_LIST_HEAD(server_list);
while (srv != NULL) {
printf ("Default server: %s\n",
srv->servername);
result = isc_buffer_allocate(mctx, &b, MXNAME);
check_result(result, "isc_buffer_allocate");
get_address(srv->servername, 53, &sockaddr);
result = isc_sockaddr_totext(&sockaddr, b);
check_result(result, "isc_sockaddr_totext");
printf ("Default server: %s\nAddress: %.*s\n",
srv->servername, (int)isc_buffer_usedlength(b),
(char*)isc_buffer_base(b));
isc_buffer_free(&b);
if (!full)
return;
srv = ISC_LIST_NEXT(srv, link);
}
printf ("\n\tSet options:\n");
@ -396,7 +567,8 @@ showsettings() {
tcpmode?"vc":"novc", short_form?"nodebug":"debug",
recurse?"recurse":"norecurse");
printf ("\t %s\t\t%s\t\tport = %d\n",
defname?"defname":"nodefname", usesearch?"search":"nosearch",
defname?"defname":"nodefname",
usesearch?"search":"nosearch",
port);
printf ("\t timeout = %d\t\tretry = %d\n",
timeout, tries);
@ -409,7 +581,7 @@ static void
setoption(char *opt) {
if (strncasecmp(opt,"all",4) == 0) {
showsettings() ;
show_settings(ISC_TRUE);
} else if (strncasecmp(opt, "class=", 6) == 0) {
strncpy(defclass, &opt[6], MXRD);
} else if (strncasecmp(opt, "cl=", 3) == 0) {
@ -562,6 +734,7 @@ get_next_command() {
static void
parse_args(int argc, char **argv) {
dig_lookup_t *lookup = NULL;
isc_boolean_t have_host = ISC_FALSE;
for (argc--, argv++; argc > 0; argc--, argv++) {
debug ("Main parsing %s", argv[0]);
@ -573,6 +746,8 @@ parse_args(int argc, char **argv) {
}
if (argv[0][1] != 0)
setoption(&argv[0][1]);
else {
} else {
if (lookup == NULL) {
in_use = ISC_TRUE;
@ -663,6 +838,7 @@ main(int argc, char **argv) {
flush_lookup_list();
in_use = ISC_FALSE;
} else {
show_settings(ISC_FALSE);
in_use = ISC_TRUE;
}