update changelog, clean up files

git-svn-id: http://www.observium.org/svn/observer/trunk@1893 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-16 22:04:29 +00:00
parent 2d5eee1c95
commit 39dc6e9053
7 changed files with 127 additions and 115 deletions
+4 -4
View File
@@ -11,17 +11,17 @@ $query = mysql_query("SELECT * FROM `ipv4_networks`");
while ($data = mysql_fetch_array($query))
{
$cidr = $data['ipv4_network'];
list ($network, $bits) = explode("/", $cidr);
if($bits != '32' && $bits != '32' && $bits > '22')
list ($network, $bits) = explode("/", $cidr);
if ($bits != '32' && $bits != '32' && $bits > '22')
{
$addr = Net_IPv4::parseAddress($cidr);
$broadcast = $addr->broadcast;
$ip = ip2long($network) + '1';
$end = ip2long($broadcast);
while($ip < $end)
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 (mysql_result(mysql_query("SELECT count(ipv4_address_id) FROM ipv4_addresses WHERE ipv4_address = '$ipdotted'"),0) == '0' && match_network($config['nets'], $ipdotted))
{
fputs($handle, $ipdotted . "\n");
}