WebApps/Observium_CE
1
0
Fork 0
Code Pull Requests Activity

Commit version 24.12.13800

Browse Source
This commit is contained in:
Chris Hammer
2025-01-06 17:35:06 -05:00
parent b7f6a79c2c
commit 55d9218816
6133 changed files with 4239740 additions and 1374287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
includes/discovery/neighbours/tplink-lldpinfo-mib.inc.php
View File

@ -1,12 +1,12 @@
<?php
/*
/**
* Observium
*
* This file is part of Observium.
*
* @package observium
* @subpackage discovery
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
* @copyright (C) Adam Armstrong
*
*/
@ -47,48 +47,49 @@ print_debug_vars($lldp_array);
foreach ($lldp_array as $index => $lldp) {
// Local port
list($ifIndex, $lldpNeighborPortIndexId) = explode('.', $index, 2);
$ifName = $lldp['lldpNeighborPortId'];
$port = get_port_by_index_cache($device, $ifIndex);
if (!$port) {
$port = dbFetchRow("SELECT * FROM `ports` WHERE `device_id` = ? AND `deleted` = ? AND (`ifName` = ? OR `ifDescr` = ? OR `port_label_short` = ?)", [ $device['device_id'], 0, $ifName, $ifName, $ifName ]);
}
// Remote device & port
$remote_device_id = FALSE;
$remote_port_id = NULL;
// Try find remote device and check if already cached
$remote_device_id = get_autodiscovery_device_id($device, $lldp['lldpNeighborDeviceName'], $lldp['lldpNeighborManageIpAddr'], $lldp['lldpNeighborChassisId']);
if (is_null($remote_device_id) && // NULL - never cached in other rounds
check_autodiscovery($lldp['lldpNeighborDeviceName'], $lldp['lldpNeighborManageIpAddr'])) { // Check all previous autodiscovery rounds
// Neighbour never checked, try autodiscovery
$remote_device_id = autodiscovery_device($lldp['lldpNeighborDeviceName'], $lldp['lldpNeighborManageIpAddr'], 'LLDP', $lldp['lldpNeighborDeviceDescr'], $device, $port);
}
if ($remote_device_id) {
// Try lldpNeighborPortIdDescr
$if = $lldp['lldpNeighborPortIdDescr'];
$query = 'SELECT `port_id` FROM `ports` WHERE (`ifName` = ? OR `ifDescr` = ? OR `port_label_short` = ?) AND `device_id` = ? AND `deleted` = ?';
$remote_port_id = dbFetchCell($query, [ $if, $if, $if, $remote_device_id, 0 ]);
if (!$remote_port_id && $lldp['lldpNeighborPortDescr'] !== $if) {
$if = $lldp['lldpNeighborPortDescr'];
// Try same by lldpNeighborPortDescr
$remote_port_id = dbFetchCell($query, [ $if, $if, $if, $remote_device_id, 0 ]);
// Local port
[$ifIndex, $lldpNeighborPortIndexId] = explode('.', $index, 2);
$ifName = $lldp['lldpNeighborPortId'];
$port = get_port_by_index_cache($device, $ifIndex);
if (!$port) {
$port = dbFetchRow("SELECT * FROM `ports` WHERE `device_id` = ? AND `deleted` = ? AND (`ifName` = ? OR `ifDescr` = ? OR `port_label_short` = ?)", [$device['device_id'], 0, $ifName, $ifName, $ifName]);
}
//$id = $lldp['lldpNeighborManageAddrInterfaceId'];
}
$neighbour = [
'remote_port_id' => $remote_port_id,
'remote_hostname' => $lldp['lldpNeighborDeviceName'],
'remote_port' => $lldp['lldpNeighborPortIdDescr'],
'remote_platform' => $lldp['lldpNeighborDeviceDescr'],
'remote_version' => NULL,
'remote_address' => $lldp['lldpNeighborManageIpAddr']
];
discover_neighbour($port, 'lldp', $neighbour);
// Remote device & port
$remote_device_id = FALSE;
$remote_port_id = NULL;
// Try find remote device and check if already cached
$remote_device_id = get_autodiscovery_device_id($device, $lldp['lldpNeighborDeviceName'], $lldp['lldpNeighborManageIpAddr'], $lldp['lldpNeighborChassisId']);
if (is_null($remote_device_id) && // NULL - never cached in other rounds
check_autodiscovery($lldp['lldpNeighborDeviceName'], $lldp['lldpNeighborManageIpAddr'])) { // Check all previous autodiscovery rounds
// Neighbour never checked, try autodiscovery
$remote_device_id = autodiscovery_device($lldp['lldpNeighborDeviceName'], $lldp['lldpNeighborManageIpAddr'], 'LLDP', $lldp['lldpNeighborDeviceDescr'], $device, $port);
}
if ($remote_device_id) {
// Try lldpNeighborPortIdDescr
$if = $lldp['lldpNeighborPortIdDescr'];
$query = 'SELECT `port_id` FROM `ports` WHERE (`ifName` = ? OR `ifDescr` = ? OR `port_label_short` = ?) AND `device_id` = ? AND `deleted` = ?';
$remote_port_id = dbFetchCell($query, [$if, $if, $if, $remote_device_id, 0]);
if (!$remote_port_id && $lldp['lldpNeighborPortDescr'] !== $if) {
$if = $lldp['lldpNeighborPortDescr'];
// Try same by lldpNeighborPortDescr
$remote_port_id = dbFetchCell($query, [$if, $if, $if, $remote_device_id, 0]);
}
//$id = $lldp['lldpNeighborManageAddrInterfaceId'];
}
$neighbour = [
'remote_device_id' => $remote_device_id,
'remote_port_id' => $remote_port_id,
'remote_hostname' => $lldp['lldpNeighborDeviceName'],
'remote_port' => $lldp['lldpNeighborPortIdDescr'],
'remote_platform' => $lldp['lldpNeighborDeviceDescr'],
'remote_version' => NULL,
'remote_address' => $lldp['lldpNeighborManageIpAddr']
];
discover_neighbour($port, 'lldp', $neighbour);
}
// EOF