diff options
| author | Ermal <eri@pfsense.org> | 2013-03-18 14:55:26 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-03-18 14:55:26 +0000 |
| commit | 909de4007e44529095aee760645918a6da12c9f7 (patch) | |
| tree | ec5d23bfc940acb0d597ac6ccb4bffdb079b179c /etc/inc/ipsec.inc | |
| parent | 6e46ff8670c352249f8c83c0f46723edfeb3a731 (diff) | |
| download | pfsense-909de4007e44529095aee760645918a6da12c9f7.zip pfsense-909de4007e44529095aee760645918a6da12c9f7.tar.gz | |
Try to remove as much as possible _stf special case through the code
Diffstat (limited to 'etc/inc/ipsec.inc')
| -rw-r--r-- | etc/inc/ipsec.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/etc/inc/ipsec.inc b/etc/inc/ipsec.inc index 2d5c1a7..8b8f1b9 100644 --- a/etc/inc/ipsec.inc +++ b/etc/inc/ipsec.inc @@ -151,10 +151,11 @@ function ipsec_get_phase1_src(& $ph1ent) { if ($ph1ent['interface']) { if (!is_ipaddr($ph1ent['interface'])) { - $if = get_failover_interface($ph1ent['interface']); - if($ph1ent['protocol'] == "inet6") { + if ($ph1ent['protocol'] == "inet6") { + $if = get_failover_interface($ph1ent['interface'], "inet6"); $interfaceip = get_interface_ipv6($if); } else { + $if = get_failover_interface($ph1ent['interface']); $interfaceip = get_interface_ip($if); } } else { @@ -162,11 +163,10 @@ function ipsec_get_phase1_src(& $ph1ent) { } } else { $if = "wan"; - if($ph1ent['protocol'] == "inet6") { + if ($ph1ent['protocol'] == "inet6") $interfaceip = get_interface_ipv6($if); - } else { + else $interfaceip = get_interface_ip($if); - } } return $interfaceip; |
