diff options
| author | Chris Buechler <cmb@pfsense.org> | 2014-12-31 16:17:29 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2014-12-31 16:18:50 -0600 |
| commit | 1d709219ed820415293494687f7eece08700f3e5 (patch) | |
| tree | 6dfc97f923a1ebd213f26e17f4667f7cde6e960c /etc | |
| parent | d961e7e33e4f2dfa5d63e0b5c83ff5c1fa9fc133 (diff) | |
| download | pfsense-1d709219ed820415293494687f7eece08700f3e5.zip pfsense-1d709219ed820415293494687f7eece08700f3e5.tar.gz | |
Use binat, not nat, where IPsec NAT is configured with an address for local and NAT. Ticket #4169
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index e4bea9b..06b99aa 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -1755,17 +1755,13 @@ function filter_nat_rules_generate() { if (is_ipaddr($natlocal_subnet) && !is_ipaddr($local_subnet) ) $nattype = "nat"; else { - if (is_ipaddr($natlocal_subnet) || is_ipaddr($local_subnet)) + list($natnet, $natmask) = explode('/', $natlocal_subnet); + list($locnet, $locmask) = explode('/', $local_subnet); + if (intval($natmask) != intval($locmask)) $nattype = "nat"; - else { - list($natnet, $natmask) = explode('/', $natlocal_subnet); - list($locnet, $locmask) = explode('/', $local_subnet); - if (intval($natmask) != intval($locmask)) - $nattype = "nat"; - else - $nattype = "binat"; - unset($natnet, $natmask, $locnet, $locmask); - } + else + $nattype = "binat"; + unset($natnet, $natmask, $locnet, $locmask); } $natrules .= "{$nattype} on enc0 from {$local_subnet} to {$remote_subnet} -> {$natlocal_subnet}\n"; } |
