lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 17:44:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

dhcpv6: fix previous

Browse Source
This commit is contained in:
Stephan de Wit 2023-08-08 14:38:20 +02:00
parent 410049d5f5
commit cab341129a
2 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php
View File

@ -91,20 +91,22 @@ class LeasesController extends ApiControllerBase
/* handle static leases */
$statics = [];
foreach ($sleases["dhcpd"] as $slease) {
$static = [];
$static['address'] = $slease['ipaddr'] ?? '';
$static['type'] = 'static';
$static['mac'] = $slease['mac'] ?? '';
$static['starts'] = '';
$static['ends'] = '';
$static['hostname'] = $slease['hostname'] ?? '';
$static['descr'] = $slease['descr'] ?? '';
$static['if_descr'] = '';
$static['if'] = $slease['interface'] ?? '';
$static['state'] = 'active';
$static['status'] = in_array(strtolower($static['mac']), $online) ? 'online' : 'offline';
$statics[] = $static;
if ($sleases) {
foreach ($sleases["dhcpd"] as $slease) {
$static = [];
$static['address'] = $slease['ipaddr'] ?? '';
$static['type'] = 'static';
$static['mac'] = $slease['mac'] ?? '';
$static['starts'] = '';
$static['ends'] = '';
$static['hostname'] = $slease['hostname'] ?? '';
$static['descr'] = $slease['descr'] ?? '';
$static['if_descr'] = '';
$static['if'] = $slease['interface'] ?? '';
$static['state'] = 'active';
$static['status'] = in_array(strtolower($static['mac']), $online) ? 'online' : 'offline';
$statics[] = $static;
}
}
$leases = array_merge($leases, $statics);

38
src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php
View File

@ -89,21 +89,23 @@ class LeasesController extends ApiControllerBase
$sleases = json_decode($backend->configdRun('dhcpd6 list static 0'), true);
$statics = [];
foreach ($sleases['dhcpd'] as $slease) {
$static = [
'address' => $slease['ipaddrv6'] ?? '',
'type' => 'static',
'cltt' => '',
'ends' => '',
'descr' => $slease['descr'] ?? '',
'iaid' => '',
'duid' => $slease['duid'] ?? '',
'if_descr' => '',
'if' => $slease['interface'] ?? '',
'state' => 'active',
'status' => in_array(strtolower($slease['ipaddrv6']), $online) ? 'online' : 'offline'
];
$statics[] = $static;
if ($sleases) {
foreach ($sleases['dhcpd'] as $slease) {
$static = [
'address' => $slease['ipaddrv6'] ?? '',
'type' => 'static',
'cltt' => '',
'ends' => '',
'descr' => $slease['descr'] ?? '',
'iaid' => '',
'duid' => $slease['duid'] ?? '',
'if_descr' => '',
'if' => $slease['interface'] ?? '',
'state' => 'active',
'status' => in_array(strtolower($slease['ipaddrv6']), $online) ? 'online' : 'offline'
];
$statics[] = $static;
}
}
$leases = array_merge($leases, $statics);
@ -178,14 +180,16 @@ class LeasesController extends ApiControllerBase
}
/* include interface */
$intf = '';
$intf_descr = '';
if (!empty($lease['if'])) {
$intf = $lease['if'];
$intf_descr = $raw_intfs[$lease['if']];
$intf_descr = $config->interfaces->{$lease['if']}->descr ?: strtoupper($intf);
} else {
foreach ($if_ranges as $if_name => $if_range) {
if (!empty($lease['address']) && Util::isIPInCIDR($lease['address'], $if_range)) {
$intf = $if_name;
$intf_descr = $raw_intfs[$if_name];
$intf_descr = (string)$config->interfaces->$if_name->descr ?: strtoupper($if_name);
break;
}
}