Browse Source

[2157] only count for requests with EDNS version 0

Yoshitaka Aharen 12 years ago
parent
commit
24cecc6e62
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/bin/auth/auth_srv.cc
  2. 1 1
      src/bin/auth/statistics_qr_items.def

+ 1 - 1
src/bin/auth/auth_srv.cc

@@ -570,7 +570,7 @@ AuthSrv::processMessage(const IOMessage& io_message, Message& message,
         // note: This can only be reliable after TSIG check succeeds.
         // note: This can only be reliable after TSIG check succeeds.
         ConstEDNSPtr edns = message.getEDNS();
         ConstEDNSPtr edns = message.getEDNS();
         if (edns) {
         if (edns) {
-            impl_->stats_attrs_.setQueryEDNS(true,
+            impl_->stats_attrs_.setQueryEDNS(edns->getVersion() == 0,
                                              edns->getVersion() != 0);
                                              edns->getVersion() != 0);
             impl_->stats_attrs_.setQueryDO(edns->getDNSSECAwareness());
             impl_->stats_attrs_.setQueryDO(edns->getDNSSECAwareness());
         }
         }

+ 1 - 1
src/bin/auth/statistics_qr_items.def

@@ -1,7 +1,7 @@
 request	QRCounterRequest	Request statistics	=
 request	QRCounterRequest	Request statistics	=
 	v4		QR_REQUEST_IPV4		Number of IPv4 requests received by the b10-auth server.
 	v4		QR_REQUEST_IPV4		Number of IPv4 requests received by the b10-auth server.
 	v6		QR_REQUEST_IPV6		Number of IPv6 requests received by the b10-auth server.
 	v6		QR_REQUEST_IPV6		Number of IPv6 requests received by the b10-auth server.
-	edns0		QR_REQUEST_EDNS0	Number of requests with EDNS(0) received by the b10-auth server.
+	edns0		QR_REQUEST_EDNS0	Number of requests with EDNS0 received by the b10-auth server.
 	badednsver	QR_REQUEST_BADEDNSVER	Number of requests with unsupported EDNS version received by the b10-auth server.
 	badednsver	QR_REQUEST_BADEDNSVER	Number of requests with unsupported EDNS version received by the b10-auth server.
 	tsig		QR_REQUEST_TSIG		Number of requests with TSIG received by the b10-auth server.
 	tsig		QR_REQUEST_TSIG		Number of requests with TSIG received by the b10-auth server.
 	sig0		QR_REQUEST_SIG0		Number of requests with SIG(0) received by the b10-auth server; currently not implemented in BIND 10.
 	sig0		QR_REQUEST_SIG0		Number of requests with SIG(0) received by the b10-auth server; currently not implemented in BIND 10.