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

[ipv4] fix /32 addresses discovery (#15863)

Browse Source
This commit is contained in:
Peca Nesovanovic
2024-03-01 00:27:32 +01:00
committed by GitHub
parent d456e78109
commit 05ad1fd242
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
includes/discovery/functions.inc.php
View File

@@ -749,11 +749,11 @@ function discover_process_ipv4(&$valid_v4, $device, int $ifIndex, $ipv4_address,
if (! $dbIpv4Net->wasRecentlyCreated && $dbIpv4Net->wasChanged()) {
Eventlog::log('IPv4 network ' . $ipv4_network . ' changed', $device['device_id'], 'ipv4', Severity::Warning);
echo 'S.';
echo 'Nu';
}
if ($dbIpv4Net->wasRecentlyCreated) {
Eventlog::log('IPv4 network ' . $ipv4_network . ' created', $device['device_id'], 'ipv4', Severity::Warning);
echo 'S+';
Eventlog::log('IPv4 network ' . $ipv4_network . ' created', $device['device_id'], 'ipv4', Severity::Notice);
echo 'N+';
}
$ipv4_network_id = Ipv4Network::where('ipv4_network', $ipv4_network)->value('ipv4_network_id');
@@ -767,14 +767,14 @@ function discover_process_ipv4(&$valid_v4, $device, int $ifIndex, $ipv4_address,
]);
if (! $dbIpv4Addr->wasRecentlyCreated && $dbIpv4Addr->wasChanged()) {
Eventlog::log('IPv4 address ' . $ipv4 . ' changed', $device['device_id'], 'ipv4', Severity::Warning);
echo 'A.';
Eventlog::log('IPv4 address ' . $ipv4_address . '/' . $cidr . ' changed', $device['device_id'], 'ipv4', Severity::Warning);
echo 'Au';
}
if ($dbIpv4Addr->wasRecentlyCreated) {
Eventlog::log('IPv4 address ' . $ipv4 . ' created', $device['device_id'], 'ipv4', Severity::Warning);
Eventlog::log('IPv4 address ' . $ipv4_address . '/' . $cidr . ' created', $device['device_id'], 'ipv4', Severity::Notice);
echo 'A+';
}
$full_address = $ipv4 . '|' . $ifIndex;
$full_address = $ipv4_address . '/' . $cidr . '|' . $ifIndex;
$valid_v4[$full_address] = 1;
} else {
d_echo('No port id found for ifindex: ' . $ifIndex . PHP_EOL);

2
includes/discovery/ipv4-addresses.inc.php
View File

@@ -44,7 +44,7 @@ foreach (DeviceCache::getPrimary()->getVrfContexts() as $context_name) {
echo 'A-';
if (! Ipv4Address::where('ipv4_network_id', $row['ipv4_network_id'])->count()) {
Ipv4Network::where('ipv4_network_id', $row['ipv4_network_id'])->delete();
echo 'S-';
echo 'N-';
}
}
}