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 4ef266396b8eca4148f58a433c302492a7a570e9..dc11fe4abda47ebde33ed6790732107b58c0ffce 100644 (file)
--- 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 a0f76550f0bfafe63a671f44e4ff47db713a955b..deab3ba96cb1e2fec1924385db75134c2b945d42 100644 (file)
--- 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 6fa0a76fb8e0be92d2b14511b25b16df3cb02af9..2c794af924821a997e2fa78508f9574bc746ae73 100644 (file)
--- 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 72acc57aaa02404988f3982d80f5d51f149be410..8cb5ce4f797b8c7e163b84034fb83fa91d3fe7b7 100644 (file)
--- 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 */