BIND 10 trac2157, updated. 8a001c349081b102849fc3566b57975ffd4629da [trac2157] applied internal review comment
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Aug 10 05:10:28 UTC 2012
The branch, trac2157 has been updated
via 8a001c349081b102849fc3566b57975ffd4629da (commit)
from 155de05953fa54cb5e542cc7d297073a5f8c40be (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8a001c349081b102849fc3566b57975ffd4629da
Author: Yoshitaka Aharen <aharen at jprs.co.jp>
Date: Fri Aug 10 14:09:41 2012 +0900
[trac2157] applied internal review comment
Added 'queries.udp'.
-----------------------------------------------------------------------
Summary of changes:
src/bin/auth/statistics.cc | 8 ++++----
src/bin/auth/statistics_items.h | 2 ++
src/bin/auth/tests/auth_srv_unittest.cc | 20 +++++++++++++++-----
src/bin/auth/tests/statistics_unittest.cc | 1 +
4 files changed, 22 insertions(+), 9 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/auth/statistics.cc b/src/bin/auth/statistics.cc
index c2868d6..e2df81a 100644
--- a/src/bin/auth/statistics.cc
+++ b/src/bin/auth/statistics.cc
@@ -112,7 +112,9 @@ CountersImpl::inc(const QRAttributes& qrattrs, const Message& response) {
} else if (qrattrs.req_ip_version_ == AF_INET6) {
server_qr_counter_.inc(QR_REQUEST_IPV6);
}
- if (qrattrs.req_transport_protocol_ == IPPROTO_TCP) {
+ if (qrattrs.req_transport_protocol_ == IPPROTO_UDP) {
+ server_qr_counter_.inc(QR_REQUEST_UDP);
+ } else if (qrattrs.req_transport_protocol_ == IPPROTO_TCP) {
server_qr_counter_.inc(QR_REQUEST_TCP);
}
@@ -299,9 +301,7 @@ CountersImpl::submitStatistics() const {
<< " \"pid\":" << getpid()
<< ", \"data\":"
<< "{ \"queries.udp\": "
- << server_qr_counter_.get(QR_REQUEST_IPV4) +
- server_qr_counter_.get(QR_REQUEST_IPV6) -
- server_qr_counter_.get(QR_REQUEST_TCP)
+ << server_qr_counter_.get(QR_REQUEST_UDP)
<< ", \"queries.tcp\": "
<< server_qr_counter_.get(QR_REQUEST_TCP);
// Insert non 0 Opcode counters.
diff --git a/src/bin/auth/statistics_items.h b/src/bin/auth/statistics_items.h
index 624483a..46bce64 100644
--- a/src/bin/auth/statistics_items.h
+++ b/src/bin/auth/statistics_items.h
@@ -131,6 +131,7 @@ enum QRCounterType {
QR_REQUEST_TSIG, ///< Number of requests with TSIG received
QR_REQUEST_SIG0, ///< Number of requests with SIG(0) received; not implemented in BIND 10
QR_REQUEST_BADSIG, ///< Number of requests with invalid TSIG or SIG(0) signature received
+ QR_REQUEST_UDP, ///< Number of UDP requests received
QR_REQUEST_TCP, ///< Number of TCP requests received
QR_REQUEST_DNSSEC_OK, ///< Number of requests with DO bit
// Request Opcodes
@@ -255,6 +256,7 @@ const char *QRCounterItemName[QR_COUNTER_TYPES] = {
"request.tsig",
"request.sig0",
"request.badsig",
+ "request.udp",
"request.tcp",
"request.dnssec_ok",
"opcode.query",
diff --git a/src/bin/auth/tests/auth_srv_unittest.cc b/src/bin/auth/tests/auth_srv_unittest.cc
index 6816e30..e0fbe93 100644
--- a/src/bin/auth/tests/auth_srv_unittest.cc
+++ b/src/bin/auth/tests/auth_srv_unittest.cc
@@ -1091,11 +1091,12 @@ TEST_F(AuthSrvTest,
TEST_F(AuthSrvTest, queryCounterUDPNormal) {
// The counter should be initialized to 0.
ConstElementPtr stats_init = server.dump();
+ EXPECT_EQ(0, stats_init->get("auth.server.qr.request.udp")->intValue());
+ EXPECT_EQ(0, stats_init->get("auth.server.qr.request.tcp")->intValue());
EXPECT_EQ(0, stats_init->get("auth.server.qr.opcode.query")->intValue());
EXPECT_EQ(0, stats_init->get("auth.server.qr.qtype.ns")->intValue());
EXPECT_EQ(0, stats_init->get("auth.server.qr.rcode.refused")->intValue());
EXPECT_EQ(0, stats_init->get("auth.server.qr.response")->intValue());
- EXPECT_EQ(0, stats_init->get("auth.server.qr.request.tcp")->intValue());
// Create UDP message and process.
UnitTestUtil::createRequestMessage(request_message, Opcode::QUERY(),
default_qid, Name("example.com"),
@@ -1104,21 +1105,23 @@ TEST_F(AuthSrvTest, queryCounterUDPNormal) {
server.processMessage(*io_message, *parse_message, *response_obuffer,
&dnsserv);
// After processing the UDP query, these counters should be incremented:
- // opcode.query, qtype.ns, rcode.refused, response
+ // request.tcp, opcode.query, qtype.ns, rcode.refused, response
// and these counters should not be incremented:
// request.tcp
ConstElementPtr stats_after = server.dump();
+ EXPECT_EQ(1, stats_after->get("auth.server.qr.request.udp")->intValue());
+ EXPECT_EQ(0, stats_after->get("auth.server.qr.request.tcp")->intValue());
EXPECT_EQ(1, stats_after->get("auth.server.qr.opcode.query")->intValue());
EXPECT_EQ(1, stats_after->get("auth.server.qr.qtype.ns")->intValue());
EXPECT_EQ(1, stats_after->get("auth.server.qr.rcode.refused")->intValue());
EXPECT_EQ(1, stats_after->get("auth.server.qr.response")->intValue());
- EXPECT_EQ(0, stats_after->get("auth.server.qr.request.tcp")->intValue());
}
// Submit TCP normal query and check query counter
TEST_F(AuthSrvTest, queryCounterTCPNormal) {
// The counter should be initialized to 0.
ConstElementPtr stats_init = server.dump();
+ EXPECT_EQ(0, stats_init->get("auth.server.qr.request.udp")->intValue());
EXPECT_EQ(0, stats_init->get("auth.server.qr.request.tcp")->intValue());
EXPECT_EQ(0, stats_init->get("auth.server.qr.opcode.query")->intValue());
EXPECT_EQ(0, stats_init->get("auth.server.qr.qtype.ns")->intValue());
@@ -1133,7 +1136,10 @@ TEST_F(AuthSrvTest, queryCounterTCPNormal) {
&dnsserv);
// After processing the TCP query, these counters should be incremented:
// request.tcp, opcode.query, qtype.ns, rcode.refused, response
+ // and these counters should not be incremented:
+ // request.udp
ConstElementPtr stats_after = server.dump();
+ EXPECT_EQ(0, stats_after->get("auth.server.qr.request.udp")->intValue());
EXPECT_EQ(1, stats_after->get("auth.server.qr.request.tcp")->intValue());
EXPECT_EQ(1, stats_after->get("auth.server.qr.opcode.query")->intValue());
EXPECT_EQ(1, stats_after->get("auth.server.qr.qtype.ns")->intValue());
@@ -1145,6 +1151,7 @@ TEST_F(AuthSrvTest, queryCounterTCPNormal) {
TEST_F(AuthSrvTest, queryCounterTCPAXFR) {
// The counter should be initialized to 0.
ConstElementPtr stats_init = server.dump();
+ EXPECT_EQ(0, stats_init->get("auth.server.qr.request.udp")->intValue());
EXPECT_EQ(0, stats_init->get("auth.server.qr.request.tcp")->intValue());
EXPECT_EQ(0, stats_init->get("auth.server.qr.opcode.query")->intValue());
EXPECT_EQ(0, stats_init->get("auth.server.qr.qtype.axfr")->intValue());
@@ -1161,8 +1168,9 @@ TEST_F(AuthSrvTest, queryCounterTCPAXFR) {
// incremented:
// request.tcp, opcode.query, qtype.axfr
// and these counters should not be incremented:
- // response
+ // request.udp, response
ConstElementPtr stats_after = server.dump();
+ EXPECT_EQ(0, stats_after->get("auth.server.qr.request.udp")->intValue());
EXPECT_EQ(1, stats_after->get("auth.server.qr.request.tcp")->intValue());
EXPECT_EQ(1, stats_after->get("auth.server.qr.opcode.query")->intValue());
EXPECT_EQ(1, stats_after->get("auth.server.qr.qtype.axfr")->intValue());
@@ -1173,6 +1181,7 @@ TEST_F(AuthSrvTest, queryCounterTCPAXFR) {
TEST_F(AuthSrvTest, queryCounterTCPIXFR) {
// The counter should be initialized to 0.
ConstElementPtr stats_init = server.dump();
+ EXPECT_EQ(0, stats_init->get("auth.server.qr.request.udp")->intValue());
EXPECT_EQ(0, stats_init->get("auth.server.qr.request.tcp")->intValue());
EXPECT_EQ(0, stats_init->get("auth.server.qr.opcode.query")->intValue());
EXPECT_EQ(0, stats_init->get("auth.server.qr.qtype.ixfr")->intValue());
@@ -1189,8 +1198,9 @@ TEST_F(AuthSrvTest, queryCounterTCPIXFR) {
// incremented:
// request.tcp, opcode.query, qtype.ixfr
// and these counters should not be incremented:
- // response
+ // request.udp, response
ConstElementPtr stats_after = server.dump();
+ EXPECT_EQ(0, stats_after->get("auth.server.qr.request.udp")->intValue());
EXPECT_EQ(1, stats_after->get("auth.server.qr.request.tcp")->intValue());
EXPECT_EQ(1, stats_after->get("auth.server.qr.opcode.query")->intValue());
EXPECT_EQ(1, stats_after->get("auth.server.qr.qtype.ixfr")->intValue());
diff --git a/src/bin/auth/tests/statistics_unittest.cc b/src/bin/auth/tests/statistics_unittest.cc
index 807b303..d9f18c1 100644
--- a/src/bin/auth/tests/statistics_unittest.cc
+++ b/src/bin/auth/tests/statistics_unittest.cc
@@ -351,6 +351,7 @@ TEST_F(CountersTest, incrementNormalQuery) {
expect_nonzero.insert("auth.server.qr.opcode.query");
expect_nonzero.insert("auth.server.qr.qtype.aaaa");
expect_nonzero.insert("auth.server.qr.request.v6");
+ expect_nonzero.insert("auth.server.qr.request.udp");
expect_nonzero.insert("auth.server.qr.request.edns0");
expect_nonzero.insert("auth.server.qr.request.dnssec_ok");
expect_nonzero.insert("auth.server.qr.response");
More information about the bind10-changes
mailing list