Changeset 616 for branches

Timestamp:

10/24/13 10:30:15 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Fix a nasty edge case with /32 netblock allocations. Strictly speaking
these should probably be set up as IP pools. The new database structure
on /trunk will bypass this class of problem by not using just the CIDR
as a key.
Bump patch version for release.

Location:

branches/stable

Files:

• Makefile (modified) (1 diff)
• cgi-bin/IPDB.pm (modified) (1 diff)

branches/stable/Makefile

@@ -3 +3 @@
 
 PKGNAME=ipdb
-VERSION=2.8.1
+VERSION=2.8.2
 RELEASE=1
 

branches/stable/cgi-bin/IPDB.pm

@@ -1287 +1287 @@
   my $poolip = 0;
 
+my $binfo;
+## hack ptui
+# the current DB does not lend itself well to /32 netblock allocations.
+# this hack should work around that lack so that such allocations can be manipulated:
+# instead of inspecting $block/$cidr to see if it's an IPv4 /32,
+# we brute-force it and just see if there's anything in the allocations
+# table first, then if nothing was found check the poolips table
+$binfo = $dbh->selectrow_hashref("SELECT $keycol AS block, custid, type, city, circuitid, description,".
+        " notes, modifystamp AS lastmod, privdata, vrf".($poolip ? '' : ', swip')." FROM $blocktable".
+        " WHERE $keycol = ?", undef, ($block) );
+
+## this only works if blocks are never /32.  *sigh*
   # Pool IP and IPv6 check all in one!  Still needs to be tightened
   # up a little for the as-yet-unhandled case of IPv6 IP pools
-  if ($cidr->bits == 32 && $cidr->masklen == 32) {
+#  if ($cidr->bits == 32 && $cidr->masklen == 32) {
+  if (!$binfo) {
     $poolip = 1;
     $keycol = 'ip';
     $blocktable = 'poolips';
-  }
-  my $binfo = $dbh->selectrow_hashref("SELECT $keycol AS block, custid, type, city, circuitid, description,".
+    $binfo = $dbh->selectrow_hashref("SELECT $keycol AS block, custid, type, city, circuitid, description,".
         " notes, modifystamp AS lastmod, privdata, vrf".($poolip ? '' : ', swip')." FROM $blocktable".
         " WHERE $keycol = ?", undef, ($block) );
+  }
   return $binfo;
 } # end getBlockData()