diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2009-11-16 20:31:18 -0500 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2009-11-16 20:31:18 -0500 |
commit | 174fa1abe48d6fefbb8c2a0d5d4a611898ae0e72 (patch) | |
tree | bba4d270b77ab789dfef3afe5bf8a3b611333f3f /etc | |
parent | 664efd436725e8c48d66ccf5fe31bb151877b828 (diff) | |
parent | 26dd6a541d0e6d3fac351e5dd8fcc18894a1095a (diff) | |
download | pfsense-174fa1abe48d6fefbb8c2a0d5d4a611898ae0e72.zip pfsense-174fa1abe48d6fefbb8c2a0d5d4a611898ae0e72.tar.gz |
Merge branch 'master' of git://rcs.pfsense.org/pfsense/pierrepomes-max-src-conn into review/master
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/filter.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 3d9936f..3586e4f 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -1464,7 +1464,7 @@ function filter_generate_user_rule($rule) if ($type == "pass") { if (isset($rule['allowopts'])) $aline['allowopts'] = " allow-opts "; - if( isset($rule['source-track']) or isset($rule['max-src-nodes']) or isset($rule['max-src-states']) ) + if( isset($rule['source-track']) or isset($rule['max-src-nodes']) or isset($rule['max-src-conn']) or isset($rule['max-src-states']) ) if($rule['protocol'] == "tcp") $aline['flags'] = "flags S/SA "; /* @@ -1501,6 +1501,7 @@ function filter_generate_user_rule($rule) if ($noadvoptions == false || $l7_present) if( isset($rule['source-track']) and $rule['source-track'] <> "" or isset($rule['max-src-nodes']) and $rule['max-src-nodes'] <> "" or + isset($rule['max-src-conn']) and $rule['max-src-conn'] <> "" or isset($rule['max-src-conn-rate']) and $rule['max-src-conn-rate'] <> "" or isset($rule['max-src-conn-rates']) and $rule['max-src-conn-rates'] <> "" or isset($rule['max-src-states']) and $rule['max-src-states'] <> "" or @@ -1511,6 +1512,8 @@ function filter_generate_user_rule($rule) $aline['flags'] .= "source-track rule "; if(isset($rule['max-src-nodes']) and $rule['max-src-nodes'] <> "") $aline['flags'] .= "max-src-nodes " . $rule['max-src-nodes'] . " "; + if(isset($rule['max-src-conn']) and $rule['max-src-conn'] <> "") + $aline['flags'] .= "max-src-conn " . $rule['max-src-conn'] . " "; if(isset($rule['max-src-states']) and $rule['max-src-states'] <> "") $aline['flags'] .= "max-src-states " . $rule['max-src-states'] . " "; if(isset($rule['statetimeout']) and $rule['statetimeout'] <> "") |