Adapt counters to new IPv4 reassembly table size

Also prevent lwcounter from creating counters that are now managed directly by the reassembly app.
snabbco · Aug 16, 2017 · 707c1e7 · 707c1e7
1 parent 366d3b8
commit 707c1e7
Show file tree

Hide file tree

Showing 53 changed files with 60 additions and 53 deletions.
diff --git a/src/apps/lwaftr/lwcounter.lua b/src/apps/lwaftr/lwcounter.lua
@@ -38,10 +38,17 @@ function read_counters (pid)
    return ret
 end
 
+-- Temporary hack until we migrate all of the lwAFTR's apps to use the
+-- SHM frame mechanism.
+local ipv4_reassemble = require('apps.ipv4.reassemble')
 function init_counters ()
    local counters = {}
    for k, id in pairs(counter_names()) do
-      counters[k] = {counter}
+      if ipv4_reassemble.Reassembler.shm[k] then
+         -- Don't create this counter; IPv4 reassemble app handles it.
+      else
+         counters[k] = {counter}
+      end
    end
    return shm.create_frame(counters_dir, counters)
 end
diff --git a/src/program/lwaftr/tests/data/counters/arp-for-next-hop.lua b/src/program/lwaftr/tests/data/counters/arp-for-next-hop.lua
@@ -1,5 +1,5 @@
 return {
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv4-frag-not"] = 1,
 }
diff --git a/src/program/lwaftr/tests/data/counters/empty.lua b/src/program/lwaftr/tests/data/counters/empty.lua
@@ -1,4 +1,4 @@
 return {
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
 }
