diff options
-rw-r--r-- | etc/inc/filter.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index cb15360..850fac6 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -646,7 +646,6 @@ function filter_nat_rules_generate_if($if, $src, $dst, $target) { $tgt = "0/32"; $natrule = <<<EOD - nat on $if from $src to any -> ($if) EOD; @@ -702,9 +701,6 @@ function filter_nat_rules_generate() { $natrules .= "nat-anchor \"natrules/*\"\n"; - if(!isset($config['system']['disableftpproxy'])) - $natrules .= "rdr on " . $lanif . " proto tcp from any to any port 21 -> 127.0.0.1 port 8021\n"; - /* any 1:1 mappings? */ if (is_array($config['nat']['onetoone'])) { foreach ($config['nat']['onetoone'] as $natent) { @@ -781,6 +777,10 @@ function filter_nat_rules_generate() { } } + if(!isset($config['system']['disableftpproxy'])) + $natrules .= "rdr on " . $lanif . " proto tcp from any to any port 21 -> 127.0.0.1 port 8021\n"; + + /* DIAG: add ipv6 NAT, if requested */ if (isset($config['diag']['ipv6nat']['enable'])) { $natrules .= "rdr on $wanif proto ipv6 from any to any port 0 -> " . |