Changeset 187 for trunk

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!!

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (8 diffs)
• cgi-bin/ipdb.psql (modified) (2 diffs)
• cgi-bin/main.cgi (modified) (11 diffs)
• fb-assign.html (modified) (1 diff)

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;

trunk/cgi-bin/ipdb.psql

@@ -125 +125 @@
 mp      Static Pool - Dialup    Static dialup pool      43      DIAL-BUS
 wp      Static Pool - Wireless  Static wireless pool    44      WL-BUS
-dc      Dynamic cable block     Dynamic cable block     103     CBL-RES
-dy      Dynamic DSL block       Dynamic DSL block       102     DSL-RES
-dn      Dialup netblock Dialup netblock 101     DIAL-RES
-dw      Dynamic WiFi block      Dynamic WiFi block      104     WL-RES
+ce      Dynamic cable block     Dynamic cable block     103     CBL-RES
+de      Dynamic DSL block       Dynamic DSL block       102     DSL-RES
+me      Dialup netblock Dialup netblock 101     DIAL-RES
+we      Dynamic WiFi block      Dynamic WiFi block      104     WL-RES
 mm      Master block    Master block    999     6750400
-rr      Routing Routed netblock 500     6750400
+rm      Routing Routed netblock 500     6750400
 in      Internal netblock       Internal netblock       990     6750400
-ee      End-use netblock        End-use netblock        100     6750400
+en      End-use netblock        End-use netblock        100     6750400
 sd      Static Pool - Servers   Server pool     40      6750400
 cn      Customer netblock       Customer netblock       0       
@@ -140 +140 @@
 wi      Static IP - Wireless    Static wireless IP      24      
 si      Static IP - Server pool Server pool IP  20      6750400
+wc      Reserve for WAN blocks  WAN IP blocks   200     6750400
+wr      Internal WAN block      Internal WAN block      201     6750400
+pc      Reserve for dynamic-route DSL netblocks Dynamic-route netblocks 202     6750400
+pr      Dynamic-route DSL netblock      Dynamic-route DSL       203     
 \.

trunk/cgi-bin/main.cgi

