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

[master] cacluate TCP packet sizes correctly

Browse Source 
4296.	[bug]		TCP packet sizes were calculated incorrectly in the
			stats channel; they could be counted in the wrong
			histogram bucket. [RT #40587]
This commit is contained in:
Evan Hunt 2016-01-20 17:30:27 -08:00
parent 2879ee2c72
commit d40154cab7
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -1,3 +1,7 @@
4296. [bug] TCP packet sizes were calculated incorrectly in the
stats channel; they could be counted in the wrong
histogram bucket. [RT #40587]
4295. [bug] An unchecked result in dns_message_pseudosectiontotext() 4295. [bug] An unchecked result in dns_message_pseudosectiontotext()
could allow incorrect text formatting of EDNS EXPIRE could allow incorrect text formatting of EDNS EXPIRE
options. [RT #41437] options. [RT #41437]

6
bin/named/client.c
View File

@ -1166,7 +1166,8 @@ client_send(ns_client_t *client) {
isc_buffer_putuint16(&tcpbuffer, (isc_uint16_t) r.length); isc_buffer_putuint16(&tcpbuffer, (isc_uint16_t) r.length);
isc_buffer_add(&tcpbuffer, r.length); isc_buffer_add(&tcpbuffer, r.length);
respsize = isc_buffer_usedlength(&tcpbuffer); /* don't count the 2-octet length header */
respsize = isc_buffer_usedlength(&tcpbuffer) - 2;
result = client_sendpkg(client, &tcpbuffer); result = client_sendpkg(client, &tcpbuffer);
#ifdef HAVE_DNSTAP #ifdef HAVE_DNSTAP
@ -2145,6 +2146,9 @@ client_request(isc_task_t *task, isc_event_t *event) {
} }
reqsize = isc_buffer_usedlength(buffer); reqsize = isc_buffer_usedlength(buffer);
/* don't count the length header */
if (TCP_CLIENT(client))
reqsize -= 2;
if (exit_check(client)) if (exit_check(client))
goto cleanup; goto cleanup;

2
bin/tests/system/statschannel/traffic.expect.5
View File

@ -1,6 +1,6 @@
tcp request-size 16-31: 1 tcp request-size 16-31: 1
tcp request-size 48-63: 1 tcp request-size 48-63: 1
tcp response-size 128-143: 1 tcp response-size 112-127: 1
tcp response-size 64-79: 1 tcp response-size 64-79: 1
udp request-size 48-63: 2 udp request-size 48-63: 2
udp response-size 112-127: 1 udp response-size 112-127: 1

2
bin/tests/system/statschannel/traffic.expect.6
View File

@ -1,6 +1,6 @@
tcp request-size 16-31: 1 tcp request-size 16-31: 1
tcp request-size 48-63: 2 tcp request-size 48-63: 2
tcp response-size 128-143: 1 tcp response-size 112-127: 1
tcp response-size 64-79: 1 tcp response-size 64-79: 1
tcp response-size 848-863: 1 tcp response-size 848-863: 1
udp request-size 48-63: 2 udp request-size 48-63: 2