diff options
| author | Ermal LUÇI <eri@pfsense.org> | 2015-01-21 21:33:56 +0100 |
|---|---|---|
| committer | Ermal LUÇI <eri@pfsense.org> | 2015-01-21 21:33:56 +0100 |
| commit | 3ad33c0e25ac36f89e6c43793b2f04381b1c5073 (patch) | |
| tree | 82f3a3fca65c860c56a2e818ffe623c7c5fb4637 | |
| parent | cde88d5ed13eb0b7ccf52b50e7a3437da20af2ec (diff) | |
| download | pfsense-3ad33c0e25ac36f89e6c43793b2f04381b1c5073.zip pfsense-3ad33c0e25ac36f89e6c43793b2f04381b1c5073.tar.gz | |
Ticket #4254 Actually use proper interface to check if gateway exists
| -rw-r--r-- | etc/inc/vpn.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index a93b452..dc5bf39 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -592,11 +592,13 @@ EOD; if (strpos($ph1ent['interface'], '_vip')) { $vpninterface = explode('_vip', $ph1ent['interface']); $ifacesuse = get_real_interface($vpninterface[0]); + $vpninterface = $vpninterface[0]; } else { $ifacesuse = get_failover_interface($ph1ent['interface']); + $vpninterface = convert_real_interface_to_friendly_interface_name($ifacesuse); } - if (!empty($ifacesuse) && interface_has_gateway($ifacesuse)) { + if (!empty($ifacesuse) && interface_has_gateway($vpninterface)) { $gatewayip = get_interface_gateway($ifacesuse); $interfaceip = get_interface_ip($ifacesuse); $subnet_bits = get_interface_subnet($ifacesuse); @@ -613,8 +615,10 @@ EOD; if (strpos($ph1ent['interface'], '_vip')) { $vpninterface = explode('_vip', $ph1ent['interface']); $ifacesuse = get_real_interface($vpninterface[0]); + $vpninterface = $vpninterface[0]; } else { $ifacesuse = get_failover_interface($ph1ent['interface']); + $vpninterface = convert_real_interface_to_friendly_interface_name($ifacesuse); } if (!empty($ifacesuse) && interface_has_gateway($ifacesuse)) { |
