git-svn-id: http://www.observium.org/svn/observer/trunk@2302 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-13 12:39:56 +00:00
parent 164ada67d7
commit c086264fc2
3 changed files with 5 additions and 9 deletions

View File

@@ -7,8 +7,7 @@ include("includes/functions.php");
$handle = fopen("ips.txt", "w");
$query = mysql_query("SELECT * FROM `ipv4_networks`");
while ($data = mysql_fetch_assoc($query))
foreach (dbFetchRows("SELECT * FROM `ipv4_networks`"))
{
$cidr = $data['ipv4_network'];
list ($network, $bits) = explode("/", $cidr);
@@ -21,7 +20,7 @@ while ($data = mysql_fetch_assoc($query))
while ($ip < $end)
{
$ipdotted = long2ip($ip);
if (mysql_result(mysql_query("SELECT count(ipv4_address_id) FROM ipv4_addresses WHERE ipv4_address = '$ipdotted'"),0) == '0' && match_network($config['nets'], $ipdotted))
if (dbFetchCell("SELECT COUNT(ipv4_address_id) FROM `ipv4_addresses` WHERE `ipv4_address` = ?", array($ipdotted)) == '0' && match_network($config['nets'], $ipdotted))
{
fputs($handle, $ipdotted . "\n");
}

View File

@@ -14,18 +14,15 @@ $entry = explode(",", $argv[1]);
print_r($entry);
$device = @mysql_fetch_assoc(mysql_query("SELECT * FROM devices WHERE `hostname` = '".$entry['0']."'"));
$device = @dbFetchRow("SELECT * FROM devices WHERE `hostname` = ?", array($entry['0']));
if (!$device['device_id'])
{
$device = @mysql_fetch_assoc(mysql_query("SELECT * FROM ipv4_addresses AS A, ports AS I WHERE
A.ipv4_address = '" . $entry['0']."' AND I.interface_id = A.interface_id"));
$device = @dbFetchRow("SELECT * FROM ipv4_addresses AS A, ports AS I WHERE A.ipv4_address = ? AND I.interface_id = A.interface_id", array($entry['0']));
}
if (!$device['device_id']) { exit; } else { }
print_r($device);
$file = $config['install_dir'] . "/includes/snmptrap/".$entry['1'].".inc.php";
if (is_file($file)) { include("$file"); } else { echo("unknown trap ($file)"); exit; }