lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 00:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

openvpn: improve plugging further for #1157

Browse Source
This commit is contained in:
Franco Fichtner 2016-08-29 07:25:00 +02:00
parent 1d73b3b59d
commit 1811e1d204
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/etc/inc/openvpn.inc
View File

@ -82,6 +82,7 @@ function openvpn_create_key()
function openvpn_vpnid_used($vpnid)
{
global $config;
if (isset($config['openvpn']['openvpn-server'])) {
foreach ($config['openvpn']['openvpn-server'] as &$settings) {
if ($vpnid == $settings['vpnid']) {
@ -99,7 +100,7 @@ function openvpn_vpnid_used($vpnid)
}
return false;
}
}
function openvpn_vpnid_next()
{

24
src/etc/inc/plugins.inc.d/if_openvpn.inc
View File

@ -73,15 +73,21 @@ function if_openvpn_interfaces()
$interfaces = array();
if ((isset($config['openvpn']['openvpn-server']) && count($config['openvpn']['openvpn-server'])) ||
(isset($config['openvpn']['openvpn-client']) && count($config['openvpn']['openvpn-client']))) {
$oic = array("enable" => true);
$oic['if'] = "openvpn";
$oic['descr'] = 'OpenVPN';
$oic['type'] = "none";
$oic['virtual'] = true;
$oic['networks'] = array();
$interfaces['openvpn'] = $oic;
foreach (array('server', 'client') as $mode) {
if (isset($config['openvpn']["openvpn-{$mode}"])) {
foreach ($config['openvpn']["openvpn-{$mode}"] as &$settings) {
if (!isset($settings['disable'])) {
$oic = array('enable' => true);
$oic['if'] = 'openvpn';
$oic['descr'] = 'OpenVPN';
$oic['type'] = 'none';
$oic['virtual'] = true;
$oic['networks'] = array();
$interfaces['openvpn'] = $oic;
break 2;
}
}
}
}
return $interfaces;