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

Fixed vlan discover so there isn't any more SQL errors. Will need further testing.

Browse Source
This commit is contained in:
mchasteen
2015-02-16 10:50:22 -07:00
committed by laf
parent 357af32654
commit b73f642bc6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,16 +55,16 @@ foreach ($device['vlans'] as $domain_id => $vlans)
'port_id' => $port['port_id'], 'port_id' => $port['port_id'],
'vlan' => $vlan_id); 'vlan' => $vlan_id);
$db_a = array('baseport' => $vlan_port_id, $db_a['baseport'] = $vlan_port_id;
'priority' => $vlan_port['dot1dStpPortPriority'], $db_a['priority'] = isset($vlan_port['dot1dStpPortPriority']) ? $vlan_port['dot1dStpPortPriority'] : 0;
'state' => $vlan_port['dot1dStpPortState'], $db_a['state'] = isset($vlan_port['dot1dStpPortState']) ? $vlan_port['dot1dStpPortState'] : "unknown";
'cost' => $vlan_port['dot1dStpPortPathCost']); $db_a['cost'] = isset($vlan_port['dot1dStpPortPathCost']) ? $vlan_port['dot1dStpPortPathCost'] : 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)); $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']) if ($from_db['port_vlan_id'])
{ {
dbUpdate($db_a, 'ports_vlans', "`port_vlan_id` = ?", $from_db['port_vlan_id']); dbUpdate($db_a, 'ports_vlans', "`port_vlan_id` = ". $from_db['port_vlan_id']);
echo("Updated"); echo("Updated");
} else { } else {
dbInsert(array_merge($db_w, $db_a), 'ports_vlans'); dbInsert(array_merge($db_w, $db_a), 'ports_vlans');