Changeset 533 for trunk

Timestamp:

10/31/12 15:47:53 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up and move SQL for finding a free block to allocate from
into IPDB.pm. See #34.
Also fix a minor "Use of uninitialized value...".

Location:

trunk/cgi-bin

Files:

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

trunk/cgi-bin/IPDB.pm

@@ -28 +28 @@
         &addMaster
         &listSummary &listMaster &listRBlock &listFree &listPool
-        &getTypeList &getPoolSelect
+        &getTypeList &getPoolSelect &findAllocateFrom
         &getParent &getRoutedCity
         &allocateBlock &updateBlock &deleteBlock &getBlockData
@@ -42 +42 @@
                 &addMaster
                 &listSummary &listMaster &listRBlock &listFree &listPool
-                &getTypeList &getPoolSelect
+                &getTypeList &getPoolSelect &findAllocateFrom
                 &getParent &getRoutedCity
                 &allocateBlock &updateBlock &deleteBlock &getBlockData
@@ -501 +501 @@
 ## IPDB::getPoolSelect()
 # Get a list of pools matching the passed city and type that have 1 or more free IPs
+# Returns an arrayref to a list of hashrefs
 sub getPoolSelect {
   my $dbh = shift;
@@ -518 +519 @@
   return $plist;
 } # end getPoolSelect()
+
+
+## IPDB::findAllocateFrom()
+# Find free block to add a new allocation from.  (CIDR block version of pool select above, more or less)
+# Takes
+#  - mask length
+#  - allocation type
+#  - POP city "parent"
+#  - optional master-block restriction
+#  - optional flag to allow automatic pick-from-private-network-ranges
+# Returns a string with the first CIDR block matching the criteria, if any
+sub findAllocateFrom {
+  my $dbh = shift;
+  my $maskbits = shift;
+  my $type = shift;
+  my $city = shift;
+  my $pop = shift;
+  my %optargs = @_;
+
+  my $failmsg = "No suitable free block found\n";
+
+## Set up the SQL to find out what freeblock we can (probably) use for an allocation.
+## Very large systems will require development of a reserve system (possibly an extension
+## of the reserve-for-expansion concept in https://secure.deepnet.cx/trac/ipdb/ticket/24?)
+## Also populate a value list for the DBI call.
+
+  my @vallist = ($maskbits, ($type eq 'rm' ? 'n' : ($type =~ /^(.)r$/ ? "$1" : 'y')) );
+  my $sql = "SELECT cidr FROM freeblocks WHERE maskbits <= ? AND routed = ?";
+
+  # for PPP(oE) and container types, the POP city is the one attached to the pool.
+  # individual allocations get listed with the customer city site.
+  ##fixme:  chain cities to align roughly with a full layer-2 node graph
+  $city = $pop if $type !~ /^.[pc]$/;
+  if ($type ne 'rm') {
+    $sql .= " AND city = ?";
+    push @vallist, $city;
+  }
+  # if a specific master was requested, allow the requestor to self->shoot(foot)
+  if ($optargs{master} && $optargs{master} ne '-') {
+    $sql .= " AND cidr <<= ?" if $optargs{master} ne '-';
+    push @vallist, $optargs{master};
+  } else {
+    # if a specific master was NOT requested, filter out the RFC 1918 private networks
+    if (!$optargs{allowpriv}) {
+      $sql .= " AND NOT (cidr <<= '192.168.0.0/16' OR cidr <<= '10.0.0.0/8' OR cidr <<= '172.16.0.0/12')";
+    }
+  }
+  # Sorting and limiting, since we don't (currently) care to provide a selection of
+  # blocks to carve up.  This preserves something resembling optimal usage of the IP
+  # space by forcing contiguous allocations and free blocks as much as possible.
+  $sql .= " ORDER BY maskbits DESC,cidr LIMIT 1";
+
+  my ($fbfound) = $dbh->selectrow_array($sql, undef, @vallist);
+  return $fbfound;
+} # end findAllocateFrom()
 
 

trunk/cgi-bin/main.cgi

