From 653696b9494745e03f06647a4bd57d58732aaaa0 Mon Sep 17 00:00:00 2001 From: einhirn Date: Thu, 18 Jun 2015 16:31:26 +0200 Subject: [PATCH 1/3] fixed a bug where stale link/device data would lead to broken map --- html/includes/print-map.inc.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/html/includes/print-map.inc.php b/html/includes/print-map.inc.php index c8fcf1249..f990580a3 100644 --- a/html/includes/print-map.inc.php +++ b/html/includes/print-map.inc.php @@ -12,7 +12,11 @@ * the source code distribution for details. */ +//Don't know where this should come from, but it is used later, so I just define it here. +$row_colour="#ffffff"; + $tmp_devices = array(); +$sql_array= array(); if (!empty($device['hostname'])) { $sql = ' WHERE `devices`.`hostname`=?'; $sql_array = array($device['hostname']); @@ -20,17 +24,22 @@ if (!empty($device['hostname'])) { $sql = ' WHERE 1'; } -$sql .= ' AND `local_device_id` != 0 AND `remote_device_id` != 0'; +$sql .= ' AND `local_device_id` != 0 AND `remote_device_id` != 0 '; +$sql .= ' AND `local_device_id` IS NOT NULL AND `remote_device_id` IS NOT NULL '; $tmp_ids = array(); foreach (dbFetchRows("SELECT DISTINCT least(`devices`.`device_id`, `remote_device_id`) AS `remote_device_id`, GREATEST(`remote_device_id`,`devices`.`device_id`) AS `local_device_id` FROM `links` LEFT JOIN `ports` ON `local_port_id`=`ports`.`port_id` LEFT JOIN `devices` ON `ports`.`device_id`=`devices`.`device_id` $sql", $sql_array) as $link_devices) { if (!in_array($link_devices['local_device_id'], $tmp_ids) && device_permitted($link_devices['local_device_id'])) { $link_dev = dbFetchRow("SELECT * FROM `devices` WHERE `device_id`=?",array($link_devices['local_device_id'])); - $tmp_devices[] = array('id'=>$link_devices['local_device_id'],'label'=>$link_dev['hostname'],'title'=>generate_device_link($link_dev,'',array(),'','','',0),'group'=>$link_dev['location'],'shape'=>'box'); + if (!empty($link_dev)) { + $tmp_devices[] = array('id'=>$link_devices['local_device_id'],'label'=>$link_dev['hostname'],'title'=>generate_device_link($link_dev,'',array(),'','','',0),'group'=>$link_dev['location'],'shape'=>'box'); + } } if (!in_array($link_devices['remote_device_id'], $tmp_ids) && device_permitted($link_devices['remote_device_id'])) { $link_dev = dbFetchRow("SELECT * FROM `devices` WHERE `device_id`=?",array($link_devices['remote_device_id'])); - $tmp_devices[] = array('id'=>$link_devices['remote_device_id'],'label'=>$link_dev['hostname'],'title'=>generate_device_link($link_dev,'',array(),'','','',0),'group'=>$link_dev['location'],'shape'=>'box'); + if (!empty($link_dev)) { + $tmp_devices[] = array('id'=>$link_devices['remote_device_id'],'label'=>$link_dev['hostname'],'title'=>generate_device_link($link_dev,'',array(),'','','',0),'group'=>$link_dev['location'],'shape'=>'box'); + } } array_push($tmp_ids,$link_devices['local_device_id']); array_push($tmp_ids,$link_devices['remote_device_id']); @@ -51,7 +60,7 @@ if (is_array($tmp_devices[0])) { } if ($v['id'] == $link_devices['remote_device_id']) { $to = $v['id']; - $port .= ' > ' .shorten_interface_type($link_devices['remote_port']); + $port = ' > ' .shorten_interface_type($link_devices['remote_port']); } } $speed = $link_devices['ifSpeed']/1000/1000; @@ -81,7 +90,7 @@ if (is_array($tmp_devices[0])) { } $link_color = $config['map_legend'][$link_used]; - $tmp_links[] = array('from'=>$from,'to'=>$to,'label'=>$port,'title'=>generate_port_link($port_data, "",'',0,1),'width'=>$width,'color'=>$link_color); + $tmp_links[] = array('from'=>$from,'to'=>$to,'label'=>$port,'title'=>generate_port_link($port_data, "",'',0,1),'width'=>$width,'color'=>$link_color); } $edges = json_encode($tmp_links); From fdfe776c5af29552917c784b149a608c537a388a Mon Sep 17 00:00:00 2001 From: einhirn Date: Thu, 18 Jun 2015 16:57:36 +0200 Subject: [PATCH 2/3] minor correction about being undefined in some cases --- html/includes/print-map.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/html/includes/print-map.inc.php b/html/includes/print-map.inc.php index f990580a3..65b9e9068 100644 --- a/html/includes/print-map.inc.php +++ b/html/includes/print-map.inc.php @@ -53,6 +53,7 @@ if (is_array($tmp_devices[0])) { $tmp_links = array(); foreach (dbFetchRows("SELECT local_device_id, remote_device_id, `remote_hostname`,`ports`.*, `remote_port` FROM `links` LEFT JOIN `ports` ON `local_port_id`=`ports`.`port_id` LEFT JOIN `devices` ON `ports`.`device_id`=`devices`.`device_id` WHERE (`local_device_id` IN ($tmp_ids) AND `remote_device_id` IN ($tmp_ids))") as $link_devices) { foreach ($tmp_devices as $k=>$v) { + $port=''; if ($v['id'] == $link_devices['local_device_id']) { $from = $v['id']; $port = shorten_interface_type($link_devices['ifName']); @@ -60,7 +61,7 @@ if (is_array($tmp_devices[0])) { } if ($v['id'] == $link_devices['remote_device_id']) { $to = $v['id']; - $port = ' > ' .shorten_interface_type($link_devices['remote_port']); + $port .= ' > ' .shorten_interface_type($link_devices['remote_port']); } } $speed = $link_devices['ifSpeed']/1000/1000; From 94ea73a5953eb57bf59281bd19b4e4f1dcd96175 Mon Sep 17 00:00:00 2001 From: einhirn Date: Thu, 18 Jun 2015 18:29:55 +0200 Subject: [PATCH 3/3] another minor correction about $port being undefined in some cases --- html/includes/print-map.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/includes/print-map.inc.php b/html/includes/print-map.inc.php index 65b9e9068..ad1bf8a55 100644 --- a/html/includes/print-map.inc.php +++ b/html/includes/print-map.inc.php @@ -52,8 +52,8 @@ $nodes = json_encode($tmp_devices); if (is_array($tmp_devices[0])) { $tmp_links = array(); foreach (dbFetchRows("SELECT local_device_id, remote_device_id, `remote_hostname`,`ports`.*, `remote_port` FROM `links` LEFT JOIN `ports` ON `local_port_id`=`ports`.`port_id` LEFT JOIN `devices` ON `ports`.`device_id`=`devices`.`device_id` WHERE (`local_device_id` IN ($tmp_ids) AND `remote_device_id` IN ($tmp_ids))") as $link_devices) { + $port=''; foreach ($tmp_devices as $k=>$v) { - $port=''; if ($v['id'] == $link_devices['local_device_id']) { $from = $v['id']; $port = shorten_interface_type($link_devices['ifName']);