diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-05-27 08:31:59 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-05-27 08:31:59 +0200 |
| commit | ed55e23822c847225b304c06836713617cf61fd5 (patch) | |
| tree | 7beab191b2f4cdd4ccc9dd24fb6343432318a4a9 /data | |
| parent | 654c8cad2daaf84a07e4664d2c0469a863a46bdc (diff) | |
| parent | c2ae261706efcade8ce94e1958a810ac11abe20c (diff) | |
| download | vyos-1x-ed55e23822c847225b304c06836713617cf61fd5.tar.gz vyos-1x-ed55e23822c847225b304c06836713617cf61fd5.zip | |
Merge branch 't3579-conntrack' into current
* t3579-conntrack:
conntrack: T3535: add conntrack-sync supported vyos-configd services
conntrack: T3579: initial implementation with XML and Python
Diffstat (limited to 'data')
| -rw-r--r-- | data/configd-include.json | 2 | ||||
| -rw-r--r-- | data/templates/conntrack/sysctl.conf.tmpl | 26 | ||||
| -rw-r--r-- | data/templates/conntrack/vyos_nf_conntrack.conf.tmpl | 3 |
3 files changed, 31 insertions, 0 deletions
diff --git a/data/configd-include.json b/data/configd-include.json index f241d0cb6..c3d59592a 100644 --- a/data/configd-include.json +++ b/data/configd-include.json @@ -1,5 +1,7 @@ [ "bcast_relay.py", +"conntrack.py", +"conntrack_sync.py", "dhcp_relay.py", "dhcpv6_relay.py", "dns_forwarding.py", diff --git a/data/templates/conntrack/sysctl.conf.tmpl b/data/templates/conntrack/sysctl.conf.tmpl new file mode 100644 index 000000000..9e97c3286 --- /dev/null +++ b/data/templates/conntrack/sysctl.conf.tmpl @@ -0,0 +1,26 @@ +# Autogenerated by conntrack.py +{# all values have defaults - thus no checking required #} + +net.netfilter.nf_conntrack_expect_max = {{ expect_table_size }} +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_max_retrans = {{ tcp.max_retrans }} + +net.netfilter.nf_conntrack_icmp_timeout = {{ timeout.icmp }} +net.netfilter.nf_conntrack_generic_timeout = {{ timeout.other }} + +net.netfilter.nf_conntrack_tcp_timeout_close_wait = {{ timeout.tcp.close_wait }} +net.netfilter.nf_conntrack_tcp_timeout_close = {{ timeout.tcp.close }} +net.netfilter.nf_conntrack_tcp_timeout_established = {{ timeout.tcp.established }} +net.netfilter.nf_conntrack_tcp_timeout_fin_wait = {{ timeout.tcp.fin_wait }} +net.netfilter.nf_conntrack_tcp_timeout_last_ack = {{ timeout.tcp.last_ack }} +net.netfilter.nf_conntrack_tcp_timeout_syn_recv = {{ timeout.tcp.syn_recv }} +net.netfilter.nf_conntrack_tcp_timeout_syn_sent = {{ timeout.tcp.syn_sent }} +net.netfilter.nf_conntrack_tcp_timeout_time_wait = {{ timeout.tcp.time_wait }} + +net.netfilter.nf_conntrack_udp_timeout = {{ timeout.udp.other }} +net.netfilter.nf_conntrack_udp_timeout_stream = {{ timeout.udp.stream }} + diff --git a/data/templates/conntrack/vyos_nf_conntrack.conf.tmpl b/data/templates/conntrack/vyos_nf_conntrack.conf.tmpl new file mode 100644 index 000000000..111459485 --- /dev/null +++ b/data/templates/conntrack/vyos_nf_conntrack.conf.tmpl @@ -0,0 +1,3 @@ +# Autogenerated by conntrack.py +options nf_conntrack hashsize={{ hash_size }} nf_conntrack_helper=1 + |