@@ -405 +405 @@
   } else { # end show pool options
 
-##fixme: uninitialized
-    if ($webvar{fbassign} eq 'y') {
+    if ($webvar{fbassign} && $webvar{fbassign} eq 'y') {
       $cidr = new NetAddr::IP $webvar{block};
       $webvar{maskbits} = $cidr->masklen;
@@ -415 +414 @@
         return;
       }
-      my $sql;
-      my $city;
-      my $failmsg;
-      my $extracond = '';
-      if ($webvar{allocfrom} eq '-') {
-##fixme: uninitialized
-        $extracond = ($webvar{allowpriv} eq 'on' ? '' : 
-                " and not (cidr <<= '192.168.0.0/16'".
-                        " or cidr <<= '10.0.0.0/8'".
-                        " or cidr <<= '172.16.0.0/12')");
-      }
-      my $sortorder;
+
+##fixme ick, ew, bleh.  gotta handle the failure message generation better.  push it into findAllocateFrom()?
+      my $failmsg = "No suitable free block found.<br>\n";
       if ($webvar{alloctype} eq 'rm') {
-        if ($webvar{allocfrom} ne '-') {
-          $sql = "select * from freeblocks where maskbits<=$webvar{maskbits} and routed='n'".
-                " and cidr <<= '$webvar{allocfrom}'";
-          $sortorder = "maskbits desc";
-        } else {
-          $sql = "select * from freeblocks where maskbits<=$webvar{maskbits} and routed='n'";
-          $sortorder = "maskbits desc";
-        }
-        $failmsg = "No suitable free block found.<br>\nWe do not have a free".
-          " routeable block of that size.<br>\nYou will have to either route".
-          " a set of smaller netblocks or a single smaller netblock.";
+        $failmsg .= "We do not have a free routeable block of that size.<br>\n".
+                "You will have to either route a set of smaller netblocks or a single smaller netblock.";
       } else {
-##fixme
-# This section needs serious Pondering.
-        # Pools of most types get assigned to the POP they're "routed from"
-        # This includes WAN blocks and other netblock "containers"
-        # This does NOT include cable pools.
         if ($webvar{alloctype} =~ /^.[pc]$/) {
-          $city = $webvar{city};
-          $failmsg = "No suitable free block found.<br>\nYou will have to route another".
-            " superblock from one of the<br>\nmaster blocks or chose a smaller".
-            " block size for the pool.";
+          $failmsg .= "You will have to route another superblock from one of the<br>\n".
+                "master blocks or chose a smaller block size for the pool.";
         } else {
           if (!$webvar{pop}) {
@@ -455 +429 @@
             return;
           }
-          $city = $webvar{pop};
-          $failmsg = "No suitable free block found.<br>\nYou will have to route another".
-            " superblock to $webvar{pop}<br>\nfrom one of the master blocks or".
-            " chose a smaller blocksize.";
-        }
-        if (defined $webvar{allocfrom} && $webvar{allocfrom} ne '-') {
-          $sql = "select cidr from freeblocks where city='$city' and maskbits<=$webvar{maskbits}".
-                " and cidr <<= '$webvar{allocfrom}' and routed='".
-                (($webvar{alloctype} =~ /^(.)r$/) ? "$1" : 'y')."'";
-          $sortorder = "maskbits desc,cidr";
-        } else {
-          $sql = "select cidr from freeblocks where city='$city' and maskbits<=$webvar{maskbits}".
-                " and routed='".(($webvar{alloctype} =~ /^(.)r$/) ? "$1" : 'y')."'";
-          $sortorder = "maskbits desc,cidr";
+          $failmsg .= "You will have to route another superblock to $webvar{pop}<br>\n".
+                "from one of the master blocks or chose a smaller blocksize.";
         }
       }
-      $sql = $sql.$extracond." order by ".$sortorder;
-      $sth = $ip_dbh->prepare($sql);
-      $sth->execute;
-      my @data = $sth->fetchrow_array();
-      if ($data[0] eq "") {
+
+      $cidr = findAllocateFrom($ip_dbh, $webvar{maskbits}, $webvar{alloctype}, $webvar{city}, $webvar{pop},
+        (master => $webvar{allocfrom}, allowpriv => $webvar{allowpriv}) );
+      if (!$cidr) {
         $page->param(err => $failmsg);
         return;
       }
-      $cidr = new NetAddr::IP $data[0];
+      $cidr = new NetAddr::IP $cidr;
     } # check for freeblocks assignment or IPDB-controlled assignment