From: Mark Andrews <marka@isc.org>
Date: Wed, 12 Jun 2024 22:13:28 +0000 (+1000)
Subject: Add EDNS ZONEVERSION option counter
X-Git-Tag: v9.21.7~34^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=998b93acca92889bffaffebe7ee56b05f29eabfe;p=thirdparty%2Fbind9.git

Add EDNS ZONEVERSION option counter
---

diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index cc9c29d3fd3..c965ac77eee 100644
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -358,6 +358,8 @@ init_desc(void) {
 	SET_NSSTATDESC(expireopt, "Expire option received", "ExpireOpt");
 	SET_NSSTATDESC(keepaliveopt, "EDNS TCP keepalive option received",
 		       "KeepAliveOpt");
+	SET_NSSTATDESC(zoneversionopt, "ZONEVERSION option received",
+		       "ZoneVersionOpt");
 	SET_NSSTATDESC(padopt, "EDNS padding option received", "PadOpt");
 	SET_NSSTATDESC(otheropt, "Other EDNS option received", "OtherOpt");
 	SET_NSSTATDESC(cookiein, "COOKIE option received", "CookieIn");
diff --git a/lib/ns/include/ns/stats.h b/lib/ns/include/ns/stats.h
index 5dabdb216f0..496e4cd9a54 100644
--- a/lib/ns/include/ns/stats.h
+++ b/lib/ns/include/ns/stats.h
@@ -84,49 +84,50 @@ enum {
 	ns_statscounter_ecsopt = 46,
 	ns_statscounter_padopt = 47,
 	ns_statscounter_keepaliveopt = 48,
+	ns_statscounter_zoneversionopt = 49,
 
-	ns_statscounter_nxdomainredirect = 49,
-	ns_statscounter_nxdomainredirect_rlookup = 50,
+	ns_statscounter_nxdomainredirect = 50,
+	ns_statscounter_nxdomainredirect_rlookup = 51,
 
-	ns_statscounter_cookiein = 51,
-	ns_statscounter_cookiebadsize = 52,
-	ns_statscounter_cookiebadtime = 53,
-	ns_statscounter_cookienomatch = 54,
-	ns_statscounter_cookiematch = 55,
-	ns_statscounter_cookienew = 56,
-	ns_statscounter_badcookie = 57,
+	ns_statscounter_cookiein = 52,
+	ns_statscounter_cookiebadsize = 53,
+	ns_statscounter_cookiebadtime = 54,
+	ns_statscounter_cookienomatch = 55,
+	ns_statscounter_cookiematch = 56,
+	ns_statscounter_cookienew = 57,
+	ns_statscounter_badcookie = 58,
 
-	ns_statscounter_nxdomainsynth = 58,
-	ns_statscounter_nodatasynth = 59,
-	ns_statscounter_wildcardsynth = 60,
+	ns_statscounter_nxdomainsynth = 59,
+	ns_statscounter_nodatasynth = 60,
+	ns_statscounter_wildcardsynth = 61,
 
-	ns_statscounter_trystale = 61,
-	ns_statscounter_usedstale = 62,
+	ns_statscounter_trystale = 62,
+	ns_statscounter_usedstale = 63,
 
-	ns_statscounter_prefetch = 63,
-	ns_statscounter_keytagopt = 64,
+	ns_statscounter_prefetch = 64,
+	ns_statscounter_keytagopt = 65,
 
-	ns_statscounter_tcphighwater = 65,
+	ns_statscounter_tcphighwater = 66,
 
-	ns_statscounter_reclimitdropped = 66,
+	ns_statscounter_reclimitdropped = 67,
 
-	ns_statscounter_updatequota = 67,
+	ns_statscounter_updatequota = 68,
 
-	ns_statscounter_recurshighwater = 68,
+	ns_statscounter_recurshighwater = 69,
 
-	ns_statscounter_dot = 69,
-	ns_statscounter_doh = 70,
-	ns_statscounter_dohplain = 71,
+	ns_statscounter_dot = 70,
+	ns_statscounter_doh = 71,
+	ns_statscounter_dohplain = 72,
 
-	ns_statscounter_proxyudp = 72,
-	ns_statscounter_proxytcp = 73,
-	ns_statscounter_proxydot = 74,
-	ns_statscounter_proxydoh = 75,
-	ns_statscounter_proxydohplain = 76,
-	ns_statscounter_encryptedproxydot = 77,
-	ns_statscounter_encryptedproxydoh = 78,
+	ns_statscounter_proxyudp = 73,
+	ns_statscounter_proxytcp = 74,
+	ns_statscounter_proxydot = 75,
+	ns_statscounter_proxydoh = 76,
+	ns_statscounter_proxydohplain = 77,
+	ns_statscounter_encryptedproxydot = 78,
+	ns_statscounter_encryptedproxydoh = 79,
 
-	ns_statscounter_max = 79,
+	ns_statscounter_max = 80,
 };
 
 void