diff --git a/src/program/lwaftr/tests/data/counters/from-inet-ipv4-in-binding-big-packet-df-set-allow.lua b/src/program/lwaftr/tests/data/counters/from-inet-ipv4-in-binding-big-packet-df-set-allow.lua
@@ -6,7 +6,7 @@ return {
    ["in-ipv4-bytes"] = 1494,
    ["in-ipv4-frag-reassembly-unneeded"] = 1,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-icmpv4-bytes"] = 590,
    ["out-icmpv4-packets"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/from-inet-ipv4-in-binding-big-packet-df-set-drop.lua b/src/program/lwaftr/tests/data/counters/from-inet-ipv4-in-binding-big-packet-df-set-drop.lua
@@ -7,6 +7,6 @@ return {
    ["in-ipv4-bytes"] = 1494,
    ["in-ipv4-frag-reassembly-unneeded"] = 1,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
 }
diff --git a/src/program/lwaftr/tests/data/counters/from-to-b4-ipv6-hairpin-n64.lua b/src/program/lwaftr/tests/data/counters/from-to-b4-ipv6-hairpin-n64.lua
@@ -4,7 +4,7 @@ return {
    ["in-ipv6-bytes"] = 6784,
    ["in-ipv6-frag-reassembly-unneeded"] = 64,
    ["in-ipv6-packets"] = 64,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv6-bytes"] = 6784,
    ["out-ipv6-frag-not"] = 64,

diff --git a/src/program/lwaftr/tests/data/counters/from-to-b4-ipv6-hairpin.lua b/src/program/lwaftr/tests/data/counters/from-to-b4-ipv6-hairpin.lua
@@ -4,7 +4,7 @@ return {
    ["in-ipv6-bytes"] = 106,
    ["in-ipv6-frag-reassembly-unneeded"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv6-bytes"] = 106,
    ["out-ipv6-frag-not"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/from-to-b4-tunneled-icmpv4-ping-hairpin-unbound.lua b/src/program/lwaftr/tests/data/counters/from-to-b4-tunneled-icmpv4-ping-hairpin-unbound.lua
@@ -10,6 +10,6 @@ return {
    ["in-ipv6-bytes"] = 138,
    ["in-ipv6-frag-reassembly-unneeded"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
 }
diff --git a/src/program/lwaftr/tests/data/counters/from-to-b4-tunneled-icmpv4-ping-hairpin.lua b/src/program/lwaftr/tests/data/counters/from-to-b4-tunneled-icmpv4-ping-hairpin.lua
@@ -4,7 +4,7 @@ return {
    ["in-ipv6-bytes"] = 138,
    ["in-ipv6-frag-reassembly-unneeded"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv6-bytes"] = 138,
    ["out-ipv6-frag-not"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/icmpv6-ping-and-reply.lua b/src/program/lwaftr/tests/data/counters/icmpv6-ping-and-reply.lua
@@ -1,6 +1,6 @@
 return {
    ["in-ipv6-frag-reassembly-unneeded"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv6-frag-not"] = 1,
 }
diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv4-infrags-out-1p-ipv6-6-outfrags.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv4-infrags-out-1p-ipv6-6-outfrags.lua
@@ -3,7 +3,7 @@ return {
    ["in-ipv4-frag-needs-reassembly"] = 3,
    ["in-ipv4-frag-reassembled"] = 1,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv6-bytes"] = 1514,
    ["out-ipv6-frag"] = 2,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-0p-drop.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-0p-drop.lua
@@ -1,5 +1,5 @@
 return {
    ["in-ipv4-frag-reassembly-unneeded"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
 }
diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-icmpv4.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-icmpv4.lua
@@ -6,7 +6,7 @@ return {
    ["in-ipv4-bytes"] = 66,
    ["in-ipv4-frag-reassembly-unneeded"] = 1,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-icmpv4-bytes"] = 94,
    ["out-icmpv4-packets"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-1.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-1.lua
@@ -2,7 +2,7 @@ return {
    ["in-ipv4-bytes"] = 66,
    ["in-ipv4-frag-reassembly-unneeded"] = 1,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv6-bytes"] = 106,
    ["out-ipv6-frag-not"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-2.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-2.lua
@@ -3,7 +3,7 @@ return {
    ["in-ipv4-frag-needs-reassembly"] = 3,
    ["in-ipv4-frag-reassembled"] = 1,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv6-bytes"] = 1500,
    ["out-ipv6-frag-not"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-3.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-3.lua
@@ -2,7 +2,7 @@ return {
    ["in-ipv4-bytes"] = 1494,
    ["in-ipv4-frag-reassembly-unneeded"] = 1,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv6-bytes"] = 1534,
    ["out-ipv6-frag"] = 2,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-4.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-4.lua
@@ -2,7 +2,7 @@ return {
    ["in-ipv4-bytes"] = 2734,
    ["in-ipv4-frag-reassembly-unneeded"] = 1,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv6-bytes"] = 2774,
    ["out-ipv6-frag"] = 3,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-6-outfrags.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-6-outfrags.lua
@@ -2,7 +2,7 @@ return {
    ["in-ipv4-bytes"] = 1474,
    ["in-ipv4-frag-reassembly-unneeded"] = 1,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv6-bytes"] = 1514,
    ["out-ipv6-frag"] = 2,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-6.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-6.lua
@@ -2,7 +2,7 @@ return {
    ["in-ipv4-bytes"] = 1474,
    ["in-ipv4-frag-reassembly-unneeded"] = 1,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv6-bytes"] = 1514,
    ["out-ipv6-frag-not"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-7.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-7.lua
@@ -2,7 +2,7 @@ return {
    ["in-ipv4-bytes"] = 98,
    ["in-ipv4-frag-reassembly-unneeded"] = 1,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv6-bytes"] = 138,
    ["out-ipv6-frag-not"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-8.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-8.lua
@@ -2,7 +2,7 @@ return {
    ["in-ipv4-bytes"] = 70,
    ["in-ipv4-frag-reassembly-unneeded"] = 1,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv6-bytes"] = 110,
    ["out-ipv6-frag-not"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-echo.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-echo.lua
@@ -2,7 +2,7 @@ return {
    ["in-ipv4-bytes"] = 66,
    ["in-ipv4-frag-reassembly-unneeded"] = 2,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv4-frag-not"] = 1,
    ["out-ipv6-bytes"] = 106,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-none-1.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-none-1.lua
@@ -7,6 +7,6 @@ return {
    ["in-ipv4-bytes"] = 66,
    ["in-ipv4-frag-reassembly-unneeded"] = 1,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
 }
diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-none-2.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-none-2.lua
@@ -6,6 +6,6 @@ return {
    ["in-ipv4-bytes"] = 98,
    ["in-ipv4-frag-reassembly-unneeded"] = 1,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
 }
diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-none-3.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-none-3.lua
@@ -6,6 +6,6 @@ return {
    ["in-ipv4-bytes"] = 98,
    ["in-ipv4-frag-reassembly-unneeded"] = 1,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
 }
diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-none-4.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-none-4.lua
@@ -8,6 +8,6 @@ return {
    ["in-ipv4-bytes"] = 98,
    ["in-ipv4-frag-reassembly-unneeded"] = 1,
    ["in-ipv4-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
 }
diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-icmpv4-1.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-icmpv4-1.lua
@@ -2,7 +2,7 @@ return {
    ["in-ipv6-bytes"] = 154,
    ["in-ipv6-frag-reassembly-unneeded"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-icmpv4-bytes"] = 94,
    ["out-icmpv4-packets"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-icmpv6-1.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-icmpv6-1.lua
@@ -6,7 +6,7 @@ return {
    ["in-ipv6-bytes"] = 106,
    ["in-ipv6-frag-reassembly-unneeded"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-icmpv6-bytes"] = 154,
    ["out-icmpv6-packets"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-icmpv6-2.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-icmpv6-2.lua
@@ -6,7 +6,7 @@ return {
    ["in-ipv6-bytes"] = 138,
    ["in-ipv6-frag-reassembly-unneeded"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-icmpv6-bytes"] = 186,
    ["out-icmpv6-packets"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-1.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-1.lua
@@ -2,7 +2,7 @@ return {
    ["in-ipv6-bytes"] = 1046,
    ["in-ipv6-frag-reassembly-unneeded"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv4-bytes"] = 1006,
    ["out-ipv4-frag"] = 2,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-2.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-2.lua
@@ -2,7 +2,7 @@ return {
    ["in-ipv6-bytes"] = 1500,
    ["in-ipv6-frag-reassembly-unneeded"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv4-bytes"] = 1460,
    ["out-ipv4-frag"] = 3,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-3.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-3.lua
@@ -3,7 +3,7 @@ return {
    ["in-ipv6-frag-needs-reassembly"] = 2,
    ["in-ipv6-frag-reassembled"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv4-bytes"] = 1494,
    ["out-ipv4-frag-not"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-4-and-echo.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-4-and-echo.lua
@@ -2,7 +2,7 @@ return {
    ["in-ipv6-bytes"] = 106,
    ["in-ipv6-frag-reassembly-unneeded"] = 2,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv4-bytes"] = 66,
    ["out-ipv4-frag-not"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-4.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-4.lua
@@ -2,7 +2,7 @@ return {
    ["in-ipv6-bytes"] = 106,
    ["in-ipv6-frag-reassembly-unneeded"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv4-bytes"] = 66,
    ["out-ipv4-frag-not"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-5-frags.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-5-frags.lua
@@ -3,7 +3,7 @@ return {
    ["in-ipv6-frag-needs-reassembly"] = 2,
    ["in-ipv6-frag-reassembled"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv4-bytes"] = 1474,
    ["out-ipv4-frag-not"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-5.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-5.lua
@@ -3,7 +3,7 @@ return {
    ["in-ipv6-frag-needs-reassembly"] = 2,
    ["in-ipv6-frag-reassembled"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv4-bytes"] = 1474,
    ["out-ipv4-frag"] = 3,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-hoplimhair.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-hoplimhair.lua
@@ -2,7 +2,7 @@ return {
    ["in-ipv6-bytes"] = 154,
    ["in-ipv6-frag-reassembly-unneeded"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-icmpv4-bytes"] = 94,
    ["out-icmpv4-packets"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-none-1.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-none-1.lua
@@ -7,6 +7,6 @@ return {
    ["in-ipv6-bytes"] = 106,
    ["in-ipv6-frag-reassembly-unneeded"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
 }
diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-none-2.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-none-2.lua
@@ -6,6 +6,6 @@ return {
    ["in-ipv6-bytes"] = 154,
    ["in-ipv6-frag-reassembly-unneeded"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
 }
diff --git a/src/program/lwaftr/tests/data/counters/in-ipv4-ipv6-out-icmpv4-ipv6-hairpin-1-drop.lua b/src/program/lwaftr/tests/data/counters/in-ipv4-ipv6-out-icmpv4-ipv6-hairpin-1-drop.lua
@@ -9,6 +9,6 @@ return {
    ["in-ipv6-bytes"] = 106,
    ["in-ipv6-frag-reassembly-unneeded"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
 }
diff --git a/src/program/lwaftr/tests/data/counters/in-ipv4-ipv6-out-icmpv4-ipv6-hairpin-1.lua b/src/program/lwaftr/tests/data/counters/in-ipv4-ipv6-out-icmpv4-ipv6-hairpin-1.lua
@@ -8,7 +8,7 @@ return {
    ["in-ipv6-bytes"] = 106,
    ["in-ipv6-frag-reassembly-unneeded"] = 1,
    ["in-ipv6-packets"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-icmpv4-bytes"] = 94,
    ["out-icmpv4-packets"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/ndp-no-na-next-hop6-mac-not-set-2pkts.lua b/src/program/lwaftr/tests/data/counters/ndp-no-na-next-hop6-mac-not-set-2pkts.lua
@@ -4,7 +4,7 @@ return {
    ["in-ipv6-bytes"] = 212,
    ["in-ipv6-frag-reassembly-unneeded"] = 2,
    ["in-ipv6-packets"] = 2,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv4-bytes"] = 66,
    ["out-ipv4-frag-not"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/ndp-no-na-next-hop6-mac-not-set-3pkts.lua b/src/program/lwaftr/tests/data/counters/ndp-no-na-next-hop6-mac-not-set-3pkts.lua
@@ -4,7 +4,7 @@ return {
    ["in-ipv6-bytes"] = 212,
    ["in-ipv6-frag-reassembly-unneeded"] = 3,
    ["in-ipv6-packets"] = 2,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv4-bytes"] = 66,
    ["out-ipv4-frag-not"] = 1,

diff --git a/src/program/lwaftr/tests/data/counters/ndp-ns-for-next-hop.lua b/src/program/lwaftr/tests/data/counters/ndp-ns-for-next-hop.lua
@@ -1,5 +1,5 @@
 return {
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
    ["out-ipv6-frag-not"] = 1,
 }
diff --git a/src/program/lwaftr/tests/data/counters/ndp-secondary.lua b/src/program/lwaftr/tests/data/counters/ndp-secondary.lua
@@ -1,5 +1,5 @@
 return {
    ["in-ipv6-frag-reassembly-unneeded"] = 1,
-   ["memuse-ipv4-frag-reassembly-buffer"] = 463571780,
+   ["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
    ["memuse-ipv6-frag-reassembly-buffer"] = 464727376,
 }