diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-11-03 23:42:17 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-11-03 23:42:17 +0000 |
| commit | 76934b05a3da6208ec189b1e7d142ef7811f6475 (patch) | |
| tree | ad228a44717474e58953e26054a277fb953f9ac5 /etc | |
| parent | 31a3b9db6bbb3fd6ea0a86aa584d795d3d306107 (diff) | |
| download | pfsense-76934b05a3da6208ec189b1e7d142ef7811f6475.zip pfsense-76934b05a3da6208ec189b1e7d142ef7811f6475.tar.gz | |
MFC 7320
Add interface ip option for firewall rules
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 29416c6..4cfe75e 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -619,7 +619,7 @@ function filter_nat_rules_generate() { */ if($target <> "") { if($extport[0] == "21" and !isset($config['system']['disableftpproxy'])) { - $helpers = exec("ps aux | grep pftpx | grep -v grep | grep {$target}"); + $helpers = exec("ps awux | grep pftpx | grep -v grep | grep {$target} | cut -d\" \" -f5"); if(!$helpers) { $external_address = $rule['external-address']; if($external_address == "") @@ -1000,6 +1000,9 @@ function generate_user_filter_rule($rule, $ngcounter) { if (isset($rule['source']['not'])) $src = " !{$src}"; } else { switch ($rule['source']['network']) { + case 'wanip': + $src = $curwanip; + break; case 'lan': $src = "{$lansa}/{$lansn}"; break; @@ -1074,6 +1077,9 @@ function generate_user_filter_rule($rule, $ngcounter) { if (isset($rule['destination']['not'])) $dst = " !{$dst}"; } else { switch ($rule['destination']['network']) { + case 'wanip': + $dst = $curwanip; + break; case 'lan': $dst = "{$lansa}/{$lansn}"; break; |
