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

feature: Add q-bridge-mib tagged VLAN membership #3285

Browse Source
This commit is contained in:
Eldon Koyle
2016-10-11 15:29:06 -06:00
committed by Neil Lathwood
parent 626ce47b0f
commit 7ca80410d5
8 changed files with 152 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
html/includes/print-vlan.inc.php
View File

@@ -12,15 +12,21 @@ echo '<td width=100 class=list-large> Vlan '.$vlan['vlan_vlan'].'</td>';
echo '<td width=200 class=box-desc>'.$vlan['vlan_name'].'</td>';
echo '<td class=list-bold>';
$vlan_ports = array();
$otherports = dbFetchRows('SELECT * FROM `ports_vlans` AS V, `ports` as P WHERE V.`device_id` = ? AND V.`vlan` = ? AND P.port_id = V.port_id', array($device['device_id'], $vlan['vlan_vlan']));
$vlan_ports = array();
$traverse_ifvlan = true;
$otherports = dbFetchRows('SELECT * FROM `ports_vlans` AS V, `ports` as P WHERE V.`device_id` = ? AND V.`vlan` = ? AND P.port_id = V.port_id', array($device['device_id'], $vlan['vlan_vlan']));
foreach ($otherports as $otherport) {
if ($otherport['untagged']) {
$traverse_ifvlan = false;
}
$vlan_ports[$otherport[ifIndex]] = $otherport;
}
$otherports = dbFetchRows('SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?', array($device['device_id'], $vlan['vlan_vlan']));
foreach ($otherports as $otherport) {
$vlan_ports[$otherport[ifIndex]] = array_merge($otherport, array('untagged' => '1'));
if ($traverse_ifvlan) {
$otherports = dbFetchRows('SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?', array($device['device_id'], $vlan['vlan_vlan']));
foreach ($otherports as $otherport) {
$vlan_ports[$otherport[ifIndex]] = array_merge($otherport, array('untagged' => '1'));
}
}
ksort($vlan_ports);

15
html/pages/device/port/vlans.inc.php
View File

@@ -30,15 +30,24 @@ foreach ($vlans as $vlan) {
echo '<td>'.$vlan['cost'].'</td><td>'.$vlan['priority']."</td><td class=$class>".$vlan['state'].'</td>';
$traverse_ifvlan = true;
$vlan_ports = array();
$otherports = dbFetchRows('SELECT * FROM `ports_vlans` AS V, `ports` as P WHERE V.`device_id` = ? AND V.`vlan` = ? AND P.port_id = V.port_id', array($device['device_id'], $vlan['vlan']));
foreach ($otherports as $otherport) {
if ($otherport['untagged']) {
$traverse_ifvlan = false;
}
$vlan_ports[$otherport[ifIndex]] = $otherport;
}
$otherports = dbFetchRows('SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?', array($device['device_id'], $vlan['vlan']));
foreach ($otherports as $otherport) {
$vlan_ports[$otherport[ifIndex]] = array_merge($otherport, array('untagged' => '1'));
if ($traverse_ifvlan) {
$otherports = dbFetchRows(
'SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?',
array($device['device_id'], $vlan['vlan'])
);
foreach ($otherports as $otherport) {
$vlan_ports[$otherport[ifIndex]] = array_merge($otherport, array('untagged' => '1'));
}
}
ksort($vlan_ports);

21
includes/discovery/vlans.inc.php
View File

@@ -8,6 +8,7 @@ foreach ($vlans_db_raw as $vlan_db) {
// Create an empty array to record what VLANs we discover this session.
$device['vlans'] = array();
$valid_vlan_port_ids = array();
require 'includes/discovery/vlans/q-bridge-mib.inc.php';
require 'includes/discovery/vlans/cisco-vtp.inc.php';
@@ -15,11 +16,8 @@ require 'includes/discovery/vlans/cisco-vtp.inc.php';
// Fetch switchport <> VLAN relationships. This is DIRTY.
foreach ($device['vlans'] as $domain_id => $vlans) {
foreach ($vlans as $vlan_id => $vlan) {
// Pull Tables for this VLAN
// /usr/bin/snmpbulkwalk -v2c -c kglk5g3l454@988 -OQUs -m BRIDGE-MIB -M /opt/librenms/mibs/ udp:sw2.ahf:161 dot1dStpPortEntry
// /usr/bin/snmpbulkwalk -v2c -c kglk5g3l454@988 -OQUs -m BRIDGE-MIB -M /opt/librenms/mibs/ udp:sw2.ahf:161 dot1dBasePortEntry
// FIXME - do this only when vlan type == ethernet?
if (is_numeric($vlan_id) && ($vlan_id < 1002 || $vlan_id > 1105)) {
if (is_numeric($vlan_id) && ($vlan_id < 1002 || $vlan_id > 1005)) {
// Ignore reserved VLAN IDs
if ($device['os_group'] == 'cisco' || $device['os'] == 'ios') {
// This shit only seems to work on IOS
@@ -27,6 +25,8 @@ foreach ($device['vlans'] as $domain_id => $vlans) {
$vlan_device = array_merge($device, array('community' => $device['community'].'@'.$vlan_id));
$vlan_data = snmpwalk_cache_oid($vlan_device, 'dot1dStpPortEntry', array(), 'BRIDGE-MIB:Q-BRIDGE-MIB');
$vlan_data = snmpwalk_cache_oid($vlan_device, 'dot1dBasePortEntry', $vlan_data, 'BRIDGE-MIB:Q-BRIDGE-MIB');
} elseif (isset($qbridge_data)) {
$vlan_data = $qbridge_data[$vlan_id];
}
echo "VLAN $vlan_id \n";
@@ -49,18 +49,21 @@ foreach ($device['vlans'] as $domain_id => $vlans) {
$db_a['priority'] = isset($vlan_port['dot1dStpPortPriority']) ? $vlan_port['dot1dStpPortPriority'] : 0;
$db_a['state'] = isset($vlan_port['dot1dStpPortState']) ? $vlan_port['dot1dStpPortState'] : 'unknown';
$db_a['cost'] = isset($vlan_port['dot1dStpPortPathCost']) ? $vlan_port['dot1dStpPortPathCost'] : 0;
$db_a['untagged'] = isset($vlan_port['untagged']) ? $vlan_port['untagged'] : 0;
$from_db = dbFetchRow('SELECT * FROM `ports_vlans` WHERE device_id = ? AND port_id = ? AND `vlan` = ?', array($device['device_id'], $port['port_id'], $vlan_id));
if ($from_db['port_vlan_id']) {
dbUpdate($db_a, 'ports_vlans', '`port_vlan_id` = ?', array($from_db['port_vlan_id']));
$db_id = $from_db['port_vlan_id'];
dbUpdate($db_a, 'ports_vlans', '`port_vlan_id` = ?', array($db_id));
echo 'Updated';
} else {
dbInsert(array_merge($db_w, $db_a), 'ports_vlans');
$db_id = dbInsert(array_merge($db_w, $db_a), 'ports_vlans');
echo 'Inserted';
}
$valid_vlan_port_ids[] = $db_id;
echo "\n";
echo PHP_EOL;
}//end foreach
}//end if
}//end foreach
@@ -74,4 +77,8 @@ foreach ($vlans_db as $domain_id => $vlans) {
}
}
// remove non-existent port-vlan mappings
$num = dbDelete('ports_vlans', '`device_id`=? AND `port_vlan_id` NOT IN ('.join(',', $valid_vlan_port).')', array($device['device_id']));
d_echo("Deleted $num vlan mappings\n");
unset($device['vlans']);

8
includes/discovery/vlans/cisco-vtp.inc.php
View File

@@ -1,7 +1,7 @@
<?php
if ($device['os_group'] == 'cisco') {
echo 'Cisco VLANs : ';
echo "Cisco VLANs:\n";
// Not sure why we check for VTP, but this data comes from that MIB, so...
$vtpversion = snmp_get($device, 'vtpVersion.0', '-OnvQ', 'CISCO-VTP-MIB');
@@ -11,9 +11,9 @@ if ($device['os_group'] == 'cisco') {
$vlans = snmpwalk_cache_twopart_oid($device, 'vtpVlanEntry', array(), 'CISCO-VTP-MIB');
foreach ($vtpdomains as $vtpdomain_id => $vtpdomain) {
echo 'VTP Domain '.$vtpdomain_id.' '.$vtpdomain['managementDomainName'].' ';
echo 'VTP Domain '.$vtpdomain_id.' '.$vtpdomain['managementDomainName'].' ';
foreach ($vlans[$vtpdomain_id] as $vlan_id => $vlan) {
echo " $vlan_id";
d_echo(" $vlan_id");
if (is_array($vlans_db[$vtpdomain_id][$vlan_id])) {
echo '.';
} else {
@@ -22,7 +22,7 @@ if ($device['os_group'] == 'cisco') {
}
$device['vlans'][$vtpdomain_id][$vlan_id] = $vlan_id;
}
echo PHP_EOL;
}
}
echo "\n";
}

33
includes/discovery/vlans/q-bridge-mib.inc.php
View File

@@ -1,26 +1,43 @@
<?php
echo 'IEEE8021-Q-BRIDGE-MIB VLANs : ';
echo 'IEEE8021-Q-BRIDGE-MIB VLANs: ';
$vlanversion = snmp_get($device, 'dot1qVlanVersionNumber.0', '-Oqv', 'IEEE8021-Q-BRIDGE-MIB');
if ($vlanversion == 'version1' || $vlanversion == '2') {
echo "VLAN $vlanversion ";
echo "ver $vlanversion ";
$qbridge_data = array();
$vtpdomain_id = '1';
$vlans = snmpwalk_cache_oid($device, 'dot1qVlanStaticName', array(), 'IEEE8021-Q-BRIDGE-MIB');
$vlans = snmpwalk_cache_oid($device, 'dot1qVlanStaticName', array(), 'Q-BRIDGE-MIB');
$tagoruntag = snmpwalk_cache_oid($device, 'dot1qVlanCurrentEgressPorts', array(), 'Q-BRIDGE-MIB', null, '-OQUs --hexOutputLength=0');
$untag = snmpwalk_cache_oid($device, 'dot1qVlanCurrentUntaggedPorts', array(), 'Q-BRIDGE-MIB', null, '-OQUs --hexOutputLength=0');
$base_indexes = snmpwalk_cache_oid($device, 'dot1dBasePortIfIndex', array(), 'BRIDGE-MIB');
foreach ($vlans as $vlan_id => $vlan) {
echo " $vlan_id";
d_echo(" $vlan_id");
if (is_array($vlans_db[$vtpdomain_id][$vlan_id])) {
echo '.';
} else {
dbInsert(array('device_id' => $device['device_id'], 'vlan_domain' => $vtpdomain_id, 'vlan_vlan' => $vlan_id, 'vlan_name' => $vlan['dot1qVlanStaticName'], 'vlan_type' => array('NULL')), 'vlans');
dbInsert(array(
'device_id' => $device['device_id'],
'vlan_domain' => $vtpdomain_id,
'vlan_vlan' => $vlan_id,
'vlan_name' => $vlan['dot1qVlanStaticName'],
'vlan_type' => array('NULL')
), 'vlans');
echo '+';
}
$device['vlans'][$vtpdomain_id][$vlan_id] = $vlan_id;
$id = "0.$vlan_id";
$untagged_indexes = q_bridge_bits2indices($untag[$id]['dot1qVlanCurrentUntaggedPorts']);
$egress_indexes = q_bridge_bits2indices($tagoruntag[$id]['dot1qVlanCurrentEgressPorts']);
foreach ($egress_indexes as $port_index) {
$qbridge_data[$vlan_id][$port_index] = $base_indexes[$port_index];
$qbridge_data[$vlan_id][$port_index]['untagged'] = (in_array($port_index, $untagged_indexes) ? 1 : 0);
}
}
}
echo "\n";
echo PHP_EOL;

38
includes/functions.php
View File

@@ -1647,3 +1647,41 @@ function getCIMCentPhysical($location, &$entphysical, &$index)
return $index;
} // end if - Level 1
} // end function
/* idea from http://php.net/manual/en/function.hex2bin.php comments */
function hex2bin_compat($str)
{
if (strlen($str) % 2 !== 0) {
trigger_error(__FUNCTION__.'(): Hexadecimal input string must have an even length', E_USER_WARNING);
}
return pack("H*", $str);
}
if (!function_exists('hex2bin')) {
// This is only a hack
function hex2bin($str)
{
return hex2bin_compat($str);
}
}
function q_bridge_bits2indices($hex_data)
{
/* convert hex string to an array of 1-based indices of the nonzero bits
* ie. '9a00' -> '100110100000' -> array(1, 4, 5, 7)
*/
$hex_data = str_replace(' ', '', $hex_data);
$value = hex2bin($hex_data);
$length = strlen($value);
$indices = array();
for ($i = 0; $i < $length; $i++) {
$byte = ord($value[$i]);
for ($j = 7; $j >= 0; $j--) {
if ($byte & (1 << $j)) {
$indices[] = 8*$i + 8-$j;
}
}
}
return $indices;
}

1
sql-schema/144.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE `ports_vlans` ADD `untagged` TINYINT NOT NULL DEFAULT '0' AFTER `cost`;

47
tests/VlanFunctionsTest.php Normal file
View File

@@ -0,0 +1,47 @@
<?php
/**
* CommonFunctionsTest.php
*
* -Description-
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package LibreNMS
* @link http://librenms.org
* @copyright 2016 Tony Murray
* @author Tony Murray <murraytony@gmail.com>
*/
namespace LibreNMS\Tests;
include 'includes/discovery/vlans/vlan_functions.inc.php';
class VlanFunctionsTest extends \PHPUnit_Framework_TestCase
{
public function testQBridgeBits2Indices()
{
$bits = "8040 201008040201 ff000000 000000";
$indices = array(1, 10, 19, 28, 37, 46, 55, 64, 65, 66, 67, 68, 69, 70, 71, 72);
$this->assertTrue(q_bridge_bits2indices($bits) == $indices);
}
public function testHex2Bin()
{
$hexstr = "54686973206973206f6e6c79206120746573742e00ff";
$binstr = "This is only a test.\x00\xff";
$this->assertTrue(hex2bin($hexstr) === $binstr);
$this->assertTrue(hex2bin_compat($hexstr) === $binstr);
}
}