mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent spurious MAC changes on multi-interface devices (#14671)

Browse Source
This commit is contained in:
AdamB
2022-12-16 15:46:10 +00:00
committed by GitHub
parent f56295c0ea
commit 8b2e2f8d95
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
includes/discovery/arp-table.inc.php
View File

@@ -36,9 +36,6 @@ foreach (DeviceCache::getPrimary()->getVrfContexts() as $context_name) {
$sql = 'SELECT * from `ipv4_mac` WHERE `device_id`=? AND `context_name`=?';
$existing_data = dbFetchRows($sql, [$device['device_id'], $context_name]);
$ipv4_addresses = array_map(function ($data) {
return $data['ipv4_address'];
}, $existing_data);
$arp_table = [];
$insert_data = [];
foreach ($arp_data as $ifIndex => $data) {
@@ -59,7 +56,14 @@ foreach (DeviceCache::getPrimary()->getVrfContexts() as $context_name) {
$mac = implode(array_map('zeropad', explode(':', $raw_mac)));
$arp_table[$port_id][$ip] = $mac;
$index = array_search($ip, $ipv4_addresses);
$index = false;
foreach ($existing_data as $existing_key => $existing_value) {
if ($existing_value['ipv4_address'] == $ip && $existing_value['port_id'] == $port_id) {
$index = $existing_key;
break;
}
}
if ($index !== false) {
$old_mac = $existing_data[$index]['mac_address'];
if ($mac != $old_mac && $mac != '') {