diff options
| author | Dmitriy K. <levantin@mail.nnov.ru> | 2014-07-01 00:18:12 +0400 |
|---|---|---|
| committer | Dmitriy K. <levantin@mail.nnov.ru> | 2014-07-01 00:18:12 +0400 |
| commit | 8ff231b430864a08040c22518fde9bdfff54be0a (patch) | |
| tree | d0c0d482830edbbea96f242f3d280674e9330a98 | |
| parent | 939f4e39278d8acc1709bae76f51ec6551091fec (diff) | |
| download | pfsense-8ff231b430864a08040c22518fde9bdfff54be0a.zip pfsense-8ff231b430864a08040c22518fde9bdfff54be0a.tar.gz | |
fixes #3713
| -rw-r--r-- | etc/inc/gwlb.inc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc index 6935e9a..33b20cd 100644 --- a/etc/inc/gwlb.inc +++ b/etc/inc/gwlb.inc @@ -555,8 +555,13 @@ function return_gateways_array($disabled = false, $localhost = false, $inactive $ctype = strtoupper($ifcfg['ipaddr']); break; default: - if (substr($ifcfg['if'], 0, 4) == "ovpn") + if (substr($ifcfg['if'], 0, 4) == "ovpn") { + // if current iface is an ovpn server endpoint then skip it + if (substr($ifcfg['if'], 4, 1) == 's') + continue 2; + $ctype = "VPNv4"; + } break; } $ctype = "_". strtoupper($ctype); @@ -626,9 +631,13 @@ function return_gateways_array($disabled = false, $localhost = false, $inactive break; default: $tunnelif = substr($ifcfg['if'], 0, 3); - if (substr($ifcfg['if'], 0, 4) == "ovpn") + if (substr($ifcfg['if'], 0, 4) == "ovpn") { + // if current iface is an ovpn server endpoint then skip it + if (substr($ifcfg['if'], 4, 1) == 's') + continue 2; + $ctype = "VPNv6"; - else if ($tunnelif == "gif" || $tunnelif == "gre") + } else if ($tunnelif == "gif" || $tunnelif == "gre") $ctype = "TUNNELv6"; break; } |
