Changeset 64

Timestamp:

11/12/04 12:37:17 (20 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Backported bugfixes and changes from /trunk r60:63

Location:

branches/stable/cgi-bin

Files:

• consistency-check.pl (modified) (1 diff)
• main.cgi (modified) (6 diffs)

branches/stable/cgi-bin/consistency-check.pl

@@ -65 +65 @@
 print " done.\n";
 
-print "Done checking master containment.\n\nChecking block-alignment consistency:\n";
+print "Done checking master containment.\n\nChecking pool containment:\n";
+
+$sth = $dbh->prepare("select pool,ip from poolips order by ip");
+$sth->execute;
+while (@data = $sth->fetchrow_array) {
+  $pool = new NetAddr::IP $data[0];
+  $ip = new NetAddr::IP $data[1];
+  print "IP $ip listed with incorrect pool $pool\n"
+    if !$pool->contains($ip);
+}
+$sth = $dbh->prepare("select distinct pool from poolips order by pool");
+$sth->execute;
+while (@data = $sth->fetchrow_array) {
+  $sth2 = $dbh->prepare("select cidr from allocations where cidr='$data[0]'");
+  $sth2->execute;
+  print "Pool $data[0] does not exist in allocations table\n"
+    if (($sth2->fetchrow_array)[0] eq '');
+}
+
+print "Done checking pool containment.\n\nChecking block-alignment consistency:\n";
 
 # Block alignment consistency:  All allocated+free blocks within a master

branches/stable/cgi-bin/main.cgi

@@ -119 +119 @@
     $sth = $ip_dbh->prepare("insert into masterblocks values ('$webvar{cidr}')");
     $sth->execute;
-# Don't need this with RaiseError, but leave it for now.
-#    croak $sth->errstr if ($sth->errstr());
 
 # Unrouted blocks aren't associated with a city (yet).  We don't rely on this
@@ -129 +127 @@
         $cidr->masklen.",'<NULL>','n')");
     $sth->execute;
-# Don't need this with RaiseError, but leave it for now.
-#    croak $sth->errstr if ($sth->errstr());
 
     # If we get here, everything is happy.  Commit changes.
@@ -361 +357 @@
     # Fix up types from pools (which are single-char)
     # Fixing the database would be...  painful.  :(
-    if ($data[2] =~ /^[cdsm]$/) {
+    if ($data[2] =~ /^[sdcmw]$/) {
       $data[2] .= 'i';
     }
@@ -819 +815 @@
 #  + Different flavours of netblock
 
-  if ($webvar{alloctype} =~ /^[cdsm]i$/) {
+  if ($webvar{alloctype} =~ /^[scdmw]i$/) {
     my ($base,undef) = split //, $webvar{alloctype};    # split into individual chars
     my $sql;
@@ -999 +995 @@
 # Allow transactions, and make errors much easier to catch.
 # Much as I would like to error-track specifically on each ->execute,
-# that's a LOT of code.  :/
-    $ip_dbh->{AutoCommit} = 0;
-    $ip_dbh->{RaiseError} = 1;
+# that's a LOT of code, and some SQL blocks MUST be atomic at a
+# multi-statement level.  :/
+    local $ip_dbh->{AutoCommit} = 0;    # These need to be local so we don't
+    local $ip_dbh->{RaiseError} = 1;    # step on our toes by accident.
 
     if ($webvar{fullcidr} eq $webvar{alloc_from}) {
@@ -1134 +1131 @@
     syslog "notice", "$full_alloc_types{$webvar{alloctype}} '$webvar{fullcidr}' successfully initialized by $authuser";
 
-    # Turn off transactions and exception-on-error'ing
-    $ip_dbh->{AutoCommit} = 0;
-    $ip_dbh->{RaiseError} = 1;
-
     print qq(<div class="center"><div class="heading">The block $webvar{fullcidr} was sucessfully added as type '$webvar{alloctype}' ($full_alloc_types{$webvar{alloctype}})</div></div>);