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

dhcp, leases overview. merge static mac addresses with leases for https://github.com/opnsense/core/issues/2946

Browse Source
This commit is contained in:
Ad Schellevis 2019-04-25 11:08:05 +02:00
parent 3992b4e556
commit 839ec3567a
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/www/status_dhcp_leases.php
View File

@ -211,6 +211,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
asort($pools);
}
$macs = [];
foreach ($leases as $i => $this_lease) {
if (!empty($this_lease['mac'])) {
$macs[$this_lease['mac']] = $i;
}
}
foreach ($interfaces as $ifname => $ifarr) {
if (isset($config['dhcpd'][$ifname]['staticmap'])) {
foreach($config['dhcpd'][$ifname]['staticmap'] as $static) {
@ -224,7 +230,16 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$slease['descr'] = $static['descr'];
$slease['act'] = "static";
$slease['online'] = in_array(strtolower($slease['mac']), $arpdata_mac) ? 'online' : 'offline';
$leases[] = $slease;
if (isset($macs[$slease['mac']])) {
// update lease with static data
foreach ($slease as $key => $value) {
if (!empty($value)) {
$leases[$macs[$slease['mac']]][$key] = $slease[$key];
}
}
} else {
$leases[] = $slease;
}
}
}
}