diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2008-10-14 18:24:34 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2008-10-14 18:24:34 +0000 |
| commit | 915ffd5f8bee9b88a9305f0e5437eb0dae4f613c (patch) | |
| tree | f801a7078e069e715cce0b8e669cdfb3f9a1fe21 /etc | |
| parent | 981cf4aed3ed791cef11b5c9c200828294a888d5 (diff) | |
| download | pfsense-915ffd5f8bee9b88a9305f0e5437eb0dae4f613c.zip pfsense-915ffd5f8bee9b88a9305f0e5437eb0dae4f613c.tar.gz | |
Actually insert the interface address when the option is specified.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 7ac7953..d5b35ae 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -523,11 +523,15 @@ function filter_nat_rules_generate_if($if, $src = "any", $srcport = "", $dst = " if($src == "/32" || $src{0} == "/") return "# src incorrectly specified\n"; - /* Use interface name if IP isn't specified */ - if ($natip != "") + if ($natip != "") { + $tgt = "{$natip}/32"; + } else { + $natip = get_current_wan_address($if); + if($natip) $tgt = "{$natip}/32"; - else - $tgt = "(". get_real_wan_interface($if).")"; + else + $tgt = "($if)"; + } /* Add the hard set source port (useful for ISAKMP) */ if ($natport != "") @@ -2889,4 +2893,4 @@ function return_vpn_subnet($adr) } -?> +?>
\ No newline at end of file |
