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

Merge pull request #1088 from laf/issue-1063

Browse Source 
Update SQL query for ospf_nbrs lookup to use device_id
This commit is contained in:
Daniel Preussker
2015-05-20 18:17:45 +02:00
parent 20ef96e50f ac0221f7e5
commit 695edde7bd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
includes/discovery/discovery-protocols.inc.php
View File

@ -148,9 +148,8 @@ echo("OSPF Discovery: ");
if ($config['autodiscovery']['ospf'] === TRUE) {
echo "enabled\n";
foreach (dbFetchRows("SELECT DISTINCT(`ospfNbrIpAddr`),`device_id` FROM `ospf_nbrs`") as $nbr) {
foreach (dbFetchRows("SELECT DISTINCT(`ospfNbrIpAddr`),`device_id` FROM `ospf_nbrs` WHERE `device_id`=?", array($device['device_id'])) as $nbr) {
$ip = $nbr['ospfNbrIpAddr'];
$device_id = $nbr['device_id'];
if (match_network($config['autodiscovery']['nets-exclude'], $ip)) {
echo("x");
continue;
@ -164,7 +163,7 @@ if ($config['autodiscovery']['ospf'] === TRUE) {
if (isset($remote_device_id) && $remote_device_id > 0) {
log_event("Device $name ($ip) autodiscovered through OSPF", $remote_device_id, 'system');
} else {
log_event("OSPF discovery of $name ($ip) failed - check ping and SNMP access", $device_id, 'system');
log_event("OSPF discovery of $name ($ip) failed - check ping and SNMP access", $device['device_id'], 'system');
}
}
} else {