From 2fd11cf9d0bdf5a2c20580b7bfdd6bc9ca91eaaa Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Tue, 8 Mar 2011 17:34:17 +0000 Subject: [PATCH] apply last bgp patch, thanks to yeled for testing git-svn-id: http://www.observium.org/svn/observer/trunk@1807 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/discovery/bgp-peers.inc.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/includes/discovery/bgp-peers.inc.php b/includes/discovery/bgp-peers.inc.php index 9413c2f78..99b4d2788 100755 --- a/includes/discovery/bgp-peers.inc.php +++ b/includes/discovery/bgp-peers.inc.php @@ -87,13 +87,7 @@ if ($config['enable_bgp']) ## Get afi/safi and populate cbgp on cisco ios (xe/xr) unset($af_list); - # FIXME: this could be replaced by the following line: - # $af_data = snmp_walk($device, "cbgpPeerAddrFamilyName." . $peer['ip'], "-OsQ", "CISCO-BGP4-MIB", $config['mibdir']); - # but I am unable to test it for now. - $af_cmd = $config['snmpwalk'] . " -M " . $config['mibdir'] . " -CI -m CISCO-BGP4-MIB -OsQ -" . $device['snmpver'] . " -c" . $device['community'] . " " . $device['hostname'].":".$device['port'] . " "; - $af_cmd .= "cbgpPeerAddrFamilyName." . $peer['ip']; - $af_data = shell_exec($af_cmd); - # FIXME replace until here + $af_data = snmp_walk($device, "cbgpPeerAddrFamilyName." . $peer['ip'], "-OsQ", "CISCO-BGP4-MIB", $config['mibdir']); if ($debug) { echo("afi data :: $af_data \n"); } $afs = trim(str_replace("cbgpPeerAddrFamilyName.".$peer['ip'].".", "", $af_data));