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

dhcp/leases, simplify interface lookup and make it more consistent. should fix https://github.com/opnsense/core/issues/3487

Browse Source
This commit is contained in:
Ad Schellevis 2019-05-21 20:21:50 +02:00
parent 9b63e33621
commit 446caa9941
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/www/status_dhcp_leases.php
View File

@ -401,32 +401,10 @@ legacy_html_escape_form_data($leases);
}
$lip = ip2ulong($data['ip']);
if ($data['act'] == "static") {
foreach ($dhcpd as $dhcpif => $dhcpifconf) {
if (isset($dhcpifconf['staticmap']) && is_array($dhcpifconf['staticmap'])) {
foreach ($dhcpifconf['staticmap'] as $staticent) {
if ($data['ip'] == $staticent['ipaddr']) {
$data['int'] = htmlspecialchars($interfaces[$dhcpif]['descr']);
$data['if'] = $dhcpif;
break;
}
}
}
/* exit as soon as we have an interface */
if ($data['if'] != '') {
break;
}
}
} else {
foreach ($dhcpd as $dhcpif => $dhcpifconf) {
if (empty($dhcpifconf['range'])) {
continue;
}
if (!empty($dhcpifconf["enable"]) && $lip >= ip2ulong($dhcpifconf['range']['from']) && $lip <= ip2ulong($dhcpifconf['range']['to'])) {
$data['int'] = htmlspecialchars($interfaces[$dhcpif]['descr']);
$data['if'] = $dhcpif;
break;
}
foreach ($dhcpd as $dhcpif => $dhcpifconf) {
if ($lip >= ip2ulong($dhcpifconf['range']['from']) && $lip <= ip2ulong($dhcpifconf['range']['to'])) {
$data['int'] = htmlspecialchars($interfaces[$dhcpif]['descr']);
$data['if'] = $dhcpif;
}
}
$mac_hi = strtoupper($data['mac'][0] . $data['mac'][1] . $data['mac'][3] . $data['mac'][4] . $data['mac'][6] . $data['mac'][7]);