Canonicalise IPv6 address before searching for peers (librenms#16541)

* Canonicalise IPv6 address before searching for peers JunOS (and probably other platforms) compress the peer identifier, but the code searches the uncompressed database field. The existing behaviour isn't great either - it clobbers the value of bgpPeerIdentifier. So, to fix it this change saves an IP object and operates on that, then only uses the pretty value for rendering - SQL queries use the unmodified version. * Fix a typo and a copy-paste error * Remove whitespace * Use a local variable * IP may be null since errors are ignored --------- Co-authored-by: Tony Murray <[email protected]>
murrant · Dec 17, 2024 · 99440c7 · 99440c7
1 parent c63c912
commit 99440c7
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/includes/html/pages/device/routing/bgp.inc.php b/includes/html/pages/device/routing/bgp.inc.php
@@ -121,6 +121,9 @@
     unset($alert);
     unset($peerhost, $peername);
 
+    // load the peer identifier into an object
+    $peerIdentifierIp = IP::parse($peer['bgpPeerIdentifier'], true);
+
     if ($peer['bgpPeerState'] == 'established') {
         $col = 'green';
     } else {
@@ -159,7 +162,7 @@
     $query = 'SELECT * FROM ipv6_addresses AS A, ports AS I, devices AS D WHERE ';
     $query .= '(A.ipv6_address = ? AND I.port_id = A.port_id)';
     $query .= ' AND D.device_id = I.device_id';
-    $ipv6_host = dbFetchRow($query, [$peer['bgpPeerIdentifier']]);
+    $ipv6_host = dbFetchRow($query, [$peerIdentifierIp?->uncompressed()]);
 
     if ($ipv4_host) {
         $peerhost = $ipv4_host;
@@ -198,9 +201,6 @@
         // Build a list of valid AFI/SAFI for this peer
     }
 
-    // make ipv6 look pretty
-    $peer['bgpPeerIdentifier'] = (string) IP::parse($peer['bgpPeerIdentifier'], true);
-
     // display overlib graphs
     $graph_array = [];
     $graph_array['type'] = 'bgp_updates';
@@ -222,7 +222,7 @@
     $link_array['page'] = 'graphs';
     unset($link_array['height'], $link_array['width'], $link_array['legend']);
     $link = \LibreNMS\Util\Url::generate($link_array);
-    $peeraddresslink = '<span class=list-large>' . \LibreNMS\Util\Url::overlibLink($link, $peer['bgpPeerIdentifier'], \LibreNMS\Util\Url::graphTag($graph_array_zoom)) . '</span>';
+    $peeraddresslink = '<span class=list-large>' . \LibreNMS\Util\Url::overlibLink($link, $peerIdentifierIp?->compressed(), \LibreNMS\Util\Url::graphTag($graph_array_zoom)) . '</span>';
 
     if ($peer['bgpPeerLastErrorCode'] == 0 && $peer['bgpPeerLastErrorSubCode'] == 0) {
         $last_error = $peer['bgpPeerLastErrorText'];