Changeset 320 for trunk/cgi-bin/freespace.pl

Timestamp:

04/04/06 18:25:28 (18 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge all bugfixes, hacks, tweaks, and miscellaneous updates from
/branches/stable necessary to bring code into line. Aside from
CustID verification and notification bits, /trunk and
/branches/stable should now be identical.

File:

• trunk/cgi-bin/freespace.pl (modified) (4 diffs)

trunk/cgi-bin/freespace.pl

@@ -8 +8 @@
 # Last update by $Author$
 ###
-# Copyright (C) 2004,2005 - Kris Deugau
+# Copyright (C) 2004-2006 - Kris Deugau
 
 use DBI;
@@ -20 +20 @@
 $tnumfree = $bigrfree = $bigufree = 0;
 
+$sql = 'select * from freeblocks where ';
 # General counts first
 if ($ARGV[0]) {
-  $sth = $dbh->prepare("select * from freeblocks where maskbits >= $ARGV[0] order by maskbits desc");
-} else {
-  $sth = $dbh->prepare("select * from freeblocks order by maskbits desc");
+  $sql .= 'maskbits >= $ARGV[0] and ';
 }
+$sql .= "not (cidr <<= '192.168.0.0/16') ".
+                "and not (cidr <<= '172.16.0.0/12') ".
+                "and not (cidr <<= '10.0.0.0/8') ";
+$sql .= "order by maskbits desc";
+
+$sth = $dbh->prepare($sql);
 $sth->execute;
 while (@data = $sth->fetchrow_array) {
@@ -33 +38 @@
 }
 
+print "Free block counts:\n";
 foreach $size (sort {$a cmp $b} keys %numfree) {
   print "/$size: $numfree{$size}\n";
@@ -44 +50 @@
 }
 
+print "Aggregate free space:\n";
 foreach $size (sort {$a cmp $b} keys %numfree) {
   print "/$size: $numfree{$size}\n";