Merge branch 'current' into dhcpd

2 files changed, 49 insertions, 1 deletions

diff --git a/data/templates/conntrack/nftables-ct.tmpl b/data/templates/conntrack/nftables-ct.tmpl
new file mode 100644
index 000000000..cebc1a54e
--- /dev/null
+++ b/data/templates/conntrack/nftables-ct.tmpl
@@ -0,0 +1,48 @@
+#!/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.rule is vyos_defined %}
+{%   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 vyos_defined %}
+{%       set nft_command = nft_command ~ ' iifname ' ~ rule_config.inbound_interface %}
+{%     endif %}
+{%     if rule_config.protocol is vyos_defined %}
+{%       set nft_command = nft_command ~ ' ip protocol ' ~ rule_config.protocol %}
+{%     endif %}
+{%     if rule_config.destination.address is vyos_defined %}
+{%       set nft_command = nft_command ~ ' ip daddr ' ~ rule_config.destination.address %}
+{%     endif %}
+{%     if rule_config.destination.port is vyos_defined %}
+{%       set nft_command = nft_command ~ ' ' ~ rule_config.protocol ~ ' dport { ' ~ rule_config.destination.port ~ ' }' %}
+{%     endif %}
+{%     if rule_config.source.address is vyos_defined %}
+{%       set nft_command = nft_command ~ ' ip saddr ' ~ rule_config.source.address %}
+{%     endif %}
+{%     if rule_config.source.port is vyos_defined %}
+{%       set nft_command = nft_command ~ ' ' ~ rule_config.protocol ~ ' sport { ' ~ rule_config.source.port ~ ' }' %}
+{%     endif %}
+       {{ nft_command }} counter notrack comment ignore-{{ rule }}
+{%   endfor %}
+{% endif %}
+        return
+    }
+    chain {{ nft_ct_timeout_name }} {
+{% if timeout.custom.rule is vyos_defined %}
+{%   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
+    }
+}
diff --git a/data/templates/conntrack/sysctl.conf.tmpl b/data/templates/conntrack/sysctl.conf.tmpl
index 9e97c3286..075402c04 100644
--- a/data/templates/conntrack/sysctl.conf.tmpl
+++ b/data/templates/conntrack/sysctl.conf.tmpl
@@ -6,7 +6,7 @@ net.netfilter.nf_conntrack_max = {{ table_size }}
 
 net.ipv4.tcp_max_syn_backlog = {{ tcp.half_open_connections }}
 
-net.netfilter.nf_conntrack_tcp_loose = {{ '1' if tcp.loose == 'enable' else '0' }}
+net.netfilter.nf_conntrack_tcp_loose = {{ '1' if tcp.loose is vyos_defined('enable') else '0' }}
 net.netfilter.nf_conntrack_tcp_max_retrans = {{ tcp.max_retrans }}
 
 net.netfilter.nf_conntrack_icmp_timeout = {{ timeout.icmp }}