From: Mark Andrews <marka@isc.org>
Date: Thu, 1 Nov 2012 03:23:14 +0000 (+1100)
Subject: 3413.   [func]          Record the number of DNS64 AAAA RRsets that have been
X-Git-Tag: v9.10.0a1~739
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4786e693a7c4b41ba4554f06a2f6d16c74017f15;p=thirdparty%2Fbind9.git

3413.   [func]          Record the number of DNS64 AAAA RRsets that have been
                        synthesized. [RT #27636]

Squashed commit of the following:

commit b375c287a3d95ed2eb29977d4347d845f393add7
Author: Evan Hunt <each@isc.org>
Date:   Wed Oct 24 21:28:04 2012 -0700

    [rt27636] add dns64 responses stat counter
---

diff --git a/CHANGES b/CHANGES
index 4ef266396b8..dc11fe4abda 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3413.	[func]		Record the number of DNS64 AAAA RRsets that have been
+			synthesized. [RT #27636]
+
 3412.	[bug]		Copy timeval structure from control message data.
 			[RT #31548]
 
diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h
index a0f76550f0b..deab3ba96cb 100644
--- a/bin/named/include/named/server.h
+++ b/bin/named/include/named/server.h
@@ -165,9 +165,11 @@ enum {
 	dns_nsstatscounter_updatefail = 34,
 	dns_nsstatscounter_updatebadprereq = 35,
 
-	dns_nsstatscounter_recursclients =36,
+	dns_nsstatscounter_recursclients = 36,
 
-	dns_nsstatscounter_max = 37
+	dns_nsstatscounter_dns64 = 37,
+
+	dns_nsstatscounter_max = 38
 };
 
 void
diff --git a/bin/named/query.c b/bin/named/query.c
index 6fa0a76fb8e..2c794af9248 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -2286,6 +2286,7 @@ query_dns64(ns_client_t *client, dns_name_t **namep, dns_rdataset_t *rdataset,
 	dns64_rdataset = NULL;
 	dns64_rdatalist = NULL;
 	dns_message_takebuffer(client->message, &buffer);
+	inc_stats(client, dns_nsstatscounter_dns64);
 	result = ISC_R_SUCCESS;
 
  cleanup:
diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index 72acc57aaa0..8cb5ce4f797 100644
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -206,6 +206,7 @@ init_desc(void) {
 		       "UpdateBadPrereq");
 	SET_NSSTATDESC(recursclients, "recursing clients",
 			"RecursClients");
+	SET_NSSTATDESC(dns64, "queries answered by DNS64", "DNS64");
 	INSIST(i == dns_nsstatscounter_max);
 
 	/* Initialize resolver statistics */