diff --git a/html/images/consdog.jpg b/html/images/consdog.jpg new file mode 100644 index 0000000000..f3b366bc77 Binary files /dev/null and b/html/images/consdog.jpg differ diff --git a/html/pages/routing.inc.php b/html/pages/routing.inc.php index f2b49a4b20..4c93563fba 100644 --- a/html/pages/routing.inc.php +++ b/html/pages/routing.inc.php @@ -4,16 +4,16 @@ if ($_GET['optb'] == "graphs" || $_GET['optc'] == "graphs") { $graphs = "graphs" #$datas[] = 'overview'; -$routing_count['bgp'] = mysql_result(mysql_query("select count(*) from bgpPeers"), 0); +$routing_count['bgp'] = mysql_result(mysql_query("SELECT COUNT(*) from `bgpPeers`"), 0); if ($routing_count['bgp']) { $datas[] = 'bgp'; } -$routing_count['ospf'] = mysql_result(mysql_query("select count(*) from ospf_ports"), 0); +$routing_count['ospf'] = mysql_result(mysql_query("SELECT COUNT(*) FROM `ospf_instances` WHERE `ospfAdminStat` = 'enabled'"), 0); if ($routing_count['ospf']) { $datas[] = 'ospf'; } -$routing_count['cef'] = mysql_result(mysql_query("select count(*) from cef_switching"), 0); +$routing_count['cef'] = mysql_result(mysql_query("SELECT COUNT(*) from `cef_switching`"), 0); if ($routing_count['cef']) { $datas[] = 'cef'; } -$routing_count['vrf'] = @mysql_result(mysql_query("select count(*) from vrfs"), 0); +$routing_count['vrf'] = @mysql_result(mysql_query("SELECT COUNT(*) from `vrfs`"), 0); if($routing_count['vrf']) { $datas[] = 'vrf'; } #$type_text['overview'] = "Overview"; diff --git a/html/pages/routing/cef.inc.php b/html/pages/routing/cef.inc.php index e69de29bb2..210dfc8c16 100644 --- a/html/pages/routing/cef.inc.php +++ b/html/pages/routing/cef.inc.php @@ -0,0 +1,8 @@ +
+
+

Work in Progress

+
+ +
+
+This page is still under construction
If you have any ideas for what could go here, or how we could lay out the content that should be here, please share!
diff --git a/html/pages/routing/ospf.inc.php b/html/pages/routing/ospf.inc.php index e69de29bb2..3bab28b1a8 100644 --- a/html/pages/routing/ospf.inc.php +++ b/html/pages/routing/ospf.inc.php @@ -0,0 +1,50 @@ +'); +echo('DeviceRouter IdStatusABRASBRAreasPortsNeighbours'); + +#### Loop Instances + +while($instance = mysql_fetch_assoc($query)) +{ + + if (!is_integer($i_i/2)) { $instance_bg = $list_colour_a; } else { $instance_bg = $list_colour_b; } + + $device = device_by_id_cache($instance['device_id']); + + $area_count = mysql_result(mysql_query("SELECT COUNT(*) FROM `ospf_areas` WHERE `device_id` = '".$device['device_id']."'"),0); + $port_count = mysql_result(mysql_query("SELECT COUNT(*) FROM `ospf_ports` WHERE `device_id` = '".$device['device_id']."'"),0); + $port_count_enabled = mysql_result(mysql_query("SELECT COUNT(*) FROM `ospf_ports` WHERE `ospfIfAdminStat` = 'enabled' AND `device_id` = '".$device['device_id']."'"),0); + + $ip_query = "SELECT * FROM ipv4_addresses AS A, ports AS I WHERE "; + $ip_query .= "(A.ipv4_address = '".$peer['bgpPeerIdentifier']."' AND I.interface_id = A.interface_id)"; + $ip_query .= " AND I.device_id = '".$device['device_id']."'"; + $ipv4_host = mysql_fetch_assoc(mysql_query($ip_query)); + + if($instance['ospfAdminStat'] == "enabled") { $enabled = 'enabled'; } else { $enabled = 'disabled'; } + if($instance['ospfAreaBdrRtrStatus'] == "true") { $abr = 'yes'; } else { $abr = 'no'; } + if($instance['ospfASBdrRtrStatus'] == "true") { $asbr = 'yes'; } else { $asbr = 'no'; } + + echo(''); + echo(' '.generate_device_link($device). ''); + echo(' '.$instance['ospfRouterId'] . ''); + echo(' ' . $enabled . ''); + echo(' ' . $abr . ''); + echo(' ' . $asbr . ''); + echo(' ' . $area_count . ''); + echo(' ' . $port_count . '('.$port_count_enabled.')'); + echo(' ' . ($neighbour_count+0) . ''); + echo(''); + + $i_i++; + +} ### End loop instances + +echo(''); + +?>