lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-18 02:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix config handling on empty tags for dhcp / ipsec

Browse Source
This commit is contained in:
Ad Schellevis 2015-03-25 17:56:57 +00:00
parent 4e929daba7
commit 8972c57e44
9 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/etc/inc/interfaces.inc
View File

@ -5241,7 +5241,9 @@ function interfaces_staticarp_configure($if)
if (is_array($config['dhcpd'][$if]['staticmap'])) {
foreach ($config['dhcpd'][$if]['staticmap'] as $arpent) {
mwexec("/usr/sbin/arp -s " . escapeshellarg($arpent['ipaddr']) . " " . escapeshellarg($arpent['mac']));
if (isset($arpent['ipaddr'])) {
mwexec("/usr/sbin/arp -s " . escapeshellarg($arpent['ipaddr']) . " " . escapeshellarg($arpent['mac']));
}
}
@ -5252,7 +5254,9 @@ function interfaces_staticarp_configure($if)
if (isset($config['dhcpd'][$if]['staticmap'])) {
foreach ($config['dhcpd'][$if]['staticmap'] as $arpent) {
if (isset($arpent['arp_table_static_entry'])) {
mwexec("/usr/sbin/arp -s " . escapeshellarg($arpent['ipaddr']) . " " . escapeshellarg($arpent['mac']));
if (isset($arpent['ipaddr'])) {
mwexec("/usr/sbin/arp -s " . escapeshellarg($arpent['ipaddr']) . " " . escapeshellarg($arpent['mac']));
}
}
}
}

4
src/etc/inc/services.inc
View File

@ -496,7 +496,7 @@ EOPP;
$all_pools = array();
$all_pools[] = $dhcpifconf;
if (is_array($dhcpifconf['pool'])) {
if (is_array($dhcpifconf['pool']) && isset($dhcpifconf['pool']['range']) ) {
$all_pools = array_merge($all_pools, $dhcpifconf['pool']);
}
@ -546,7 +546,7 @@ EOPP;
/* Create classes - These all contain comma separated lists. Join them into one
big comma separated string then split them all up. */
$all_mac_strings = array();
if (is_array($dhcpifconf['pool'])) {
if (is_array($dhcpifconf['pool']) && isset($dhcpifconf['pool']['range']) ) {
foreach($all_pools as $poolconf) {
$all_mac_strings[] = $poolconf['mac_allow'];
$all_mac_strings[] = $poolconf['mac_deny'];

4
src/www/vpn_ipsec.php
View File

@ -34,6 +34,10 @@ require_once("shaper.inc");
require_once("ipsec.inc");
require_once("vpn.inc");
if (!is_array($config['ipsec'])) {
$config['ipsec'] = array();
}
if (!is_array($config['ipsec']['phase1']))
$config['ipsec']['phase1'] = array();

4
src/www/vpn_ipsec_keys.php
View File

@ -32,6 +32,10 @@ require_once("ipsec.inc");
require_once("vpn.inc");
require_once("filter.inc");
if (!is_array($config['ipsec'])) {
$config['ipsec'] = array();
}
if (!is_array($config['ipsec']['mobilekey'])) {
$config['ipsec']['mobilekey'] = array();
}

4
src/www/vpn_ipsec_keys_edit.php
View File

@ -31,6 +31,10 @@ require_once("guiconfig.inc");
require_once("ipsec.inc");
require_once("vpn.inc");
if (!is_array($config['ipsec'])) {
$config['ipsec'] = array();
}
if (!is_array($config['ipsec']['mobilekey'])) {
$config['ipsec']['mobilekey'] = array();
}

4
src/www/vpn_ipsec_mobile.php
View File

@ -31,6 +31,10 @@ require_once("guiconfig.inc");
require_once("ipsec.inc");
require_once("vpn.inc");
if (!is_array($config['ipsec'])) {
$config['ipsec'] = array();
}
if (!is_array($config['ipsec']['phase1']))
$config['ipsec']['phase1'] = array();

4
src/www/vpn_ipsec_phase1.php
View File

@ -33,6 +33,10 @@ require_once("guiconfig.inc");
require_once("ipsec.inc");
require_once("vpn.inc");
if (!is_array($config['ipsec'])) {
$config['ipsec'] = array();
}
if (!is_array($config['ipsec']['phase1']))
$config['ipsec']['phase1'] = array();

4
src/www/vpn_ipsec_phase2.php
View File

@ -32,6 +32,10 @@ require_once("guiconfig.inc");
require_once("ipsec.inc");
require_once("vpn.inc");
if (!is_array($config['ipsec'])) {
$config['ipsec'] = array();
}
if (!is_array($config['ipsec']['client']))
$config['ipsec']['client'] = array();

4
src/www/vpn_ipsec_settings.php
View File

@ -33,6 +33,10 @@ require_once("shaper.inc");
require_once("ipsec.inc");
require_once("vpn.inc");
if (!is_array($config['ipsec'])) {
$config['ipsec'] = array();
}
$pconfig['noinstalllanspd'] = $config['system']['noinstalllanspd'];
$pconfig['preferoldsa_enable'] = isset($config['ipsec']['preferoldsa']);
foreach ($ipsec_loglevels as $lkey => $ldescr) {