Changeset 192 for branches/stable/cgi-bin/IPDB.pm

Timestamp:

03/10/05 14:15:19 (19 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge updates and changes (and bugfixes to same) from /trunk
r186,187 and r189-191

File:

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

branches/stable/cgi-bin/IPDB.pm

@@ -234 +234 @@
       eval {
         $msg = "Unable to allocate $cidr as '$disp_alloctypes{$type}'";
-        if ($type eq 'rr') {
+        if ($type eq 'rm') {
           $sth = $dbh->prepare("update freeblocks set routed='y',city='$city'".
             " where cidr='$cidr'");
@@ -243 +243 @@
         } else {
           # common stuff for end-use, dialup, dynDSL, pools, etc, etc.
-          $sth = $dbh->prepare("delete from freeblocks where cidr='$cidr'");
-          $sth->execute;
-
+
+          # special case - block is a container/"reserve" block
+          if ($type =~ /^(.)c$/) {
+            $sth = $dbh->prepare("update freeblocks set routed='$1' where cidr='$cidr'");
+            $sth->execute;
+          } else {
+            # "normal" case
+            $sth = $dbh->prepare("delete from freeblocks where cidr='$cidr'");
+            $sth->execute;
+          }
           $sth = $dbh->prepare("insert into allocations".
                 " (cidr,custid,type,city,description,notes,maskbits,circuitid)".
@@ -305 +312 @@
 
         # now we have to do some magic for routing blocks
-        if ($type eq 'rr') {
+        if ($type eq 'rm') {
 
           # Insert the new freeblocks entries
@@ -325 +332 @@
           $sth->execute;
 
-        } else { # done with alloctype == rr
+        } else { # done with alloctype == rm
 
           # Insert the new freeblocks entries
+          # Along with some more HairyPerl(TM) in case we're inserting a
+          # subblock (.r) allocation
           $sth = $dbh->prepare("insert into freeblocks (cidr,maskbits,city,routed)".
-                " values (?, ?, (select city from routed where cidr >>= '$cidr'),'y')");
+                " values (?, ?, (select city from routed where cidr >>= '$cidr'),'".
+                (($type =~ /^(.)r$/) ? "$1" : 'y')."')");
           foreach my $block (@newfreeblocks) {
             $sth->execute("$block", $block->masklen);
           }
-
+          # Special-case for reserve/"container" blocks - generate
+          # the "extra" freeblocks entry for the container
+          if ($type =~ /^(.)c$/) {
+            $sth = $dbh->prepare("insert into freeblocks (cidr,maskbits,city,routed)".
+                " values ('$cidr',".$cidr->masklen.",'$city','$1')");
+            $sth->execute;
+          }
           # Insert the allocations entry
           $sth = $dbh->prepare("insert into allocations (cidr,custid,type,city,".
@@ -354 +370 @@
           }
 
-        } # done with netblock alloctype != rr
+        } # done with netblock alloctype != rm
 
         $dbh->commit;
@@ -485 +501 @@
     eval {
 
-      if ($type eq 'rr') {
+      if ($type eq 'rm') {
         $msg = "Unable to remove routing allocation $cidr";
         $sth = $dbh->prepare("delete from routed where cidr='$cidr'");
@@ -499 +515 @@
       } else { # end alloctype routing case
 
-        $sth = $dbh->prepare("delete from allocations where cidr='$cidr'");
+        # Delete all allocations within the block being deleted.  This is
+        # deliberate and correct, and removes the need to special-case
+        # removal of "container" blocks.
+        $sth = $dbh->prepare("delete from allocations where cidr <<='$cidr'");
         $sth->execute;
+
         # Special case - delete pool IPs
         if ($type =~ /^.[pd]$/) {
@@ -511 +531 @@
         $sth = $dbh->prepare("select cidr from freeblocks where cidr <<= ".
                 "(select cidr from routed where cidr >>= '$cidr') ".
-                " and maskbits<=".$cidr->masklen." and routed='y' order by maskbits desc");
+                " and maskbits<=".$cidr->masklen.
+                " and routed='".(($type =~ /^(.)r$/) ? '$1' : 'y').
+                "' order by maskbits desc");
 
       } # end alloctype general case
@@ -562 +584 @@
       }
 
-      # Clear old freeblocks entries - if any.  $i==0 if not.
-      if ($i>0) {
-        $sth = $dbh->prepare("delete from freeblocks where cidr=?");
-        foreach my $block (@combinelist) {
-          $sth->execute("$block");
-        }
-      }
+      # Clear old freeblocks entries - if any.  They should all be within
+      # the $cidr determined above.
+      $sth = $dbh->prepare("delete from freeblocks where cidr <<='$cidr'");
+      $sth->execute;
 
       # insert "new" freeblocks entry
-      if ($type eq 'rr') {
+      if ($type eq 'rm') {
         $sth = $dbh->prepare("insert into freeblocks (cidr,maskbits,city)".
                 " values ('$cidr',".$cidr->masklen.",'<NULL>')");
@@ -577 +596 @@
         $sth = $dbh->prepare("insert into freeblocks (cidr,maskbits,city,routed)".
                 " values ('$cidr',".$cidr->masklen.
-                ",(select city from routed where cidr >>= '$cidr'),'y')");
+                ",(select city from routed where cidr >>= '$cidr'),'".
+                (($type =~ /^(.)r$/) ? "$1" : 'y')."')");
       }
       $sth->execute;