diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-07-18 13:21:16 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-07-18 13:21:16 -0300 |
commit | 639567b8f0fb7d333d8b46417b96bb906f981f37 (patch) | |
tree | 35541f942bd1bbdacebc14d012d57a21c39eb27d /etc | |
parent | d806061cb4e5fd8f1b0f4d72019f7137d935e61d (diff) | |
parent | 8ff231b430864a08040c22518fde9bdfff54be0a (diff) | |
download | pfsense-639567b8f0fb7d333d8b46417b96bb906f981f37.zip pfsense-639567b8f0fb7d333d8b46417b96bb906f981f37.tar.gz |
Merge pull request #1247 from DasTestament/master
Diffstat (limited to 'etc')
-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; } |