Changeset 187 for trunk/cgi-bin/IPDB.pm

Timestamp:

03/04/05 18:12:54 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

Another herd of changes to alloctypes. This cleaned up the
corner-case messes left by the introduction of subblocks in
/trunk r186, and fixed some other problems related to alloctype
handling. Note that the code changes REQUIRE changes to the
alloctypes table data!!

File:

• trunk/cgi-bin/IPDB.pm (modified) (8 diffs)

trunk/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'");
@@ -244 +244 @@
           # common stuff for end-use, dialup, dynDSL, pools, etc, etc.
 
-          # special case - block is a container/"reserve" block - alloctype begins with 'r'
-          if ($type =~ /^r.$/) {
-            $sth = $dbh->prepare("update freeblocks set routed='r' where cidr='$cidr'");
+          # 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 {
@@ -312 +312 @@
 
         # now we have to do some magic for routing blocks
-        if ($type eq 'rr') {
+        if ($type eq 'rm') {
 
           # Insert the new freeblocks entries
@@ -336 +336 @@
           # Insert the new freeblocks entries
           # Along with some more HairyPerl(TM) in case we're inserting a
-          # subblock (l.) allocation
+          # subblock (.r) allocation
           $sth = $dbh->prepare("insert into freeblocks (cidr,maskbits,city,routed)".
                 " values (?, ?, (select city from routed where cidr >>= '$cidr'),'".
-                (($type =~ /^l.$/) ? 'r' : 'y')."')");
+                (($type =~ /^(.)r$/) ? '$1' : 'y')."')");
           foreach my $block (@newfreeblocks) {
             $sth->execute("$block", $block->masklen);
           }
-          # special-case for reserve/"container" blocks
-          if ($type =~ /^r.$/) {
+          # 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','r')");
+                " values ('$cidr',".$cidr->masklen.",'$city','$1')");
             $sth->execute;
           }
@@ -500 +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'");
@@ -531 +532 @@
                 "(select cidr from routed where cidr >>= '$cidr') ".
                 " and maskbits<=".$cidr->masklen.
-                " and routed='".(($type =~ /^l.$/) ? 'r' : 'y').
+                " and routed='".(($type =~ /^(.)r$/) ? '$1' : 'y').
                 "' order by maskbits desc");
 
@@ -569 +570 @@
 
       # 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>')");
@@ -576 +577 @@
                 " values ('$cidr',".$cidr->masklen.
                 ",(select city from routed where cidr >>= '$cidr'),'".
-                (($type =~ /^l.$/) ? 'r' : 'y')."')");
+                (($type =~ /^(.)r$/) ? '$1' : 'y')."')");
       }
       $sth->execute;