diff options
| author | Ermal Luçi <eri@pfsense.org> | 2008-06-20 18:07:32 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2008-06-20 18:07:32 +0000 |
| commit | 55089801d3599eee770686b0666fb5f9f6029ce3 (patch) | |
| tree | 5f792a38d5d4976ffcfec22c2a99cc6bf254c650 /etc/inc/filter.inc | |
| parent | 7b2eccb6ade49263fd1189e9a3b326fd070099bf (diff) | |
| download | pfsense-55089801d3599eee770686b0666fb5f9f6029ce3.zip pfsense-55089801d3599eee770686b0666fb5f9f6029ce3.tar.gz | |
Fix nat rule creation for optional interfaces.
Diffstat (limited to 'etc/inc/filter.inc')
| -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 5de2f8d..2283e7e 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -809,12 +809,12 @@ function filter_nat_rules_generate() { if ((!$optcfg['bridge']) && (!interface_has_gateway($if))) { $optsa = gen_subnet($optcfg['ipaddr'], $optcfg['subnet']); - $target = get_current_wan_address($interface = $if); + $target = get_current_wan_address($interface = "wan"); if(is_ipaddr($wancfg['alias-address'])) { $aliastarget = $wancfg['alias-address']; $aliassubnet = $wancfg['alias-subnet']; if($config['interfaces']['lan']) - $natrules .= filter_nat_rules_generate_if($wanif, + $natrules .= filter_nat_rules_generate_if($if, "{$lansa}/{$lancfg['subnet']}", null, "$aliastarget/$aliassubnet", null, $aliastarget, null, false); } /* create outbound nat entries for primary wan */ @@ -836,8 +836,8 @@ function filter_nat_rules_generate() { /* create outbound nat entries for all opt wans */ foreach($optints as $ocname => $oc) { $opt_interface = $oc['if']; - if (interface_has_gateway("$opt_interface")) { - $target = get_current_wan_address($interface = "$ocname"); + if (interface_has_gateway($opt_interface)) { + $target = get_current_wan_address($interface = $ocname); if(is_ipaddr($config['interfaces'][$ocname]['alias-address'])) { $aliastarget = $config['interfaces'][$ocname]['alias-address']; $aliassubnet = $config['interfaces'][$ocname]['alias-subnet']; |
