mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

1748. [func] dig now returns the byte count for axfr/ixfr.

Browse Source
This commit is contained in:
Mark Andrews
2004-10-21 01:44:24 +00:00
parent 055597532d
commit 81e6a5849d
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -5,8 +5,8 @@
1749. [placeholder] rt12866 1749. [placeholder] rt12866
1748. [placeholder] rt12838 1748. [func] dig now returns the byte count for axfr/ixfr.
1747. [bug] BIND 8 compatability: named/named-checkconf failed 1747. [bug] BIND 8 compatability: named/named-checkconf failed
to parse "host-statistics-max" in named.conf. to parse "host-statistics-max" in named.conf.

17
bin/dig/dig.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dig.c,v 1.199 2004/09/16 02:12:37 marka Exp $ */ /* $Id: dig.c,v 1.200 2004/10/21 01:44:23 marka Exp $ */
#include <config.h> #include <config.h>
#include <stdlib.h> #include <stdlib.h>
@@ -248,10 +248,12 @@ received(int bytes, isc_sockaddr_t *from, dig_query_t *query) {
time(&tnow); time(&tnow);
printf(";; WHEN: %s", ctime(&tnow)); printf(";; WHEN: %s", ctime(&tnow));
if (query->lookup->doing_xfr) { if (query->lookup->doing_xfr) {
printf(";; XFR size: %u records (messages %u)\n", printf(";; XFR size: %u records (messages %u, "
query->rr_count, query->msg_count); "bytes %" ISC_PRINT_QUADFORMAT "u)\n",
query->rr_count, query->msg_count,
query->byte_count);
} else { } else {
printf(";; MSG SIZE rcvd: %d\n", bytes); printf(";; MSG SIZE rcvd: %u\n", bytes);
} }
if (key != NULL) { if (key != NULL) {
@@ -265,8 +267,11 @@ received(int bytes, isc_sockaddr_t *from, dig_query_t *query) {
puts(""); puts("");
} else if (query->lookup->identify && !short_form) { } else if (query->lookup->identify && !short_form) {
diff = isc_time_microdiff(&now, &query->time_sent); diff = isc_time_microdiff(&now, &query->time_sent);
printf(";; Received %u bytes from %s(%s) in %d ms\n\n", printf(";; Received %" ISC_PRINT_QUADFORMAT "u bytes "
bytes, fromtext, query->servname, "from %s(%s) in %d ms\n\n",
query->lookup->doing_xfr ?
query->byte_count : (isc_uint64_t)bytes,
fromtext, query->servname,
(int)diff/1000); (int)diff/1000);
} }
} }

4
bin/dig/dighost.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dighost.c,v 1.270 2004/10/07 02:21:48 marka Exp $ */ /* $Id: dighost.c,v 1.271 2004/10/21 01:44:23 marka Exp $ */
/* /*
* Notice to programmers: Do not use this code as an example of how to * Notice to programmers: Do not use this code as an example of how to
@@ -1874,6 +1874,7 @@ setup_lookup(dig_lookup_t *lookup) {
query->userarg = serv->userarg; query->userarg = serv->userarg;
query->rr_count = 0; query->rr_count = 0;
query->msg_count = 0; query->msg_count = 0;
query->byte_count = 0;
ISC_LINK_INIT(query, link); ISC_LINK_INIT(query, link);
ISC_LIST_INIT(query->recvlist); ISC_LIST_INIT(query->recvlist);
ISC_LIST_INIT(query->lengthlist); ISC_LIST_INIT(query->lengthlist);
@@ -2443,6 +2444,7 @@ check_for_more_data(dig_query_t *query, dns_message_t *msg,
*/ */
query->msg_count++; query->msg_count++;
query->byte_count += sevent->n;
result = dns_message_firstname(msg, DNS_SECTION_ANSWER); result = dns_message_firstname(msg, DNS_SECTION_ANSWER);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
puts("; Transfer failed."); puts("; Transfer failed.");

3
bin/dig/include/dig/dig.h
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dig.h,v 1.87 2004/10/07 02:21:48 marka Exp $ */ /* $Id: dig.h,v 1.88 2004/10/21 01:44:24 marka Exp $ */
#ifndef DIG_H #ifndef DIG_H
#define DIG_H #define DIG_H
@@ -207,6 +207,7 @@ struct dig_query {
ISC_LINK(dig_query_t) link; ISC_LINK(dig_query_t) link;
isc_sockaddr_t sockaddr; isc_sockaddr_t sockaddr;
isc_time_t time_sent; isc_time_t time_sent;
isc_uint64_t byte_count;
}; };
struct dig_server { struct dig_server {