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

OSPF issue when devices don't support OSPF-MIB::ospfIfTable (#13530)

Browse Source 
* OSPF devices return wrong ospfIfTable index

* Handle "End of MIB" string
This commit is contained in:
Tony Murray
2021-11-17 16:26:50 -06:00
committed by GitHub
parent c05a7a57a0
commit 7893b8bebe
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
LibreNMS/Data/Source/SnmpResponse.php
View File

@@ -112,7 +112,7 @@ class SnmpResponse
$values = []; $values = [];
$line = strtok($this->raw, PHP_EOL); $line = strtok($this->raw, PHP_EOL);
while ($line !== false) { while ($line !== false) {
if (Str::contains($line, ['at this OID', 'this MIB View'])) { if (Str::contains($line, ['at this OID', 'this MIB View', 'End of MIB'])) {
// these occur when we seek past the end of data, usually the end of the response, but grab the next line and continue // these occur when we seek past the end of data, usually the end of the response, but grab the next line and continue
$line = strtok(PHP_EOL); $line = strtok(PHP_EOL);
continue; continue;
@@ -171,11 +171,15 @@ class SnmpResponse
} }
/** /**
* Map an snmp table with callback. * Map an snmp table with callback. If invalid data is encountered, an empty collection is returned.
* Variables passed to the callback will be an array of row values followed by each individual index. * Variables passed to the callback will be an array of row values followed by each individual index.
*/ */
public function mapTable(callable $callback): Collection public function mapTable(callable $callback): Collection
{ {
if (! $this->isValid()) {
return new Collection;
}
return collect($this->values()) return collect($this->values())
->map(function ($value, $oid) { ->map(function ($value, $oid) {
$parts = explode('[', rtrim($oid, ']'), 2); $parts = explode('[', rtrim($oid, ']'), 2);