diff --git a/includes/discovery/cisco-mac-accounting.inc.php b/includes/discovery/cisco-mac-accounting.inc.php index d39468072..2928bced6 100755 --- a/includes/discovery/cisco-mac-accounting.inc.php +++ b/includes/discovery/cisco-mac-accounting.inc.php @@ -1,8 +1,7 @@ diff --git a/includes/discovery/cisco-pw.inc.php b/includes/discovery/cisco-pw.inc.php index 3d5eda05b..c3a7883e5 100755 --- a/includes/discovery/cisco-pw.inc.php +++ b/includes/discovery/cisco-pw.inc.php @@ -1,7 +1,7 @@ $interface_descr($if_id))"); if(mysql_result(mysql_query("SELECT count(*) FROM pseudowires WHERE `interface_id` = '$if_id' - AND `cpwVcID`='".$cpwVcID."'"),0)) { + AND `cpwVcID`='".$cpwVcID."'"),0)) + { echo("."); - } else { - $insert_query = "INSERT INTO `pseudowires` (`interface_id`,`peer_device_id`,`peer_ldp_id`,`cpwVcID`,`cpwOid`) "; - $insert_query .= "VALUES ('$if_id','$cpw_remote_device','$cpw_remote_id','$cpwVcID', '$cpwOid')"; - mysql_query($insert_query); - echo("+"); + } + else + { + $insert_query = "INSERT INTO `pseudowires` (`interface_id`,`peer_device_id`,`peer_ldp_id`,`cpwVcID`,`cpwOid`) "; + $insert_query .= "VALUES ('$if_id','$cpw_remote_device','$cpw_remote_id','$cpwVcID', '$cpwOid')"; + mysql_query($insert_query); + echo("+"); #echo($device['device_id'] . " $cpwOid $cpw_remote_device $if_id $cpwVcID\n"); - } - $cpw_exists[] = $device['device_id'] . " $cpwOid $cpw_remote_device $if_id $cpwVcID"; + } + $cpw_exists[] = $device['device_id'] . " $cpwOid $cpw_remote_device $if_id $cpwVcID"; } } } @@ -42,17 +49,20 @@ if($config['enable_pseudowires'] && $device['os_group'] == "ios") { $sql = "SELECT * FROM pseudowires AS P, ports AS I, devices as D WHERE P.interface_id = I.interface_id AND I.device_id = D.device_id AND D.device_id = '".$device['device_id']."'"; $query = mysql_query($sql); - while ($cpw = mysql_fetch_array($query)) { + while ($cpw = mysql_fetch_array($query)) + { unset($exists); $i = 0; - while ($i < count($cpw_exists) && !$exists) { + while ($i < count($cpw_exists) && !$exists) + { $this_cpw = $cpw['device_id'] . " " . $cpw['cpwOid'] . " " . $cpw['peer_device_id'] . " " . $cpw['interface_id'] . " " . $cpw['cpwVcID']; if ($cpw_exists[$i] == $this_cpw) { $exists = 1; # echo($cpw_exists[$i]. " || $this_cpw \n"); } $i++; } - if(!$exists) { + if(!$exists) + { echo("-"); # echo($this_cpw . "\n"); mysql_query("DELETE FROM pseudowires WHERE pseudowire_id = '" . $cpw['pseudowire_id'] . "'"); @@ -61,6 +71,6 @@ if($config['enable_pseudowires'] && $device['os_group'] == "ios") { echo("\n"); -} +} # enable_pseudowires + os_group=ios -?> +?> \ No newline at end of file diff --git a/includes/discovery/cisco-vlans.inc.php b/includes/discovery/cisco-vlans.inc.php index e298b41c3..4f2c084aa 100755 --- a/includes/discovery/cisco-vlans.inc.php +++ b/includes/discovery/cisco-vlans.inc.php @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/includes/discovery/cisco-vrf.inc.php b/includes/discovery/cisco-vrf.inc.php index b068d67b6..3cac08363 100755 --- a/includes/discovery/cisco-vrf.inc.php +++ b/includes/discovery/cisco-vrf.inc.php @@ -17,68 +17,86 @@ if($device['os_group'] == "ios" || $device['os_group'] == "junos" || $device['os $oids = str_replace("\"", "", $oids); $oids = trim($oids); - foreach ( explode("\n", $oids) as $oid ) { - if($oid) { - list($vrf['oid'], $vrf['mplsVpnVrfRouteDistinguisher']) = explode("||", $oid); - $vrf['name'] = trim(shell_exec($config['snmpget'] . " -M " . $config['mibdir'] . " -m MPLS-VPN-MIB -Ln -Osq -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " mplsVpnVrfRouteDistinguisher.".$vrf['oid'])); - list(,$vrf['name'],, $vrf['mplsVpnVrfRouteDistinguisher']) = explode("\"", $vrf['name']); - $vrf['mplsVpnVrfDescription'] = trim(shell_exec($config['snmpget'] . " -M " . $config['mibdir'] . " -m MPLS-VPN-MIB -Ln -Osqvn -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " mplsVpnVrfDescription.".$vrf['oid'])); + foreach ( explode("\n", $oids) as $oid ) + { + if($oid) + { + list($vrf['oid'], $vrf['mplsVpnVrfRouteDistinguisher']) = explode("||", $oid); + $vrf['name'] = trim(shell_exec($config['snmpget'] . " -M " . $config['mibdir'] . " -m MPLS-VPN-MIB -Ln -Osq -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " mplsVpnVrfRouteDistinguisher.".$vrf['oid'])); + list(,$vrf['name'],, $vrf['mplsVpnVrfRouteDistinguisher']) = explode("\"", $vrf['name']); + $vrf['mplsVpnVrfDescription'] = trim(shell_exec($config['snmpget'] . " -M " . $config['mibdir'] . " -m MPLS-VPN-MIB -Ln -Osqvn -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " mplsVpnVrfDescription.".$vrf['oid'])); - if(@mysql_result(mysql_query("SELECT count(*) FROM vrfs WHERE `device_id` = '".$device['device_id']."' - AND `vrf_oid`='".$vrf['oid']."'"),0)) { - $update_query = "UPDATE `vrfs` SET `mplsVpnVrfDescription` = '".$vrf['mplsVpnVrfDescription']."', `mplsVpnVrfRouteDistinguisher` = '".$vrf['mplsVpnVrfRouteDistinguisher']."' "; - $update_query .= "WHERE device_id = '".$device['device_id']."' AND vrf_oid = '".$vrf['oid']."'"; - mysql_query($update_query); - } else { - $insert_query = "INSERT INTO `vrfs` (`vrf_oid`,`vrf_name`,`mplsVpnVrfRouteDistinguisher`,`mplsVpnVrfDescription`,`device_id`) "; - $insert_query .= "VALUES ('".$vrf['oid']."','".$vrf['name']."','".$vrf['mplsVpnVrfRouteDistinguisher']."','".$vrf['mplsVpnVrfDescription']."','".$device['device_id']."')"; - mysql_query($insert_query); - } - $vrf_id = @mysql_result(mysql_query("SELECT vrf_id FROM vrfs WHERE `device_id` = '".$device['device_id']."' AND `vrf_oid`='".$vrf['oid']."'"),0); - $valid_vrf[$vrf_id] = 1; - echo("\nRD:".$vrf['mplsVpnVrfRouteDistinguisher']." ".$vrf['name']." ".$vrf['mplsVpnVrfDescription']." "); - $ports_oid = ".1.3.6.1.3.118.1.2.1.1.2." . $vrf['oid']; - $ports = shell_exec($config['snmpwalk'] . " -M " . $config['mibdir'] . " -m MPLS-VPN-MIB -CI -Ln -Osqn -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " $ports_oid"); - $ports = trim(str_replace($ports_oid . ".", "", $ports)); + if(@mysql_result(mysql_query("SELECT count(*) FROM vrfs WHERE `device_id` = '".$device['device_id']."' + AND `vrf_oid`='".$vrf['oid']."'"),0)) + { + $update_query = "UPDATE `vrfs` SET `mplsVpnVrfDescription` = '".$vrf['mplsVpnVrfDescription']."', `mplsVpnVrfRouteDistinguisher` = '".$vrf['mplsVpnVrfRouteDistinguisher']."' "; + $update_query .= "WHERE device_id = '".$device['device_id']."' AND vrf_oid = '".$vrf['oid']."'"; + mysql_query($update_query); + } + else + { + $insert_query = "INSERT INTO `vrfs` (`vrf_oid`,`vrf_name`,`mplsVpnVrfRouteDistinguisher`,`mplsVpnVrfDescription`,`device_id`) "; + $insert_query .= "VALUES ('".$vrf['oid']."','".$vrf['name']."','".$vrf['mplsVpnVrfRouteDistinguisher']."','".$vrf['mplsVpnVrfDescription']."','".$device['device_id']."')"; + mysql_query($insert_query); + } + + $vrf_id = @mysql_result(mysql_query("SELECT vrf_id FROM vrfs WHERE `device_id` = '".$device['device_id']."' AND `vrf_oid`='".$vrf['oid']."'"),0); + $valid_vrf[$vrf_id] = 1; + echo("\nRD:".$vrf['mplsVpnVrfRouteDistinguisher']." ".$vrf['name']." ".$vrf['mplsVpnVrfDescription']." "); + $ports_oid = ".1.3.6.1.3.118.1.2.1.1.2." . $vrf['oid']; + $ports = shell_exec($config['snmpwalk'] . " -M " . $config['mibdir'] . " -m MPLS-VPN-MIB -CI -Ln -Osqn -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " $ports_oid"); + $ports = trim(str_replace($ports_oid . ".", "", $ports)); # list($ports) = explode(" ", $ports); - echo(" ( "); - foreach (explode("\n", $ports) as $if_id) { - $interface = mysql_fetch_array(mysql_query("SELECT * FROM ports WHERE ifIndex = '$if_id' AND device_id = '" . $device['device_id'] . "'")); - echo(makeshortif($interface['ifDescr']) . " "); - mysql_query("UPDATE ports SET ifVrf = '".$vrf_id."' WHERE interface_id = '".$interface['interface_id']."'"); - $if = $interface['interface_id']; - $valid_vrf_if[$vrf_id][$if] = 1; + echo(" ( "); + foreach (explode("\n", $ports) as $if_id) + { + $interface = mysql_fetch_array(mysql_query("SELECT * FROM ports WHERE ifIndex = '$if_id' AND device_id = '" . $device['device_id'] . "'")); + echo(makeshortif($interface['ifDescr']) . " "); + mysql_query("UPDATE ports SET ifVrf = '".$vrf_id."' WHERE interface_id = '".$interface['interface_id']."'"); + $if = $interface['interface_id']; + $valid_vrf_if[$vrf_id][$if] = 1; + } + echo(") "); } - echo(") "); - } } - $sql = "SELECT * FROM ports WHERE device_id = '" . $device['device_id'] . "'"; - $data = mysql_query($sql); - while($row = mysql_fetch_array($data)) { - $if = $row['interface_id']; - $vrf_id = $row['ifVrf']; - if($row['ifVrf']){ if(!$valid_vrf_if[$vrf_id][$if]) { + $sql = "SELECT * FROM ports WHERE device_id = '" . $device['device_id'] . "'"; + $data = mysql_query($sql); + while($row = mysql_fetch_array($data)) + { + $if = $row['interface_id']; + $vrf_id = $row['ifVrf']; + if($row['ifVrf']) + { + if(!$valid_vrf_if[$vrf_id][$if]) + { echo("-"); $query = @mysql_query("UPDATE ports SET `ifVrf` = NULL WHERE interface_id = '$if'"); - } else {echo(".");} } + } + else + { + echo("."); + } } + } - $sql = "SELECT * FROM vrfs WHERE device_id = '" . $device['device_id'] . "'"; - $data = mysql_query($sql); - while($row = mysql_fetch_array($data)) { - $vrf_id = $row['vrf_id']; - if(!$valid_vrf[$vrf_id]) { - echo("-"); - $query = @mysql_query("DELETE FROM vrfs WHERE vrf_id = '$vrf_id'"); - } else {echo(".");} - } + $sql = "SELECT * FROM vrfs WHERE device_id = '" . $device['device_id'] . "'"; + $data = mysql_query($sql); + while($row = mysql_fetch_array($data)) + { + $vrf_id = $row['vrf_id']; + if(!$valid_vrf[$vrf_id]) + { + echo("-"); + $query = @mysql_query("DELETE FROM vrfs WHERE vrf_id = '$vrf_id'"); + } else { echo(".");} + } unset($valid_vrf_if); unset($valid_vrf); echo("\n"); -} +} # ios/junos/ironware -?> +?> \ No newline at end of file diff --git a/includes/discovery/services.inc.php b/includes/discovery/services.inc.php index 4286ddd38..5ce806b34 100644 --- a/includes/discovery/services.inc.php +++ b/includes/discovery/services.inc.php @@ -1,7 +1,7 @@ - \ No newline at end of file +?> \ No newline at end of file diff --git a/includes/discovery/ucd-diskio.inc.php b/includes/discovery/ucd-diskio.inc.php index 29b44ff2b..006f2c0a8 100644 --- a/includes/discovery/ucd-diskio.inc.php +++ b/includes/discovery/ucd-diskio.inc.php @@ -1,52 +1,52 @@ $entry) { +if (is_array($diskio_array)) +{ + foreach ($diskio_array as $index => $entry) + { + if($entry['diskIONRead'] > "0" || $entry['diskIONWritten'] > "0") + { + if ($debug) { echo("$index ".$entry['diskIODevice']."\n"); } - if($entry['diskIONRead'] > "0" || $entry['diskIONWritten'] > "0") { - if ($debug) { echo("$index ".$entry['diskIODevice']."\n"); } + if (mysql_result(mysql_query("SELECT COUNT(*) FROM `ucd_diskio` WHERE `device_id` = '".$device['device_id']."' AND `diskio_index` = '".$index."'"),0) == "0") + { + $sql = "INSERT INTO `ucd_diskio` (`device_id`,`diskio_index`,`diskio_descr`) VALUES ('".$device['device_id']."','".$index."','".$entry['diskIODevice']."')"; + mysql_query($sql); echo("+"); + if($debug) { echo($sql . " - " . mysql_affected_rows() . "inserted "); } + } + else + { + echo("."); + ## FIXME Need update code here! + } - if (mysql_result(mysql_query("SELECT COUNT(*) FROM `ucd_diskio` WHERE `device_id` = '".$device['device_id']."' AND `diskio_index` = '".$index."'"),0) == "0") - { - $sql = "INSERT INTO `ucd_diskio` (`device_id`,`diskio_index`,`diskio_descr`) VALUES ('".$device['device_id']."','".$index."','".$entry['diskIODevice']."')"; - mysql_query($sql); echo("+"); - if($debug) { echo($sql . " - " . mysql_affected_rows() . "inserted "); } - } - else - { - echo("."); - ## FIXME Need update code here! - } - - $valid_diskio[$index] = 1; - - } ## end validity check - } ## end array foreach - } ## End array if + $valid_diskio[$index] = 1; + } ## end validity check + } ## end array foreach +} ## End array if ### Remove diskio entries which weren't redetected here - $sql = "SELECT * FROM `ucd_diskio` where `device_id` = '".$device['device_id']."'"; - $query = mysql_query($sql); +$sql = "SELECT * FROM `ucd_diskio` where `device_id` = '".$device['device_id']."'"; +$query = mysql_query($sql); - if($debug) { print_r ($valid_vp); } +if($debug) { print_r ($valid_diskio); } - while ($test = mysql_fetch_array($query)) { - if($debug) { echo($test['diskio_index'] . " -> " . $test['diskio_descr'] . "\n"); } - if(!$valid_diskio[$test['diskio_index']]) { - echo("-"); - mysql_query("DELETE FROM `ucd_diskio` WHERE `diskio_id` = '" . $test['diskio_id'] . "'"); - } +while ($test = mysql_fetch_array($query)) { + if($debug) { echo($test['diskio_index'] . " -> " . $test['diskio_descr'] . "\n"); } + if(!$valid_diskio[$test['diskio_index']]) { + echo("-"); + mysql_query("DELETE FROM `ucd_diskio` WHERE `diskio_id` = '" . $test['diskio_id'] . "'"); } +} - unset($valid_diskio); - echo("\n"); - +unset($valid_diskio); +echo("\n"); ?> diff --git a/includes/functions.php b/includes/functions.php index 96924a6f6..673b685ba 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -701,7 +701,7 @@ function isHexString($str) # Include all .inc.php files in $dir function include_dir($dir, $regex = "") { - global $device, $config; + global $device, $config, $debug; if ( $regex == "") { $regex = "/\.inc\.php$/"; @@ -713,6 +713,7 @@ function include_dir($dir, $regex = "") { if (filetype($config['install_dir'] . '/' . $dir . '/' . $file) == 'file' && preg_match($regex, $file)) { + if ($debug) { echo("Including: " . $config['install_dir'] . '/' . $dir . '/' . $file . "\n"); } include($config['install_dir'] . '/' . $dir . '/' . $file); } }