nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-02 00:32:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "arp-table discovery - bug correction"

Browse Source 
This reverts commit 1c85af87ba.
This commit is contained in:
HenocKA
2016-04-14 11:20:07 +02:00
parent 4432cc2a96
commit 36c342686d
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/discovery/arp-table.inc.php
+3 -15
View File
@@ -4,16 +4,6 @@ unset($mac_table);
echo 'ARP Table : '; echo 'ARP Table : ';
if( key_exists('vrf_lite_cisco', $device) && (count($device['vrf_lite_cisco'])!=0) ){
$vrfs_lite_cisco = $device['vrf_lite_cisco'];
}
else {
$vrfs_lite_cisco = array(array('context_name'=>null));
}
foreach ($vrfs_lite_cisco as $vrf) {
$device['context_name']=$vrf['context_name'];
$ipNetToMedia_data = snmp_walk($device, 'ipNetToMediaPhysAddress', '-Oq', 'IP-MIB'); $ipNetToMedia_data = snmp_walk($device, 'ipNetToMediaPhysAddress', '-Oq', 'IP-MIB');
$ipNetToMedia_data = str_replace('ipNetToMediaPhysAddress.', '', trim($ipNetToMedia_data)); $ipNetToMedia_data = str_replace('ipNetToMediaPhysAddress.', '', trim($ipNetToMedia_data));
$ipNetToMedia_data = str_replace('IP-MIB::', '', trim($ipNetToMedia_data)); $ipNetToMedia_data = str_replace('IP-MIB::', '', trim($ipNetToMedia_data));
@@ -58,7 +48,7 @@ foreach (explode("\n", $ipNetToMedia_data) as $data) {
log_event("MAC change: $ip : ".mac_clean_to_readable($old_mac).' -> '.mac_clean_to_readable($clean_mac), $device, 'interface', $interface['port_id']); log_event("MAC change: $ip : ".mac_clean_to_readable($old_mac).' -> '.mac_clean_to_readable($clean_mac), $device, 'interface', $interface['port_id']);
} }
dbUpdate(array('mac_address' => $clean_mac, 'context_name' => $device['context_name']), 'ipv4_mac', 'port_id=? AND ipv4_address=?', array($interface['port_id'], $ip)); dbUpdate(array('mac_address' => $clean_mac), 'ipv4_mac', 'port_id=? AND ipv4_address=?', array($interface['port_id'], $ip));
echo '.'; echo '.';
} }
else if (isset($interface['port_id'])) { else if (isset($interface['port_id'])) {
@@ -68,8 +58,8 @@ foreach (explode("\n", $ipNetToMedia_data) as $data) {
'port_id' => $interface['port_id'], 'port_id' => $interface['port_id'],
'mac_address' => $clean_mac, 'mac_address' => $clean_mac,
'ipv4_address' => $ip, 'ipv4_address' => $ip,
'context_name' => $device['context_name'],
); );
dbInsert($insert_data, 'ipv4_mac'); dbInsert($insert_data, 'ipv4_mac');
}//end if }//end if
}//end if }//end if
@@ -86,8 +76,6 @@ foreach (dbFetchRows($sql) as $entry) {
echo '-'; echo '-';
} }
} }
echo "\n"; echo "\n";
unset($mac); unset($mac);
unset($device['context_name']);
}
unset($vrfs_c);