Skip to content

Commit

Permalink
Merge pull request #3938 from laf/issue-3877
Browse files Browse the repository at this point in the history 
Update BGP Discover + Polling and WebUI
  • Loading branch information
@murrant
murrant committed Aug 9, 2016
2 parents 633c4c4 + d56ff8b commit 3d945d2
Show file tree
Hide file tree
Showing 5 changed files with 145 additions and 141 deletions.
4 changes: 3 additions & 1 deletion html/pages/device/routing/bgp.inc.php
View file
Expand Up @@ -41,6 +41,7 @@

if ($vars['view'] == 'prefixes_ipv4unicast') {
echo "<span class='pagemenu-selected'>";
$extra_sql = " AND `bgpLocalAddr` NOT LIKE '%:%'";
}

echo generate_link('IPv4', $link_array, array('view' => 'prefixes_ipv4unicast'));
Expand All @@ -63,6 +64,7 @@

if ($vars['view'] == 'prefixes_ipv6unicast') {
echo "<span class='pagemenu-selected'>";
$extra_sql = " AND `bgpLocalAddr` LIKE '%:%'";
}

echo generate_link('IPv6', $link_array, array('view' => 'prefixes_ipv6unicast'));
Expand Down Expand Up @@ -98,7 +100,7 @@

$i = '1';

