Changeset 214 for trunk/cgi-bin/consistency-check.pl

Timestamp:

04/05/05 14:24:52 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

Port bugfixes from /branches/stable r203-206 and r209-213 forward.
Clean merge.

File:

• trunk/cgi-bin/consistency-check.pl (modified) (5 diffs)

trunk/cgi-bin/consistency-check.pl

@@ -14 +14 @@
 use NetAddr::IP;
 
+print "Content-type: text/plain\n\n";
+
 ($dbh,$errstr) = connectDB_My;
 
@@ -141 +143 @@
     print "    Gap from $cur to end of master at $master\n";
   }
+  $master++;
   print "  done $master.\n";
 }
@@ -176 +179 @@
         "from allocations where cidr <<= '$container' and type like '_r') ".
         "union (select network(cidr) as net, broadcast(cidr) as bcast ".
-        "from freeblocks where cidr <<= '$container' and routed='w') order by net");
+        "from freeblocks where cidr <<= '$container' and not (routed='y' or routed='n')) ".
+        "order by net");
     $sth->execute;
 
@@ -207 +211 @@
     print "      Gap from $cur to end of container at $container\n";
   }
+  $container++;
   print "    done $container.\n";
 
@@ -215 +220 @@
 print "Checking for correctness on 'defined' CustIDs:\n";
 # New check:  Make sure "defined" CustIDs are correct.
-$sth = $dbh->prepare("select cidr,type,custid from allocations where not type='cn' order by cidr");
+$sth = $dbh->prepare("select cidr,type,custid from allocations where not (type='cn' or type like '_r') order by cidr");
 $sth->execute;
 while (@data = $sth->fetchrow_array) {