Skip to content

Commit

Permalink
ctable: fix power-of-2 issue
Browse files Browse the repository at this point in the history 
LuaJIT dislikes pointer subtractions when the size of the pointed-to
objects is not a power of two, which leads to trace aborts. ctable
suffers from this problem. The patch pads the cdata type used as entry
for the table to the next power of two.

We also disable tail-call optimization for functions that end with a
call to a built-in, which also causes trace aborts in certain cases.
  • Loading branch information
@alexandergall
alexandergall committed Jun 21, 2018
1 parent b9da7ca commit 8a1ebb0
Show file tree
Hide file tree
Showing 54 changed files with 113 additions and 109 deletions.
10 changes: 7 additions & 3 deletions src/lib/ctable.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,28 @@ local function make_entry_type(key_type, value_type)
else
entry_types[key_type] = {}
end
local raw_size = ffi.sizeof(key_type) + ffi.sizeof(value_type) + 4
local padding = 2^ceil(math.log(raw_size)/math.log(2)) - raw_size
local ret = ffi.typeof([[struct {
uint32_t hash;
$ key;
$ value;
uint8_t padding[$];
} __attribute__((packed))]],
key_type,
value_type)
value_type,
padding)
entry_types[key_type][value_type] = ret
return ret
end

local function make_entries_type(entry_type)
return ffi.typeof('$[?]', entry_type)
return (ffi.typeof('$[?]', entry_type))
end

-- hash := [0,HASH_MAX); scale := size/HASH_MAX
local function hash_to_index(hash, scale)
return floor(hash*scale)
return (floor(hash*scale))
end