foreach (dbFetchRows('SELECT * FROM `bgpPeers` WHERE `device_id` = ? ORDER BY `bgpPEerRemoteAs`, `bgpPeerIdentifier`', array($device['device_id'])) as $peer) {
foreach (dbFetchRows("SELECT * FROM `bgpPeers` WHERE `device_id` = ? $extra_sql ORDER BY `bgpPeerRemoteAs`, `bgpPeerIdentifier`", array($device['device_id'])) as $peer) {
$has_macaccounting = dbFetchCell('SELECT COUNT(*) FROM `ipv4_mac` AS I, mac_accounting AS M WHERE I.ipv4_address = ? AND M.mac = I.mac_address', array($peer['bgpPeerIdentifier']));
unset($bg_image);
if (!is_integer($i / 2)) {
Expand Down
4 changes: 3 additions & 1 deletion html/pages/routing/bgp.inc.php
View file
Expand Up @@ -111,6 +111,7 @@
echo ' | Prefixes: Unicast (';
if ($vars['graph'] == 'prefixes_ipv4unicast') {
echo "<span class='pagemenu-selected'>";
$extra_sql = " AND `bgpLocalAddr` NOT LIKE '%:%'";
}

echo generate_link('IPv4', $vars, array('view' => 'graphs', 'graph' => 'prefixes_ipv4unicast'));
Expand All @@ -122,6 +123,7 @@

if ($vars['graph'] == 'prefixes_ipv6unicast') {
echo "<span class='pagemenu-selected'>";
$extra_sql = " AND `bgpLocalAddr` LIKE '%:%'";
}

echo generate_link('IPv6', $vars, array('view' => 'graphs', 'graph' => 'prefixes_ipv6unicast'));
Expand Down Expand Up @@ -213,7 +215,7 @@
$where .= " AND (B.bgpPeerState != 'established')";
}

$peer_query = 'select * from bgpPeers AS B, devices AS D WHERE B.device_id = D.device_id '.$where.' ORDER BY D.hostname, B.bgpPeerRemoteAs, B.bgpPeerIdentifier';
$peer_query = "SELECT * FROM `bgpPeers` AS `B`, `devices` AS `D` WHERE `B`.`device_id` = `D`.`device_id` $where $extra_sql ORDER BY `D`.`hostname`, `B`.`bgpPeerRemoteAs`, `B`.`bgpPeerIdentifier`";
foreach (dbFetchRows($peer_query) as $peer) {
unset($alert, $bg_image);

Expand Down
80 changes: 43 additions & 37 deletions includes/discovery/bgp-peers.inc.php
View file
@@ -1,7 +1,7 @@
<?php
if ($config['enable_bgp']) {
// Discover BGP peers

if( key_exists('vrf_lite_cisco', $device) && (count($device['vrf_lite_cisco'])!=0) ){
$vrfs_lite_cisco = $device['vrf_lite_cisco'];
}
Expand All @@ -21,53 +21,59 @@
}

$peer2 = false;
$peers_data = snmp_walk($device, 'cbgpPeer2RemoteAs', '-Oq', 'CISCO-BGP4-MIB', $config['mibdir']);
if (empty($peers_data)) {
$peers_data = snmp_walk($device, 'BGP4-MIB::bgpPeerRemoteAs', '-Oq', 'BGP4-MIB', $config['mibdir']);
}
else {
$peer2 = true;
}
if ($device['os'] !== 'junos') {
$peers_data = snmp_walk($device, 'cbgpPeer2RemoteAs', '-Oq', 'CISCO-BGP4-MIB', $config['mibdir']);
if (empty($peers_data)) {
$peers_data = snmp_walk($device, 'BGP4-MIB::bgpPeerRemoteAs', '-Oq', 'BGP4-MIB', $config['mibdir']);
}
else {
$peer2 = true;
}

d_echo("Peers : $peers_data \n");
d_echo("Peers : $peers_data \n");

$peers = trim(str_replace('CISCO-BGP4-MIB::cbgpPeer2RemoteAs.', '', $peers_data));
$peers = trim(str_replace('BGP4-MIB::bgpPeerRemoteAs.', '', $peers));
$peers = trim(str_replace('CISCO-BGP4-MIB::cbgpPeer2RemoteAs.', '', $peers_data));
$peers = trim(str_replace('BGP4-MIB::bgpPeerRemoteAs.', '', $peers));

foreach (explode("\n", $peers) as $peer) {
if ($peer2 === true) {
list($ver, $peer) = explode('.', $peer, 2);
}
foreach (explode("\n", $peers) as $peer) {
if ($peer2 === true) {
list($ver, $peer) = explode('.', $peer, 2);
}

list($peer_ip, $peer_as) = explode(' ', $peer);
if (strstr($peer_ip, ':')) {
$peer_ip_snmp = preg_replace('/:/', ' ', $peer_ip);
$peer_ip = preg_replace('/(\S+\s+\S+)\s/', '$1:', $peer_ip_snmp);
$peer_ip = str_replace('"', '', str_replace(' ', '', $peer_ip));
}
list($peer_ip, $peer_as) = explode(' ', $peer);
if (strstr($peer_ip, ':')) {
$peer_ip_snmp = preg_replace('/:/', ' ', $peer_ip);
$peer_ip = preg_replace('/(\S+\s+\S+)\s/', '$1:', $peer_ip_snmp);
$peer_ip = str_replace('"', '', str_replace(' ', '', $peer_ip));
}

if ($peer && $peer_ip != '0.0.0.0') {
d_echo("Found peer $peer_ip (AS$peer_as)\n");
if ($peer && $peer_ip != '0.0.0.0') {
d_echo("Found peer $peer_ip (AS$peer_as)\n");

$peerlist[] = array(
'ip' => $peer_ip,
'as' => $peer_as,
'ver' => $ver,
);
$peerlist[] = array(
'ip' => $peer_ip,
'as' => $peer_as,
'ver' => $ver,
);
}
}
}

if ($device['os'] == 'junos') {
} elseif ($device['os'] == 'junos') {
// Juniper BGP4-V2 MIB
// FIXME: needs a big cleanup! also see below.
// FIXME: is .0.ipv6 the only possible value here?
$result = snmp_walk($device, 'jnxBgpM2PeerRemoteAs.0.ipv6', '-Onq', 'BGP4-V2-MIB-JUNIPER', $config['install_dir'].'/mibs/junos');
$peers = trim(str_replace('.1.3.6.1.4.1.2636.5.1.1.2.1.1.1.13.0.', '', $result));
$result = snmp_walk($device, 'jnxBgpM2PeerRemoteAs', '-Onq', 'BGP4-V2-MIB-JUNIPER', $config['install_dir'].'/mibs/junos');
$peers = trim(str_replace('.1.3.6.1.4.1.2636.5.1.1.2.1.1.1.13.', '', $result));
foreach (explode("\n", $peers) as $peer) {
list($peer_ip_snmp, $peer_as) = explode(' ', $peer);

// Magic! Basically, takes SNMP form and finds peer IPs from the walk OIDs.
$peer_ip = Net_IPv6::compress(snmp2ipv6(implode('.', array_slice(explode('.', $peer_ip_snmp), (count(explode('.', $peer_ip_snmp)) - 16)))));
$octets = count(explode(".", $peer_ip_snmp));
if ($octets > 11) {
// ipv6
$peer_ip = Net_IPv6::compress(snmp2ipv6(implode('.', array_slice(explode('.', $peer_ip_snmp), (count(explode('.', $peer_ip_snmp)) - 16)))));
} else {
// ipv4
$peer_ip = implode('.', array_slice(explode('.', $peer_ip_snmp), (count(explode('.', $peer_ip_snmp)) - 4)));
}

if ($peer) {
d_echo("Found peer $peer_ip (AS$peer_as)\n");
Expand Down Expand Up @@ -150,8 +156,8 @@
$safis[2] = 'multicast';

if (!isset($j_peerIndexes)) {
$j_bgp = snmpwalk_cache_multi_oid($device, 'jnxBgpM2PeerTable', $jbgp, 'BGP4-V2-MIB-JUNIPER', $config['install_dir'].'/mibs/junos');

$j_bgp = snmpwalk_cache_multi_oid($device, 'jnxBgpM2PeerEntry', $jbgp, 'BGP4-V2-MIB-JUNIPER', $config['install_dir'].'/mibs/junos');
print_r($j_bgp);
foreach ($j_bgp as $index => $entry) {
switch ($entry['jnxBgpM2PeerRemoteAddrType']) {
case 'ipv4':
Expand Down

0 comments on commit 3d945d2

Please sign in to comment.