firewall: T5729: T5681: T5217: backport subsystem from current branch

This is a combined backport for all accumulated changes done to the firewall
subsystem on the current branch.

1 files changed, 50 insertions, 38 deletions

diff --git a/data/config-mode-dependencies/vyos-1x.json b/data/config-mode-dependencies/vyos-1x.json
index 81d86cf7e..4fd94d895 100644
--- a/data/config-mode-dependencies/vyos-1x.json
+++ b/data/config-mode-dependencies/vyos-1x.json
@@ -1,40 +1,52 @@
 {
-  "firewall": {
-    "conntrack": ["system_conntrack"],
-    "group_resync": ["system_conntrack", "nat", "policy_route"]
-  },
-  "interfaces_bonding": {
-    "ethernet": ["interfaces_ethernet"]
-  },
-  "interfaces_bridge": {
-    "vxlan": ["interfaces_vxlan"]
-  },
-  "pki": {
-    "ethernet": ["interfaces_ethernet"],
-    "openvpn": ["interfaces_openvpn"],
-    "https": ["service_https"],
-    "ipsec": ["vpn_ipsec"],
-    "openconnect": ["vpn_openconnect"],
-    "sstp": ["vpn_sstp"]
-  },
-  "qos": {
-    "bonding": ["interfaces_bonding"],
-    "bridge": ["interfaces_bridge"],
-    "dummy": ["interfaces_dummy"],
-    "ethernet": ["interfaces_ethernet"],
-    "geneve": ["interfaces_geneve"],
-    "input": ["interfaces_input"],
-    "l2tpv3": ["interfaces_l2tpv3"],
-    "loopback": ["interfaces_loopback"],
-    "macsec": ["interfaces_macsec"],
-    "openvpn": ["interfaces_openvpn"],
-    "pppoe": ["interfaces_pppoe"],
-    "pseudo-ethernet": ["interfaces_pseudo-ethernet"],
-    "tunnel": ["interfaces_tunnel"],
-    "vti": ["interfaces_vti"],
-    "vxlan": ["interfaces_vxlan"],
-    "wireguard": ["interfaces_wireguard"],
-    "wireless": ["interfaces_wireless"],
-    "wwan": ["interfaces_wwan"]
-  }
+    "system_conntrack": {
+        "conntrack_sync": ["service_conntrack-sync"]
+    },
+    "firewall": {
+        "conntrack": ["system_conntrack"],
+        "group_resync": ["system_conntrack", "nat", "policy_route"]
+    },
+    "interfaces_bonding": {
+        "ethernet": ["interfaces_ethernet"]
+    },
+    "interfaces_bridge": {
+        "vxlan": ["interfaces_vxlan"]
+    },
+    "load_balancing_wan": {
+        "conntrack": ["system_conntrack"]
+    },
+    "nat": {
+        "conntrack": ["system_conntrack"]
+    },
+    "nat66": {
+        "conntrack": ["system_conntrack"]
+    },
+    "pki": {
+        "ethernet": ["interfaces_ethernet"],
+        "openvpn": ["interfaces_openvpn"],
+        "https": ["service_https"],
+        "ipsec": ["vpn_ipsec"],
+        "openconnect": ["vpn_openconnect"],
+        "sstp": ["vpn_sstp"]
+    },
+    "qos": {
+        "bonding": ["interfaces_bonding"],
+        "bridge": ["interfaces_bridge"],
+        "dummy": ["interfaces_dummy"],
+        "ethernet": ["interfaces_ethernet"],
+        "geneve": ["interfaces_geneve"],
+        "input": ["interfaces_input"],
+        "l2tpv3": ["interfaces_l2tpv3"],
+        "loopback": ["interfaces_loopback"],
+        "macsec": ["interfaces_macsec"],
+        "openvpn": ["interfaces_openvpn"],
+        "pppoe": ["interfaces_pppoe"],
+        "pseudo-ethernet": ["interfaces_pseudo-ethernet"],
+        "tunnel": ["interfaces_tunnel"],
+        "vti": ["interfaces_vti"],
+        "vxlan": ["interfaces_vxlan"],
+        "wireguard": ["interfaces_wireguard"],
+        "wireless": ["interfaces_wireless"],
+        "wwan": ["interfaces_wwan"]
+    }
 }