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

remove legacy variables, hopefully i didn't mess anything up

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3134 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2012-05-06 18:38:11 +00:00
parent c450f2aea9
commit 8df2b9b3f5
53 changed files with 963 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
includes/discovery/bgp-peers.inc.php
View File

@@ -1,5 +1,7 @@
<?php
global $debug;
if ($config['enable_bgp'])
{
### Discover BGP peers
@@ -113,21 +115,24 @@ if ($config['enable_bgp'])
$safis[1] = "unicast";
$safis[2] = "multicast";
if (!isset($peerIndexes))
if (!isset($j_peerIndexes))
{
$j_bgp = snmpwalk_cache_multi_oid($device, "jnxBgpM2PeerTable", $jbgp, "BGP4-V2-MIB-JUNIPER", $config['install_dir']."/mibs/junos");
foreach ($j_bgp as $index => $entry)
{
switch ($entry['jnxBgpM2PeerRemoteAddrType'])
{
case 'ipv4':
$ip = long2ip(hexdec($entry['jnxBgpM2PeerRemoteAddr']));
if ($debug) { echo("peerindex for ipv4 $ip is " . $entry['jnxBgpM2PeerIndex'] . "\n"); }
$j_peerIndexes[$ip] = $entry['jnxBgpM2PeerIndex'];
break;
case 'ipv6':
$ip6 = trim(str_replace(' ','',$entry['jnxBgpM2PeerRemoteAddr']),'"');
$ip6 = substr($ip6,0,4) . ':' . substr($ip6,4,4) . ':' . substr($ip6,8,4) . ':' . substr($ip6,12,4) . ':' . substr($ip6,16,4) . ':' . substr($ip6,20,4) . ':' . substr($ip6,24,4) . ':' . substr($ip6,28,4);
$ip6 = Net_IPv6::compress($ip6);
if ($debug) { echo("peerindex for ipv6 $ip6 is " . $entry['jnxBgpM2PeerIndex'] . "\n"); }
$j_peerIndexes[$ip6] = $entry['jnxBgpM2PeerIndex'];
break;
default:
@@ -146,7 +151,7 @@ if ($config['enable_bgp'])
$j_afisafi[$index][] = $afisafi;
}
}
foreach ($j_afisafi[$j_peerIndexes[$peer['ip']]] as $afisafi)
{
list ($afi,$safi) = explode('.',$afisafi); $safi = $safis[$safi];