nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-03 08:01:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

ospf fixes from Bill Fenner, plus some cleanup

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2217 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-05-02 15:16:33 +00:00
parent 65826fc1f3
commit eb2d53bec1
1 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/polling/ospf.inc.php
+19 -11
View File
@@ -49,7 +49,7 @@ if (is_array($ospf_instances_db))
{
foreach ($ospf_instances_db as $ospf_instance_db)
{
$ospf_instance_poll = $ospf_instances_poll[$ospf_db['ospf_instance_id']];
$ospf_instance_poll = $ospf_instances_poll[$ospf_instance_db['ospf_instance_id']];
foreach ($ospf_oids_db as $oid)
{ // Loop the OIDs
if ($ospf_instance_db[$oid] != $ospf_instance_poll[$oid])
@@ -58,7 +58,7 @@ if (is_array($ospf_instances_db))
#log_event("$oid -> ".$this_port[$oid], $device, 'ospf', $port['interface_id']); ## FIXME
}
}
if($update)
if ($ospf_instance_update)
{
$query = "UPDATE `ospf_instances` SET `ospf_instance_id` = '".$ospf_instance_db['ospf_instance_id']."'".$ospf_instance_update." WHERE `device_id` = '".$device['device_id']."' AND `ospf_instance_id` = '".$ospf_instance_id."'";
if ($debug) {echo($query);} ## Debug
@@ -127,10 +127,11 @@ if (is_array($ospf_areas_db))
#log_event("$oid -> ".$this_port[$oid], $device, 'interface', $port['interface_id']); ## FIXME
}
}
if($update)
if ($ospf_area_update)
{
mysql_query("UPDATE `ospf_areas` SET `ospfAreaId` = '".$ospf_area_db['ospfAreaId']."'".$ospf_area_update." WHERE `device_id` = '".$device['device_id']."' AND `ospfAreaId` = '".$ospf_area_id."'");
if($debug) { echo("UPDATE `ospf_instances` SET `ospfAreaId` = '".$ospf_area_db['ospfAreaId']."'".$ospf_area_update." WHERE `device_id` = '".$device['device_id']."' AND `ospfAreaId` = '".$ospf_area_id."'");}
$sql = "UPDATE `ospf_areas` SET `ospfAreaId` = '".$ospf_area_db['ospfAreaId']."'".$ospf_area_update." WHERE `device_id` = '".$device['device_id']."' AND `ospfAreaId` = '".$ospf_area_id."'";
mysql_query($sql);
if ($debug) { echo("$sql\n"); }
echo("U");
unset($ospf_area_update);
} else {
@@ -175,7 +176,8 @@ foreach($ospf_ports_poll as $ospf_port_id => $ospf_port)
}
}
if($debug) {
if ($debug)
{
echo("\nPolled: ");
print_r($ospf_ports_poll);
echo("Database: ");
@@ -184,10 +186,12 @@ if($debug) {
}
### Loop array of entries and update
if (is_array($ospf_ports_db)){
if (is_array($ospf_ports_db))
{
foreach ($ospf_ports_db as $ospf_port_id => $ospf_port_db)
{
if(is_array($ospf_ports_poll[$ospf_port_db['ospf_port_id']])) {
if (is_array($ospf_ports_poll[$ospf_port_db['ospf_port_id']]))
{
$ospf_port_poll = $ospf_ports_poll[$ospf_port_db['ospf_port_id']];
if ($ospf_port_poll['ospfAddressLessIf'])
@@ -265,7 +269,8 @@ foreach($ospf_nbrs_poll as $ospf_nbr_id => $ospf_nbr)
}
}
if($debug) {
if ($debug)
{
echo("\nPolled: ");
print_r($ospf_nbrs_poll);
echo("Database: ");
@@ -274,10 +279,12 @@ if($debug) {
}
### Loop array of entries and update
if (is_array($ospf_nbrs_db)){
if (is_array($ospf_nbrs_db))
{
foreach ($ospf_nbrs_db as $ospf_nbr_id => $ospf_nbr_db)
{
if(is_array($ospf_nbrs_poll[$ospf_nbr_db['ospf_nbr_id']])) {
if (is_array($ospf_nbrs_poll[$ospf_nbr_db['ospf_nbr_id']]))
{
$ospf_nbr_poll = $ospf_nbrs_poll[$ospf_nbr_db['ospf_nbr_id']];
$ospf_nbr_poll['interface_id'] = @mysql_result(mysql_query("SELECT A.`interface_id` FROM ipv4_addresses AS A, nbrs AS I WHERE A.ipv4_address = '".$ospf_nbr_poll['ospfNbrIpAddr']."' AND I.interface_id = A.interface_id AND I.device_id = '".$device['device_id']."'"),0);
@@ -306,6 +313,7 @@ if (is_array($ospf_nbrs_db)){
} else {
echo(".");
}
unset($ospf_nbr_poll);
unset($ospf_nbr_db);
$ospf_nbr_count++;