Changeset 11 for trunk

Timestamp:

10/25/04 17:28:12 (20 years ago)

Author:

Kris Deugau

Message:

Near-complete rewrite of cgi-bin/consistency-check.pl

• It works properly now! Woohoo!

File:

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

trunk/cgi-bin/consistency-check.pl

@@ -82 +82 @@
 foreach $master (@masterblocks) {
   print "Master $master:\n";
-  ($next,undef) = split /\//, $master;
-  ($last,undef) = split /\//, ($master->broadcast);
+  $prev = $master;
   $sth = $dbh->prepare("(select network(cidr) as net, broadcast(cidr) as bcast ".
         " from allocations where cidr <<= '$master') union ".
@@ -89 +88 @@
         "from freeblocks where cidr <<= '$master') order by net");
   $sth->execute;
+
   while (@data = $sth->fetchrow_array) {
-    ($cur,undef) = split /\//, $data[0];
-    if ($master !~ /$next/) {
-      ($tmp,undef) = split /\//, $next;
-      @tmp1 = split /\./, $tmp;
-      $tmp1[3]++;
-      if ($tmp1[3] == 256) { $tmp1[3] = 0; $tmp1[2]++; }
-      $cmp = join '.', @tmp1;
+    $cur = new NetAddr::IP $data[0];
+
+    if ($master->numeric == $prev->numeric) {
+      # check if cur starts with master
+      if ($cur->numeric > $prev->numeric) {
+        print " Gap from start of master $master to first block $cur\n";
+      } elsif ($cur->numeric < $prev->numeric) {
+        print " BIG problem!  Current block $cur begins before master $master!\n";
+      }
     } else {
-      $cmp = $next;
+      if ($cur->numeric < ($prev->numeric + 1)) {
+        print " Block ".$prev->network." overlaps block $cur\n";
+      } elsif ($cur->numeric > ($prev->numeric + 1)) {
+        print " Gap between end of block ".$prev->network." and block $cur\n";
+      }
     }
-    if ($cur ne $cmp) {
-      print " Gap from $next to $cur\n";
-    }
-    ($next,undef) = split /\//, $data[1];
-  }
-  if ($next ne $last) {
-    print " Gap from $next to end of master at $last\n";
+
+    $prev = $cur;
+    $prev--;
+
+  } # while (@data...)
+
+  $cur--;
+  $master--;
+  if ($cur->numeric ne $master->numeric) {
+    print " Gap from $cur to end of master at $master\n";
   }
   print "done $master.\n";