Changeset 365 for branches

Timestamp:

10/09/07 13:06:45 (17 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Add new sub to IPDB.pm: addMaster()
Sub is more complex than original stub in main.cgi; allows adding a
master that is a superset of an existing master
Minor bugfix on removing a master; make sure to delete all relevant freeblocks

File:

• branches/stable/cgi-bin/IPDB.pm (modified) (5 diffs)

branches/stable/cgi-bin/IPDB.pm

@@ -16 +16 @@
 use DBI;
 use Net::SMTP;
+use NetAddr::IP qw( Compact );
 use POSIX;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@@ -24 +25 @@
         %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist @masterblocks
         %allocated %free %routed %bigfree %IPDBacl
-        &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock &deleteBlock
-        &getBlockData &mailNotify
+        &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock &addMaster
+        &deleteBlock &getBlockData &mailNotify
         );
 
@@ -33 +34 @@
                 @masterblocks %allocated %free %routed %bigfree %IPDBacl
                 &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock
-                &deleteBlock &getBlockData &mailNotify
+                &addMaster &deleteBlock &getBlockData &mailNotify
                 )]
         );
@@ -179 +180 @@
 #  $dbh->disconnect;
 } # end checkDBSanity
+
+
+## IPDB::addMaster()
+# Does all the magic necessary to sucessfully add a master block
+# Requires database handle, block to add
+# Returns failure code and error message or success code and "message"
+sub addMaster {
+  my $dbh = shift;
+  my $cidr = new NetAddr::IP shift;
+
+  # Allow transactions, and raise an exception on errors so we can catch it later.
+  # Use local to make sure these get "reset" properly on exiting this block
+  local $dbh->{AutoCommit} = 0;
+  local $dbh->{RaiseError} = 1;
+
+  # Wrap all the SQL in a transaction
+  eval {
+    my $sth = $dbh->prepare("select count(*) from masterblocks where cidr <<= '$cidr'");
+    $sth->execute;
+    my @data = $sth->fetchrow_array;
+
+    if ($data[0] eq 0) {
+      # First case - master is brand-spanking-new.
+##fixme: rwhois should be globally-flagable somewhere, much like a number of other things
+## maybe a db table called "config"?
+      $sth = $dbh->prepare("insert into masterblocks (cidr,rwhois) values ('$cidr','y')");
+      $sth->execute;
+
+# Unrouted blocks aren't associated with a city (yet).  We don't rely on this
+# elsewhere though;  legacy data may have traps and pitfalls in it to break this.
+# Thus the "routed" flag.
+
+      $sth = $dbh->prepare("insert into freeblocks (cidr,maskbits,city,routed)".
+        " values ('$cidr',".$cidr->masklen.",'<NULL>','n')");
+      $sth->execute;
+
+      # If we get here, everything is happy.  Commit changes.
+      $dbh->commit;
+
+    } # new master does not contain existing master(s)
+    else {
+
+      # collect the master(s) we're going to absorb, and snag the longest netmask while we're at it.
+      my $smallmask = $cidr->masklen;
+      $sth = $dbh->prepare("select cidr as mask from masterblocks where cidr <<= '$cidr'");
+      $sth->execute;
+      my @cmasters;
+      while (my @data = $sth->fetchrow_array) {
+        my $master = new NetAddr::IP $data[0];
+        push @cmasters, $master;
+        $smallmask = $master->masklen if $master->masklen > $smallmask;
+      }
+
+      # split the new master, and keep only those blocks not part of an existing master
+      my @blocklist;
+      foreach my $seg ($cidr->split($smallmask)) {
+        my $contained = 0;
+        foreach my $master (@cmasters) {
+          $contained = 1 if $master->contains($seg);
+        }
+        push @blocklist, $seg if !$contained;
+      }
+
+      # collect the unrouted free blocks within the new master
+      $sth = $dbh->prepare("select cidr from freeblocks where ".
+                "maskbits>=$smallmask and cidr <<= '$cidr' and routed='n'");
+      $sth->execute;
+      while (my @data = $sth->fetchrow_array) {
+        my $freeblock = new NetAddr::IP $data[0];
+        push @blocklist, $freeblock;
+      }
+
+      # combine the set of free blocks we should have now.
+      @blocklist = Compact(@blocklist);
+
+      # and now insert the new data.  Make sure to delete old masters too.
+
+      # freeblocks
+      $sth = $dbh->prepare("delete from freeblocks where cidr <<= ?");
+      my $sth2 = $dbh->prepare("insert into freeblocks (cidr,maskbits,city,routed) values (?,?,'<NULL>','n')");
+      foreach my $newblock (@blocklist) {
+        $sth->execute("$newblock");
+        $sth2->execute("$newblock", $newblock->masklen);
+      }
+
+      # master
+      $sth = $dbh->prepare("delete from masterblocks where cidr <<= '$cidr'");
+      $sth->execute;
+      $sth = $dbh->prepare("insert into masterblocks (cidr,rwhois) values ('$cidr','y')");
+      $sth->execute;
+
+      # *whew*  If we got here, we likely suceeded.
+      $dbh->commit;
+    } # new master contained existing master(s)
+  }; # end eval
+
+  if ($@) {
+    my $msg = $@;
+    eval { $dbh->rollback; };
+    return ('FAIL',$msg);
+  } else {
+    return ('OK','OK');
+  }
+} # end addMaster
 
 
@@ -511 +616 @@
       $sth = $dbh->prepare("delete from masterblocks where cidr='$cidr'");
       $sth->execute;
-      $sth = $dbh->prepare("delete from freeblocks where cidr='$cidr'");
+      $sth = $dbh->prepare("delete from freeblocks where cidr <<= '$cidr'");
       $sth->execute;
       $dbh->commit;