Rename reassembler config params

snabbco · Aug 16, 2017 · 4fe94b7 · 4fe94b7
1 parent 232fe4c
commit 4fe94b7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/apps/ipv4/reassemble.lua b/src/apps/ipv4/reassemble.lua
@@ -124,9 +124,9 @@ Reassembler.shm = {
 local reassembler_config_params = {
    -- Maximum number of in-progress reassemblies.  Each one uses about
    -- 11 kB of memory.
-   max_ipv4_reassembly_packets = { default=20000 },
+   max_concurrent_reassemblies = { default=20000 },
    -- Maximum number of fragments to reassemble.
-   max_fragments_per_reassembly_packet = { default=40 },
+   max_fragments_per_reassembly = { default=40 },
 }
 
 function Reassembler:new(conf)
@@ -150,9 +150,9 @@ function Reassembler:new(conf)
             uint32_t running_length; // bytes copied so far
             struct packet packet;
          } __attribute((packed))]],
-         o.max_fragments_per_reassembly_packet,
-         o.max_fragments_per_reassembly_packet),
-      initial_size = math.ceil(o.max_ipv4_reassembly_packets / max_occupy),
+         o.max_fragments_per_reassembly,
+         o.max_fragments_per_reassembly),
+      initial_size = math.ceil(o.max_concurrent_reassemblies / max_occupy),
       max_occupancy_rate = max_occupy,
    }
    o.ctab = ctablew.new(params)
@@ -221,7 +221,7 @@ function Reassembler:handle_fragment(h, fragment)
    local reassembly = entry.value
 
    local fcount = reassembly.fragment_count
-   if fcount + 1 > self.max_fragments_per_reassembly_packet then
+   if fcount + 1 > self.max_fragments_per_reassembly then
       -- Too many fragments to reassembly this packet; fail.
       return self:reassembly_error(entry)
    end
@@ -366,8 +366,8 @@ function selftest()
          local fragments = fragment(pkt, mtu)
          for _, order in ipairs(permute_indices(1, #fragments)) do
             local reassembler = Reassembler:new {
-               max_ipv4_reassembly_packets = 100,
-               max_fragments_per_reassembly_packet = 20
+               max_concurrent_reassemblies = 100,
+               max_fragments_per_reassembly = 20
             }
             reassembler.shm = shm.create_frame(
                "apps/reassembler", reassembler.shm)

diff --git a/src/program/lwaftr/setup.lua b/src/program/lwaftr/setup.lua
@@ -101,9 +101,9 @@ function lwaftr_app(c, conf, device)
    local iinternal_interface = queue.internal_interface
 
    config.app(c, "reassemblerv4", ipv4_reassemble.Reassembler,
-              { max_ipv4_reassembly_packets =
+              { max_concurrent_reassemblies =
                    gexternal_interface.reassembly.max_packets,
-                max_fragments_per_reassembly_packet =
+                max_fragments_per_reassembly =
                    gexternal_interface.reassembly.max_fragments_per_packet })
    config.app(c, "reassemblerv6", ipv6_apps.ReassembleV6,
               { max_ipv6_reassembly_packets =

diff --git a/src/program/snabbvmx/lwaftr/setup.lua b/src/program/snabbvmx/lwaftr/setup.lua
@@ -226,9 +226,9 @@ function lwaftr_app(c, conf, lwconf, sock_path)
       if conf.ipv4_interface.fragmentation then
          local mtu = conf.ipv4_interface.mtu or gexternal_interface.mtu
          config.app(c, "reassemblerv4", ipv4_reassemble.Reassembler, {
-            max_ipv4_reassembly_packets =
+            max_concurrent_reassemblies =
                gexternal_interface.reassembly.max_packets,
-            max_fragments_per_reassembly_packet =
+            max_fragments_per_reassembly =
                gexternal_interface.reassembly.max_fragments_per_packet
          })
          config.app(c, "fragmenterv4", ipv4_apps.Fragmenter, {
@@ -381,9 +381,9 @@ local function lwaftr_app_check (c, conf, lwconf, sources, sinks)
       if conf.ipv4_interface.fragmentation then
          local mtu = conf.ipv4_interface.mtu or external_interface.mtu
          config.app(c, "reassemblerv4", ipv4_reassemble.Reassembler, {
-            max_ipv4_reassembly_packets =
+            max_concurrent_reassemblies =
                external_interface.reassembly.max_packets,
-            max_fragments_per_reassembly_packet =
+            max_fragments_per_reassembly =
                external_interface.reassembly.max_fragments_per_packet
          })
          config.app(c, "fragmenterv4", ipv4_apps.Fragmenter, {