[#3140] Post #4127 merge fixes

diff --git a/changelog_unreleased/3140-add-statistics-counters-for-dropped-packets b/changelog_unreleased/3140-add-statistics-counters-for-dropped-packets
index 5ca77f795d49347baf2145b325a127a6c958b4d7..0c0605d74a344186320f56232f490a8faec4271d 100644 (file)
--- a/changelog_unreleased/3140-add-statistics-counters-for-dropped-packets
+++ b/changelog_unreleased/3140-add-statistics-counters-for-dropped-packets
@@ -6,4 +6,9 @@
        Added "pkt4-rfc-violation" and "pkt6-rfc-violation"
        statistics which are increased when an incoming packet
        has to be dropped according to protocol specifications.
-       (Gitlab #3140, #4157, #4146)
+
+       Added "pkt4-admin-filtered" and "pkt6-admin-filtered"
+       statistics which are increased when an incoming packet
+       was dropped because the server was configured to do so,
+       e.g. by classifying the query into the DROP class.
+       (Gitlab #3140, #4157, #4146, #4127)

diff --git a/changelog_unreleased/4127-add-drop-stats-admin-filtered b/changelog_unreleased/4127-add-drop-stats-admin-filtered
deleted file mode 100644 (file)
index e416c42..0000000
--- a/changelog_unreleased/4127-add-drop-stats-admin-filtered
+++ /dev/null
@@ -1,6 +0,0 @@
-[func]         fdupont
-       Added "pkt4-admin-filtered" and "pkt6-admin-filtered"
-       statistics which are increased when an incoming packet
-       was dropped because the server was configured to do so,
-       e.g. by classifying the query into the DROP class.
-       (Gitlab #4127)

diff --git a/src/bin/dhcp6/tests/http_control_socket_unittest.cc b/src/bin/dhcp6/tests/http_control_socket_unittest.cc
index ed3dda3d95a0e521672cda2ad85ae58757ac65e0..ae6f0891fa1cff2845f3b522fbba84aefae6a953 100644 (file)
--- a/src/bin/dhcp6/tests/http_control_socket_unittest.cc
+++ b/src/bin/dhcp6/tests/http_control_socket_unittest.cc
@@ -955,6 +955,7 @@ BaseCtrlChannelDhcpv6Test::testControlChannelStats() {
         "pkt6-dhcpv4-response-sent",
         "pkt6-addr-reg-reply-sent",
         "pkt6-service-disabled",
+        "pkt6-parse-failed",
         "pkt6-queue-full",
         "pkt6-rfc-violation",
         "pkt6-admin-filtered",