From c822154cf0879ee88c20220706485096e3b5e48c Mon Sep 17 00:00:00 2001 From: jim-p Date: Tue, 18 Dec 2012 09:38:36 -0500 Subject: Make gateways for assigned OpenVPN servers as well as clients. --- etc/inc/gwlb.inc | 4 ++-- etc/inc/interfaces.inc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'etc') diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc index 173a185..3dc7e2b 100644 --- a/etc/inc/gwlb.inc +++ b/etc/inc/gwlb.inc @@ -522,7 +522,7 @@ function return_gateways_array($disabled = false, $localhost = false) { $ctype = strtoupper($ifcfg['ipaddr']); break; default: - if (substr($ifcfg['if'], 0, 5) == "ovpnc") + if (substr($ifcfg['if'], 0, 4) == "ovpn") $ctype = "VPNv4"; break; } @@ -588,7 +588,7 @@ function return_gateways_array($disabled = false, $localhost = false) { $ctype = strtoupper($ifcfg['ipaddrv6']); break; default: - if (substr($ifcfg['if'], 0, 5) == "ovpnc") + if (substr($ifcfg['if'], 0, 4) == "ovpn") $ctype = "VPNv6"; break; } diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 7b12d02..d30b137 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -4287,7 +4287,7 @@ function get_interfaces_with_gateway() { $ints[$ifdescr] = $ifdescr; break; default: - if (substr($ifname['if'], 0, 5) == "ovpnc" || + if (substr($ifname['if'], 0, 4) == "ovpn" || !empty($ifname['gateway'])) $ints[$ifdescr] = $ifdescr; break; @@ -4311,7 +4311,7 @@ function interface_has_gateway($friendly) { return true; break; default: - if (substr($ifname['if'], 0, 5) == "ovpnc") + if (substr($ifname['if'], 0, 4) == "ovpn") return true; if (!empty($ifname['gateway'])) return true; @@ -4340,7 +4340,7 @@ function interface_has_gatewayv6($friendly) { return true; break; default: - if (substr($ifname['if'], 0, 5) == "ovpnc") + if (substr($ifname['if'], 0, 4) == "ovpn") return true; if (!empty($ifname['gatewayv6'])) return true; -- cgit v1.1