Merge pull request #47 from netfoundry/v0.7.4-release-candidate

Fixed duplicate tc entry issue when running in tunnel mode

CHANGELOG.md

@@ -3,6 +3,14 @@
 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.7.4] - 2024-06-03
+
+###
+
+- Fixed issue where ziti-fw-init.service and ziti-wrapper.service run in parallel the insert duplicate tc entries on
+  some ebpf enable interfaces. This was remedied by placing an ExecStartPre statement requiring ziti-fw-init.service is not running
+  before start of ziti-wrapper.service.
+
 # [0.7.3] - 2024-05-30
 
 ###

files/services/ziti-wrapper.service

@@ -8,6 +8,7 @@ User=root
 MemoryAccounting=yes
 MemoryHigh=80%
 EnvironmentFile=/opt/openziti/etc/ziti-edge-tunnel.env
+ExecStartPre=/bin/bash -c '! /usr/bin/systemctl is-active --quiet ziti-fw-init.service'
 ExecStartPre=/opt/openziti/bin/start_ebpf_tunnel.py
 ExecStart=/opt/openziti/bin/zfw_tunnwrapper
 ExecStartPost=-/opt/openziti/bin/set_xdp_redirect.py

src/zfw.c

@@ -182,7 +182,7 @@ char *log_file_name;
 char *object_file;
 char *direction_string;
 
-const char *argp_program_version = "0.7.3";
+const char *argp_program_version = "0.7.4";
 struct ring_buffer *ring_buffer;
 
 __u32 if_list[MAX_IF_LIST_ENTRIES];