local function make_equal_fn(key_type)
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/arp-for-next-hop.lua
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
return {
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv4-frag-not"] = 1,
}
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/empty.lua
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
return {
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
}
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/from-inet-ipv4-in-binding-big-packet-df-set-allow.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ return {
["in-ipv4-bytes"] = 1494,
["in-ipv4-frag-reassembly-unneeded"] = 1,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-icmpv4-bytes"] = 590,
["out-icmpv4-packets"] = 1,
["out-ipv4-bytes"] = 590,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/from-inet-ipv4-in-binding-big-packet-df-set-drop.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ return {
["in-ipv4-bytes"] = 1494,
["in-ipv4-frag-reassembly-unneeded"] = 1,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
}
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/from-to-b4-ipv6-hairpin-n64.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ return {
["in-ipv6-bytes"] = 6784,
["in-ipv6-frag-reassembly-unneeded"] = 64,
["in-ipv6-packets"] = 64,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv6-bytes"] = 6784,
["out-ipv6-frag-not"] = 64,
["out-ipv6-packets"] = 64,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/from-to-b4-ipv6-hairpin.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ return {
["in-ipv6-bytes"] = 106,
["in-ipv6-frag-reassembly-unneeded"] = 1,
["in-ipv6-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv6-bytes"] = 106,
["out-ipv6-frag-not"] = 1,
["out-ipv6-packets"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/from-to-b4-tunneled-icmpv4-ping-hairpin-unbound.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ return {
["in-ipv6-bytes"] = 138,
["in-ipv6-frag-reassembly-unneeded"] = 1,
["in-ipv6-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
}
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/from-to-b4-tunneled-icmpv4-ping-hairpin.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ return {
["in-ipv6-bytes"] = 138,
["in-ipv6-frag-reassembly-unneeded"] = 1,
["in-ipv6-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv6-bytes"] = 138,
["out-ipv6-frag-not"] = 1,
["out-ipv6-packets"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/icmpv6-ping-and-reply.lua
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
return {
["in-ipv6-frag-reassembly-unneeded"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv6-frag-not"] = 1,
}
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv4-infrags-out-1p-ipv6-6-outfrags.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ return {
["in-ipv4-frag-needs-reassembly"] = 3,
["in-ipv4-frag-reassembled"] = 1,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv6-bytes"] = 1514,
["out-ipv6-frag"] = 2,
["out-ipv6-packets"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-0p-drop.lua
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
return {
["in-ipv4-frag-reassembly-unneeded"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
}
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-icmpv4.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ return {
["in-ipv4-bytes"] = 66,
["in-ipv4-frag-reassembly-unneeded"] = 1,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-icmpv4-bytes"] = 94,
["out-icmpv4-packets"] = 1,
["out-ipv4-bytes"] = 94,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-1.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ return {
["in-ipv4-bytes"] = 66,
["in-ipv4-frag-reassembly-unneeded"] = 1,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv6-bytes"] = 106,
["out-ipv6-frag-not"] = 1,
["out-ipv6-packets"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-2.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ return {
["in-ipv4-frag-needs-reassembly"] = 3,
["in-ipv4-frag-reassembled"] = 1,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv6-bytes"] = 1500,
["out-ipv6-frag-not"] = 1,
["out-ipv6-packets"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-3.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ return {
["in-ipv4-bytes"] = 1494,
["in-ipv4-frag-reassembly-unneeded"] = 1,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv6-bytes"] = 1534,
["out-ipv6-frag"] = 2,
["out-ipv6-packets"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-4.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ return {
["in-ipv4-bytes"] = 2734,
["in-ipv4-frag-reassembly-unneeded"] = 1,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv6-bytes"] = 2774,
["out-ipv6-frag"] = 3,
["out-ipv6-packets"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-6-outfrags.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ return {
["in-ipv4-bytes"] = 1474,
["in-ipv4-frag-reassembly-unneeded"] = 1,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv6-bytes"] = 1514,
["out-ipv6-frag"] = 2,
["out-ipv6-packets"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-6.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ return {
["in-ipv4-bytes"] = 1474,
["in-ipv4-frag-reassembly-unneeded"] = 1,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv6-bytes"] = 1514,
["out-ipv6-frag-not"] = 1,
["out-ipv6-packets"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-7.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ return {
["in-ipv4-bytes"] = 98,
["in-ipv4-frag-reassembly-unneeded"] = 1,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv6-bytes"] = 138,
["out-ipv6-frag-not"] = 1,
["out-ipv6-packets"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-8.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ return {
["in-ipv4-bytes"] = 70,
["in-ipv4-frag-reassembly-unneeded"] = 1,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv6-bytes"] = 110,
["out-ipv6-frag-not"] = 1,
["out-ipv6-packets"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-1p-ipv6-echo.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ return {
["in-ipv4-bytes"] = 66,
["in-ipv4-frag-reassembly-unneeded"] = 2,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv4-frag-not"] = 1,
["out-ipv6-bytes"] = 106,
["out-ipv6-frag-not"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-none-1.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ return {
["in-ipv4-bytes"] = 66,
["in-ipv4-frag-reassembly-unneeded"] = 1,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
}
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-none-2.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ return {
["in-ipv4-bytes"] = 98,
["in-ipv4-frag-reassembly-unneeded"] = 1,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
}
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-none-3.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ return {
["in-ipv4-bytes"] = 98,
["in-ipv4-frag-reassembly-unneeded"] = 1,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
}
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv4-out-none-4.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ return {
["in-ipv4-bytes"] = 98,
["in-ipv4-frag-reassembly-unneeded"] = 1,
["in-ipv4-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
}
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-0p-ipv4.lua
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
return {
["drop-ipv6-frag-invalid-reassembly"] = 1,
["in-ipv6-frag-needs-reassembly"] = 2,
["memuse-ipv4-frag-reassembly-buffer"] = 456549312,
["memuse-ipv6-frag-reassembly-buffer"] = 247104,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 393216,
}
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-icmpv4-1.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ return {
["in-ipv6-bytes"] = 154,
["in-ipv6-frag-reassembly-unneeded"] = 1,
["in-ipv6-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-icmpv4-bytes"] = 94,
["out-icmpv4-packets"] = 1,
["out-ipv4-bytes"] = 94,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-icmpv6-1.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ return {
["in-ipv6-bytes"] = 106,
["in-ipv6-frag-reassembly-unneeded"] = 1,
["in-ipv6-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-icmpv6-bytes"] = 154,
["out-icmpv6-packets"] = 1,
["out-ipv6-bytes"] = 154,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-icmpv6-2.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ return {
["in-ipv6-bytes"] = 138,
["in-ipv6-frag-reassembly-unneeded"] = 1,
["in-ipv6-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-icmpv6-bytes"] = 186,
["out-icmpv6-packets"] = 1,
["out-ipv6-bytes"] = 186,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-1.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ return {
["in-ipv6-bytes"] = 1046,
["in-ipv6-frag-reassembly-unneeded"] = 1,
["in-ipv6-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv4-bytes"] = 1006,
["out-ipv4-frag"] = 2,
["out-ipv4-packets"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-2.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ return {
["in-ipv6-bytes"] = 1500,
["in-ipv6-frag-reassembly-unneeded"] = 1,
["in-ipv6-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv4-bytes"] = 1460,
["out-ipv4-frag"] = 3,
["out-ipv4-packets"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-3.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ return {
["in-ipv6-frag-needs-reassembly"] = 2,
["in-ipv6-frag-reassembled"] = 1,
["in-ipv6-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv4-bytes"] = 1494,
["out-ipv4-frag-not"] = 1,
["out-ipv4-packets"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-4-and-echo.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ return {
["in-ipv6-bytes"] = 106,
["in-ipv6-frag-reassembly-unneeded"] = 2,
["in-ipv6-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv4-bytes"] = 66,
["out-ipv4-frag-not"] = 1,
["out-ipv4-packets"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-4.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ return {
["in-ipv6-bytes"] = 106,
["in-ipv6-frag-reassembly-unneeded"] = 1,
["in-ipv6-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv4-bytes"] = 66,
["out-ipv4-frag-not"] = 1,
["out-ipv4-packets"] = 1,
Expand Down
4 changes: 2 additions & 2 deletions src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-ipv4-5-frags.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ return {
["in-ipv6-frag-needs-reassembly"] = 2,
["in-ipv6-frag-reassembled"] = 1,
["in-ipv6-packets"] = 1,
["memuse-ipv4-frag-reassembly-buffer"] = 463482888,
["memuse-ipv6-frag-reassembly-buffer"] = 464549592,
["memuse-ipv4-frag-reassembly-buffer"] = 728203264,
["memuse-ipv6-frag-reassembly-buffer"] = 728203264,
["out-ipv4-bytes"] = 1474,
["out-ipv4-frag-not"] = 1,
["out-ipv4-packets"] = 1,
Expand Down
Loading

0 comments on commit 8a1ebb0

Please sign in to comment.