From 5acf5acedbf7e0c581653ddf2e7693f148017943 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Sat, 23 Sep 2023 14:04:48 +0200
Subject: conntrack: T5376: Use vyos.configdep to call conntrack-sync

---
 data/config-mode-dependencies/vyos-1x.json |  1 +
 src/conf_mode/conntrack.py                 | 13 +++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/data/config-mode-dependencies/vyos-1x.json b/data/config-mode-dependencies/vyos-1x.json
index a433c2522..72a3d1153 100644
--- a/data/config-mode-dependencies/vyos-1x.json
+++ b/data/config-mode-dependencies/vyos-1x.json
@@ -1,4 +1,5 @@
 {
+  "conntrack": {"conntrack_sync": ["conntrack_sync"]},
   "firewall": {"conntrack": ["conntrack"], "group_resync": ["conntrack", "nat", "policy-route"]},
   "http_api": {"https": ["https"]},
   "load_balancing_wan": {"conntrack": ["conntrack"]},
diff --git a/src/conf_mode/conntrack.py b/src/conf_mode/conntrack.py
index 75fd26588..2c5fa335e 100755
--- a/src/conf_mode/conntrack.py
+++ b/src/conf_mode/conntrack.py
@@ -20,6 +20,7 @@ import re
 from sys import exit
 
 from vyos.config import Config
+from vyos.configdep import set_dependents, call_dependents
 from vyos.utils.process import process_named_running
 from vyos.utils.dict import dict_search
 from vyos.utils.dict import dict_search_args
@@ -78,11 +79,6 @@ valid_groups = [
     'port_group'
 ]
 
-def resync_conntrackd():
-    tmp = run('/usr/libexec/vyos/conf_mode/conntrack_sync.py')
-    if tmp > 0:
-        print('ERROR: error restarting conntrackd!')
-
 def get_config(config=None):
     if config:
         conf = config
@@ -105,6 +101,9 @@ def get_config(config=None):
 
     conntrack['module_map'] = module_map
 
+    if conf.exists(['service', 'conntrack-sync']):
+        set_dependents('conntrack_sync', conf)
+
     return conntrack
 
 def verify(conntrack):
@@ -213,9 +212,7 @@ def apply(conntrack):
         module_str = ' '.join(rm_modules)
         cmd(f'rmmod {module_str}')
 
-    if process_named_running('conntrackd'):
-        # Reload conntrack-sync daemon to fetch new sysctl values
-        resync_conntrackd()
+    call_dependents()
 
     # We silently ignore all errors
     # See: https://bugzilla.redhat.com/show_bug.cgi?id=1264080
-- 
cgit v1.2.3