From 9bc2f5db25c74f7a4c10c10cf0bbdc2f1879c2db Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 10 Jan 2022 23:05:59 +0100
Subject: conntrack: T3579: prepare for "conntrack timeout custom rule" CLI
 commands

---
 data/templates/conntrack/nftables-ct-ignore.tmpl | 40 ------------------
 data/templates/conntrack/nftables-ct.tmpl        | 52 ++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 40 deletions(-)
 delete mode 100644 data/templates/conntrack/nftables-ct-ignore.tmpl
 create mode 100644 data/templates/conntrack/nftables-ct.tmpl

(limited to 'data')

diff --git a/data/templates/conntrack/nftables-ct-ignore.tmpl b/data/templates/conntrack/nftables-ct-ignore.tmpl
deleted file mode 100644
index 4ec133680..000000000
--- a/data/templates/conntrack/nftables-ct-ignore.tmpl
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/sbin/nft -f
-
-# we first flush the chains content and then render the new statements from CLI
-# if applicable
-{% set nft_ct_ignore_name = 'VYOS_CT_IGNORE' %}
-flush chain raw {{ nft_ct_ignore_name }}
-table raw {
-    chain {{ nft_ct_ignore_name }} {
-{% if ignore is defined and ignore.rule is defined and ignore.rule is not none %}
-{%   for rule, rule_config in ignore.rule.items() %}
-        # rule-{{ rule }} {{ '- ' ~ rule_config.description if rule_config.description is defined and rule_config.description is not none }}
-{%     set nft_command = '' %}
-{%     if rule_config.inbound_interface is defined and rule_config.inbound_interface is not none %}
-{%       set nft_command = nft_command ~ ' iifname ' ~ rule_config.inbound_interface %}
-{%     endif %}
-{%     if rule_config.protocol is defined and rule_config.protocol is not none %}
-{%       set nft_command = nft_command ~ ' ip protocol ' ~ rule_config.protocol %}
-{%     endif %}
-{%     if rule_config.destination is defined and rule_config.destination is not none %}
-{%       if rule_config.destination.address is defined and rule_config.destination.address is not none %}
-{%         set nft_command = nft_command ~ ' ip daddr ' ~ rule_config.destination.address %}
-{%       endif %}
-{%       if rule_config.destination.port is defined and rule_config.destination.port is not none %}
-{%         set nft_command = nft_command ~ ' ' ~ rule_config.protocol ~ ' dport { ' ~ rule_config.destination.port ~ ' }' %}
-{%       endif %}
-{%     endif %}
-{%     if rule_config.source is defined and rule_config.source is not none %}
-{%       if rule_config.source.address is defined and rule_config.source.address is not none %}
-{%         set nft_command = nft_command ~ ' ip saddr ' ~ rule_config.source.address %}
-{%       endif %}
-{%       if rule_config.source.port is defined and rule_config.source.port is not none %}
-{%         set nft_command = nft_command ~ ' ' ~ rule_config.protocol ~ ' sport { ' ~ rule_config.source.port ~ ' }' %}
-{%       endif %}
-{%     endif %}
-       {{ nft_command }} counter notrack comment ignore-{{ rule }}
-{%   endfor %}
-{% endif %}
-        return
-    }
-}
diff --git a/data/templates/conntrack/nftables-ct.tmpl b/data/templates/conntrack/nftables-ct.tmpl
new file mode 100644
index 000000000..c0fe5297d
--- /dev/null
+++ b/data/templates/conntrack/nftables-ct.tmpl
@@ -0,0 +1,52 @@
+#!/usr/sbin/nft -f
+
+{% set nft_ct_ignore_name = 'VYOS_CT_IGNORE' %}
+{% set nft_ct_timeout_name = 'VYOS_CT_TIMEOUT' %}
+
+# we first flush all chains and render the content from scratch - this makes
+# any delta check obsolete
+flush chain raw {{ nft_ct_ignore_name }}
+flush chain raw {{ nft_ct_timeout_name }}
+
+table raw {
+    chain {{ nft_ct_ignore_name }} {
+{% if ignore is defined and ignore.rule is defined and ignore.rule is not none %}
+{%   for rule, rule_config in ignore.rule.items() %}
+        # rule-{{ rule }} {{ '- ' ~ rule_config.description if rule_config.description is defined and rule_config.description is not none }}
+{%     set nft_command = '' %}
+{%     if rule_config.inbound_interface is defined and rule_config.inbound_interface is not none %}
+{%       set nft_command = nft_command ~ ' iifname ' ~ rule_config.inbound_interface %}
+{%     endif %}
+{%     if rule_config.protocol is defined and rule_config.protocol is not none %}
+{%       set nft_command = nft_command ~ ' ip protocol ' ~ rule_config.protocol %}
+{%     endif %}
+{%     if rule_config.destination is defined and rule_config.destination is not none %}
+{%       if rule_config.destination.address is defined and rule_config.destination.address is not none %}
+{%         set nft_command = nft_command ~ ' ip daddr ' ~ rule_config.destination.address %}
+{%       endif %}
+{%       if rule_config.destination.port is defined and rule_config.destination.port is not none %}
+{%         set nft_command = nft_command ~ ' ' ~ rule_config.protocol ~ ' dport { ' ~ rule_config.destination.port ~ ' }' %}
+{%       endif %}
+{%     endif %}
+{%     if rule_config.source is defined and rule_config.source is not none %}
+{%       if rule_config.source.address is defined and rule_config.source.address is not none %}
+{%         set nft_command = nft_command ~ ' ip saddr ' ~ rule_config.source.address %}
+{%       endif %}
+{%       if rule_config.source.port is defined and rule_config.source.port is not none %}
+{%         set nft_command = nft_command ~ ' ' ~ rule_config.protocol ~ ' sport { ' ~ rule_config.source.port ~ ' }' %}
+{%       endif %}
+{%     endif %}
+       {{ nft_command }} counter notrack comment ignore-{{ rule }}
+{%   endfor %}
+{% endif %}
+        return
+    }
+    chain {{ nft_ct_timeout_name }} {
+{% if timeout is defined and timeout.custom is defined and timeout.custom.rule is defined and timeout.custom.rule is not none %}
+{%   for rule, rule_config in timeout.custom.rule.items() %}
+        # rule-{{ rule }} {{ '- ' ~ rule_config.description if rule_config.description is defined and rule_config.description is not none }}
+{%   endfor %}
+{% endif %}
+        return
+    }
+}
-- 
cgit v1.2.3