Merge pull request #35 from netfoundry/revert-34-v0.5.17-release-cand…

…idate Revert "refactored if_list to support dynamic interface by changing to __u32"
netfoundry · May 7, 2024 · d98f2c2 · d98f2c2
2 parents 7bd9b62 + e78f21e
commit d98f2c2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,20 +3,12 @@
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ---
-# [0.5.16] - 2024-05-07
-
-###
-
--- Refactored changed  struct tproxy_port_mapping if_list from __u8 to __u32 to allow for dynamic interfaces
-   i.e. tun with the -P, --per-interface-rules option
-
 # [0.5.16] - 2024-04-26
 
-###
 -- Refactored interface_map() in zfw.c to mitigate a potential memory leak in corner case where a user
    manually enables zfw with ziti-edge-tunnel and non default cidr.
 
-
+###
 # [0.5.15] - 2024-04-12
 
 ###

diff --git a/src/zfw.c b/src/zfw.c
@@ -168,7 +168,7 @@ char *tc_interface;
 char *log_file_name;
 char *object_file;
 char *direction_string;
-const char *argp_program_version = "0.5.17";
+const char *argp_program_version = "0.5.16";
 struct ring_buffer *ring_buffer;
 
 __u8 if_list[MAX_IF_LIST_ENTRIES];
@@ -249,7 +249,7 @@ struct tproxy_port_mapping
     __u16 low_port;
     __u16 high_port;
     __u16 tproxy_port;
-    __u32 if_list[MAX_IF_LIST_ENTRIES];
+    __u8 if_list[MAX_IF_LIST_ENTRIES];
 };
 
 struct tproxy_tuple

diff --git a/src/zfw_tc_ingress.c b/src/zfw_tc_ingress.c
@@ -71,7 +71,7 @@ struct tproxy_port_mapping {
     __u16 low_port;
     __u16 high_port;
     __u16 tproxy_port;
-    __u32 if_list[MAX_IF_LIST_ENTRIES];
+    __u8 if_list[MAX_IF_LIST_ENTRIES];
 };
 
 struct tproxy_tuple {