diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-03-06 00:39:31 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-03-06 00:39:31 -0600 |
| commit | 29de629ebd363c4d3e34d1a7bc68bd8d7f8a4c47 (patch) | |
| tree | 421a86cbcc949a5a2d95e5e6efb31a422072868e | |
| parent | df966626606fe7c60c3d7301f3843280b746a7a6 (diff) | |
| download | pfsense-29de629ebd363c4d3e34d1a7bc68bd8d7f8a4c47.zip pfsense-29de629ebd363c4d3e34d1a7bc68bd8d7f8a4c47.tar.gz | |
Use the parent interface, not the _vip for interfaces_use. Part of Ticket #4482
| -rw-r--r-- | etc/inc/vpn.inc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 3ec14de..f1dbfd6 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -185,7 +185,10 @@ function vpn_ipsec_configure($restart = false) $ifacesuse[] = get_real_interface($vpninterface[0]); } else { $vpninterface = get_failover_interface($ph1ent['interface']); - if (!empty($vpninterface)) + if (strpos($vpninterface, '_vip')) { + $vpninterface = explode('_vip', $vpninterface); + $ifacesuse[] = get_real_interface($vpninterface[0]); + } elseif (!empty($vpninterface)) $ifacesuse[] = $vpninterface; } @@ -620,7 +623,13 @@ EOD; $vpninterface = $vpninterface[0]; } else { $ifacesuse = get_failover_interface($ph1ent['interface']); - $vpninterface = convert_real_interface_to_friendly_interface_name($ifacesuse); + if (strpos($ifacesuse, '_vip')) { + $vpninterface = explode('_vip', $ifacesuse); + $ifacesuse = get_real_interface($vpninterface[0]); + $vpninterface = $vpninterface[0]; + } else { + $vpninterface = convert_real_interface_to_friendly_interface_name($ifacesuse); + } } if (!empty($ifacesuse) && interface_has_gateway($vpninterface)) { |
