summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil.baturin@vyatta.com>2011-11-23 21:23:20 +0700
committerDaniil Baturin <daniil.baturin@vyatta.com>2011-11-23 21:23:20 +0700
commit94e02c7f23d814c16f3854ec756e27ddcd0c4b27 (patch)
tree012d9f5fb631da6f76d2a31ea548728a94eaef08
parentda47f35c8a1f20d2ae1802ef9689d088f06dbcdd (diff)
downloadvyatta-conntrack-94e02c7f23d814c16f3854ec756e27ddcd0c4b27.tar.gz
vyatta-conntrack-94e02c7f23d814c16f3854ec756e27ddcd0c4b27.zip
Get conntrack default values to sync with kernel defaults.
-rw-r--r--templates-cfg/system/conntrack/expect-table-size/node.def5
-rw-r--r--templates-cfg/system/conntrack/node.def2
-rw-r--r--templates-cfg/system/conntrack/table-size/node.def5
3 files changed, 5 insertions, 7 deletions
diff --git a/templates-cfg/system/conntrack/expect-table-size/node.def b/templates-cfg/system/conntrack/expect-table-size/node.def
index f9f1ae5..9ff72c7 100644
--- a/templates-cfg/system/conntrack/expect-table-size/node.def
+++ b/templates-cfg/system/conntrack/expect-table-size/node.def
@@ -7,15 +7,14 @@
# called application level gateways [ALGs]) for more complex protocols such as
# FTP, SIP, H.323.
#
-# default value when no conntrack options set - 2048
-# default value when no conntrack options set - 4096
+# default value: 2048
#
type: u32
help: Size of connection tracking expect table
-default: 4096
+default: 2048
val_help: u32: 1-50000000; Number of entries allowed in connection tracking expect table
diff --git a/templates-cfg/system/conntrack/node.def b/templates-cfg/system/conntrack/node.def
index 53488ae..28f78d1 100644
--- a/templates-cfg/system/conntrack/node.def
+++ b/templates-cfg/system/conntrack/node.def
@@ -3,7 +3,7 @@ help: Connection tracking engine options
priority: 218 # before NAT and conntrack-sync are configured
delete: # set conntrack table size to standard 16384 entries if conntrack settings are removed
- sudo sysctl -q -w net/nf_conntrack_max=16384
+ sudo sysctl -q -w net/nf_conntrack_max=1638
# set conntrack expect table size to standard 2048 entries if conntrack settings are removed
sudo sysctl -q -w net/netfilter/nf_conntrack_expect_max=2048
diff --git a/templates-cfg/system/conntrack/table-size/node.def b/templates-cfg/system/conntrack/table-size/node.def
index f91b101..b44b563 100644
--- a/templates-cfg/system/conntrack/table-size/node.def
+++ b/templates-cfg/system/conntrack/table-size/node.def
@@ -11,15 +11,14 @@
# tracking table consumes kernel memory, so the size selected should
# be no larger than necessary.
#
-# default value when contrack is not set - 16384
-# default value when conntrack is set - 32768
+# default value: 16384
#
type: u32
help: Size of connection tracking table
-default: 32768
+default: 16384
val_help: u32:1-50000000; Number of entries allowed in connection tracking table