From 10801b6ea58c408956918d34aa8558109d96531a Mon Sep 17 00:00:00 2001 From: r-caamano Date: Tue, 4 Jun 2024 00:18:07 +0000 Subject: [PATCH] Fixed duplicate tc entry issue when running in tunnel mode --- CHANGELOG.md | 8 ++++++++ files/services/ziti-wrapper.service | 1 + src/zfw.c | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 182970d..4d20823 100644 --- a/CHANGELOG.md +++ b/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 ### diff --git a/files/services/ziti-wrapper.service b/files/services/ziti-wrapper.service index b2c3aff..e597cd9 100644 --- a/files/services/ziti-wrapper.service +++ b/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 diff --git a/src/zfw.c b/src/zfw.c index 7f732eb..f5208ae 100644 --- a/src/zfw.c +++ b/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];