Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "refactored if_list to support dynamic interface by changing to __u32" #35

Merged
merged 1 commit into from
May 7, 2024
Merged

Revert "refactored if_list to support dynamic interface by changing to __u32" #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 1 addition & 9 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

###
Expand Down
4 changes: 2 additions & 2 deletions src/zfw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/zfw_tc_ingress.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down