@@ -324 +324 @@
 
   while (my @data = $sth->fetchrow_array) {
-    # cidr,custid,type,city,description,notes
-    # Fix up types from pools (which are single-char)
-    # Fixing the database would be...  painful.  :(
-##fixme LEGACY CODE
-    if ($data[2] =~ /^[cdsmw]$/) {
-      $data[2] .= 'i';
-    }
-    my @row = ( (($data[2] =~ /^l.$/) ? 'Sub ' : '').
+    # cidr,custid,type,city,description
+    # Prefix subblocks with "Sub "
+    my @row = ( (($data[2] =~ /^.r$/) ? '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]);
@@ -599 +594 @@
 #    $data[2] =~ s/\s+//g;
 
-    my @row = ( (($data[2] =~ /^l.$/) ? 'Sub ' : '').
+    # Prefix subblocks with "Sub "
+    my @row = ( (($data[2] =~ /^.r$/) ? '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]);
@@ -623 +619 @@
         qq(<input type=hidden name=action value="delete">\n).
         qq(<input type=hidden name=block value="$master">\n).
-        qq(<input type=hidden name=alloctype value="rr">\n).
+        qq(<input type=hidden name=alloctype value="rm">\n).
         qq(<input type=submit value=" Remove this block ">\n).
         qq(</form>\n);
@@ -642 +638 @@
     # cidr,routed
     my $cidr = new NetAddr::IP $data[0];
-    my @row = ((($data[1] eq 'r') ? 'Sub ' : '').
-        "<a href=\"/ip/cgi-bin/main.cgi?action=assign&block=$cidr\">$cidr</a>",
+    # Include some HairyPerl(TM) to prefix subblocks with "Sub "
+    my @row = ((($data[1] ne 'y' && $data[1] ne 'n') ? 'Sub ' : '').
+        qq(<a href="/ip/cgi-bin/main.cgi?action=assign&block=$cidr&fbtype=$data[1]">$cidr</a>),
         $cidr->range);
     printRow(\@row, 'color1') if ($count%2 == 0);
@@ -733 +730 @@
     $html =~ s|\$\$MASKBITS\$\$|$block->masklen|;
     my $typelist = '';
-    $sth = $ip_dbh->prepare("select type,listname from alloctypes where listorder < 500 and type not like '_i' order by listorder");
-    $sth->execute;
-    my @data = $sth->fetchrow_array;
-    $typelist .= "<option value='$data[0]' selected>$data[1]</option>\n";
-    while (my @data = $sth->fetchrow_array) {
-      $typelist .= "<option value='$data[0]'>$data[1]</option>\n";
+
+    # This is a little dangerous, as it's *theoretically* possible to
+    # get fbtype='n' (aka a non-routed freeblock).  However, should
+    # someone manage to get there, they get what they deserve.
+    if ($webvar{fbtype} ne 'y') {
+      # Snag the type of the block from the database.  We have no
+      # convenient way to pass this in from the calling location.  :/
+      $sth = $ip_dbh->prepare("select type from allocations where cidr >>='$block'");
+      $sth->execute;
+      my @data = $sth->fetchrow_array;
+      $data[0] =~ s/c$/r/;      # Munge the type into the correct form
+      $typelist = "$disp_alloctypes{$data[0]}<input type=hidden name=alloctype value=$data[0]>\n";
+    } else {
+      $typelist .= qq(<select name="alloctype">\n);
+      $sth = $ip_dbh->prepare("select type,listname from alloctypes where listorder < 500 ".
+        "and type not like '_i' order by listorder");
+      $sth->execute;
+      my @data = $sth->fetchrow_array;
+      $typelist .= "<option value='$data[0]' selected>$data[1]</option>\n";
+      while (my @data = $sth->fetchrow_array) {
+        $typelist .= "<option value='$data[0]'>$data[1]</option>\n";
+      }
+      $typelist .= "</select>\n";
     }
     $html =~ s|\$\$TYPELIST\$\$|$typelist|g;
@@ -842 +856 @@
       my $city;
       my $failmsg;
-      if ($webvar{alloctype} eq 'rr') {
+      if ($webvar{alloctype} eq 'rm') {
         if ($webvar{allocfrom} ne '-') {
           $sql = "select * from freeblocks where maskbits<=$webvar{maskbits} and routed='n'".
@@ -856 +870 @@
 ##fixme
 # This section needs serious Pondering.
-        if ($webvar{alloctype} =~ /^.[pd]$/) {
+        # Pools of all types get assigned to the POP they're "routed from"
+        # This includes WAN blocks and other netblock "containers"
+        if ($webvar{alloctype} =~ /^.[pdc]$/) {
           if (($webvar{city} !~ /^(Sudbury|North Bay)$/) && ($webvar{alloctype} eq 'dp')) {
             printError("You must chose Sudbury or North Bay for DSL pools.");
@@ -874 +890 @@
           $sql = "select cidr from freeblocks where city='$city' and maskbits<=$webvar{maskbits}".
                 " and cidr <<= '$webvar{allocfrom}' and routed='".
-                (($webvar{alloctype} =~ /^l.$/) ? 'r' : 'y')."' order by cidr,maskbits desc";
+                (($webvar{alloctype} =~ /^(.)r$/) ? '$1' : 'y')."' order by cidr,maskbits desc";
         } else {
           $sql = "select cidr from freeblocks where city='$city' and maskbits<=$webvar{maskbits}".
-                " and routed='".(($webvar{alloctype} =~ /^l.$/) ? 'r' : 'y').
+                " and routed='".(($webvar{alloctype} =~ /^(.)r$/) ? '$1' : 'y').
                 "' order by cidr,maskbits desc";
         }
@@ -1012 +1028 @@
   # Check POP location
   my $flag;
-  if ($webvar{alloctype} eq 'rr') {
+  if ($webvar{alloctype} eq 'rm') {
     $flag = 'for a routed netblock';
     foreach (@poplist) {
@@ -1084 +1100 @@
 # this has now been Requested, so here goes.
 
-  if ($data[2] =~ /^d[nyc]|cn|ee|in$/) {
+##fixme The check here should be built from the database
+  if ($data[2] =~ /^.[ne]$/) {
     # Block that can be changed
     my $blockoptions = "<select name=alloctype><option".
-        (($data[2] eq 'dn') ? ' selected' : '') ." value='dn'>Dialup netblock</option>\n<option".
-        (($data[2] eq 'dy') ? ' selected' : '') ." value='dy'>Dynamic DSL netblock</option>\n<option".
-        (($data[2] eq 'dc') ? ' selected' : '') ." value='dc'>Dynamic cable netblock</option>\n<option".
+        (($data[2] eq 'me') ? ' selected' : '') ." value='me'>Dialup netblock</option>\n<option".
+        (($data[2] eq 'de') ? ' selected' : '') ." value='de'>Dynamic DSL netblock</option>\n<option".  (($data[2] eq 'dc') ? ' selected' : '') ." value='dc'>Dynamic cable netblock</option>\n<option".
+        (($data[2] eq 'ce') ? ' selected' : '') ." value='ce'>Dynamic cable netblock</option>\n<option".        (($data[2] eq 'dc') ? ' selected' : '') ." value='dc'>Dynamic cable netblock</option>\n<option".
+        (($data[2] eq 'we') ? ' selected' : '') ." value='we'>Dynamic wireless netblock</option>\n<option".     (($data[2] eq 'dc') ? ' selected' : '') ." value='dc'>Dynamic cable netblock</option>\n<option".
         (($data[2] eq 'cn') ? ' selected' : '') ." value='cn'>Customer netblock</option>\n<option".
-        (($data[2] eq 'ee') ? ' selected' : '') ." value='ee'>End-use netblock</option>\n<option".
+        (($data[2] eq 'en') ? ' selected' : '') ." value='en'>End-use netblock</option>\n<option".
         (($data[2] eq 'in') ? ' selected' : '') ." value='in'>Internal netblock</option>\n".
         "</select>\n";
@@ -1190 +1208 @@
   my ($cidr, $custid, $type, $city, $circid, $desc, $notes, $alloctype);
 
-  if ($webvar{alloctype} eq 'rr') {
+  if ($webvar{alloctype} eq 'rm') {
     $sth = $ip_dbh->prepare("select cidr,city from routed where cidr='$webvar{block}'");
     $sth->execute();

trunk/fb-assign.html

@@ -13 +13 @@
 <tr class="color1">
 <td>Allocation type:</td><td>
-<select name="alloctype">
 $$TYPELIST$$
-</select>
 <input type="button" value=" ? " onclick="helpAllocTypes()" class="regular">
 </td>