Changeset 186 for trunk

Timestamp:

03/03/05 17:14:54 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

First round of changes for "clean" handling of subblock allocations.
Note that the code will likely malfunction in a number of corner
and not-so-corner cases. Fixing those will require rethinking of
the allocation types.

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (6 diffs)
• main.cgi (modified) (4 diffs)

trunk/cgi-bin/IPDB.pm

@@ -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 - alloctype begins with 'r'
+          if ($type =~ /^r.$/) {
+            $sth = $dbh->prepare("update freeblocks set routed='r' 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)".
@@ -328 +335 @@
 
           # Insert the new freeblocks entries
+          # Along with some more HairyPerl(TM) in case we're inserting a
+          # subblock (l.) 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 =~ /^l.$/) ? 'r' : 'y')."')");
           foreach my $block (@newfreeblocks) {
             $sth->execute("$block", $block->masklen);
           }
-
+          # special-case for reserve/"container" blocks
+          if ($type =~ /^r.$/) {
+            $sth = $dbh->prepare("insert into freeblocks (cidr,maskbits,city,routed)".
+                " values ('$cidr',".$cidr->masklen.",'$city','r')");
+            $sth->execute;
+          }
           # Insert the allocations entry
           $sth = $dbh->prepare("insert into allocations (cidr,custid,type,city,".
@@ -499 +514 @@
       } 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 +530 @@
         $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 =~ /^l.$/) ? 'r' : 'y').
+                "' order by maskbits desc");
 
       } # end alloctype general case
@@ -542 +563 @@
       }
 
-      # 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
@@ -557 +575 @@
         $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 =~ /^l.$/) ? 'r' : 'y')."')");
       }
       $sth->execute;

trunk/cgi-bin/main.cgi

@@ -331 +331 @@
       $data[2] .= 'i';
     }
-    my @row = (qq(<a href="/ip/cgi-bin/main.cgi?action=edit&block=$data[0]">$data[0]</a>),
+    my @row = ( (($data[2] =~ /^l.$/) ? 'Sub ' : '').
+        qq(<a href="/ip/cgi-bin/main.cgi?action=edit&block=$data[0]">$data[0]</a>),
         $data[1], $disp_alloctypes{$data[2]}, $data[3], $data[4]);
     # Allow listing of pool if desired/required.
@@ -598 +599 @@
 #    $data[2] =~ s/\s+//g;
 
-    my @row = ("<a href=\"/ip/cgi-bin/main.cgi?action=edit&block=$data[0]\">$data[0]</a>",
+    my @row = ( (($data[2] =~ /^l.$/) ? 'Sub ' : '').
+        qq(<a href="/ip/cgi-bin/main.cgi?action=edit&block=$data[0]">$data[0]</a>),
         $data[1], $disp_alloctypes{$data[2]}, $data[3], $data[4]);
     # If the allocation is a pool, allow listing of the IPs in the pool.
@@ -634 +636 @@
   # unrouted free blocks, but it's better to let the database do the work if we can.
   $count = 0;
-  $sth = $ip_dbh->prepare("select cidr from freeblocks where routed='y' and cidr <<= '$master' order by cidr");
+  $sth = $ip_dbh->prepare("select cidr,routed from freeblocks where cidr <<= '$master'".
+        " order by cidr");
   $sth->execute();
   while (my @data = $sth->fetchrow_array()) {
-    # cidr,maskbits,city
+    # cidr,routed
     my $cidr = new NetAddr::IP $data[0];
-    my @row = ("<a href=\"/ip/cgi-bin/main.cgi?action=assign&block=$cidr\">$cidr</a>",
+    my @row = ((($data[1] eq 'r') ? 'Sub ' : '').
+        "<a href=\"/ip/cgi-bin/main.cgi?action=assign&block=$cidr\">$cidr</a>",
         $cidr->range);
     printRow(\@row, 'color1') if ($count%2 == 0);
@@ -869 +873 @@
         if ($webvar{allocfrom} ne '-') {
           $sql = "select cidr from freeblocks where city='$city' and maskbits<=$webvar{maskbits}".
-                " and cidr <<= '$webvar{allocfrom}' and routed='y' order by cidr,maskbits desc";
+                " and cidr <<= '$webvar{allocfrom}' and routed='".
+                (($webvar{alloctype} =~ /^l.$/) ? 'r' : 'y')."' order by cidr,maskbits desc";
         } else {
           $sql = "select cidr from freeblocks where city='$city' and maskbits<=$webvar{maskbits}".
-                " and routed='y' order by cidr,maskbits desc";
+                " and routed='".(($webvar{alloctype} =~ /^l.$/) ? 'r' : 'y').
+                "' order by cidr,maskbits desc";
         }
       }