Changeset 636 for trunk

Timestamp:

10/09/14 18:05:07 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit 9/mumble for work done intermittently over the past ~year.
See #5, comment 25:

• Update getBlockData(); used several places (likely including previous commits in this series)

File:

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

trunk/cgi-bin/IPDB.pm

@@ -1526 +1526 @@
 # private/restricted data, for a CIDR block or pool IP
 # Also returns SWIP status flag for CIDR blocks or pool netblock for IPs
-# Takes the block/IP to look up, routing depth, and VRF identifier
+# Takes the block ID or IP to look up and an optional flag to indicate a pool IP lookup
+# instead of a netblock.
 # Returns a hashref to the block data
 sub getBlockData {
   my $dbh = shift;
-  my $block = shift;
-  my $rdepth = shift;
-  my $vrf = shift || '';
-
-  my $cidr = new NetAddr::IP $block;
-
-  # better way to find IP allocations vs /32 "netblocks"
-  my $btype = $dbh->selectrow_array("SELECT type FROM searchme WHERE cidr=?", undef, ($block) );
-
-  if (defined($rdepth) && $rdepth == 0) {
-    # Only master blocks exist at rdepth 0
-    my $binfo = $dbh->selectrow_hashref("SELECT cidr AS block, 'mm' AS type, 0 AS parent, cidr,".
-        " ctime, mtime, rwhois, vrf".
-        " FROM masterblocks WHERE cidr = ?", undef, ($block) );
-#       " FROM masterblocks WHERE cidr = ? AND vrf = ?", undef, ($block, $vrf) );
-    return $binfo;
-  } elsif ($btype =~ /^.i$/) {
+  my $id = shift;
+  my $type = shift || 'b';      # default to netblock for lazy callers
+
+  # netblocks are in the allocations table;  pool IPs are in the poolips table.
+  # If we try to look up a CIDR in an integer field we should just get back nothing.
+  my ($btype) = $dbh->selectrow_array("SELECT type FROM allocations WHERE id=?", undef, ($id) );
+
+  if ($type eq 'i') {
     my $binfo = $dbh->selectrow_hashref("SELECT ip AS block, custid, type, city, circuitid, description,".
-        " notes, modifystamp AS lastmod, privdata, vrf, pool, rdepth, rdns".
-        " FROM poolips WHERE ip = ?", undef, ($block) );
-#       " FROM poolips WHERE ip = ? AND vrf = ?", undef, ($block, $vrf) );
+        " notes, modifystamp AS lastmod, privdata, vrf, rdns, parent_id, master_id".
+        " FROM poolips WHERE id = ?", undef, ($id) );
     return $binfo;
   } else {
-    my $binfo = $dbh->selectrow_hashref("SELECT cidr AS block, parent, custid, type, city, circuitid, ".
-        "description, notes, modifystamp AS lastmod, privdata, vrf, swip, rdepth, rdns".
-        " FROM allocations WHERE cidr = ? AND rdepth = ?", undef, ($block, $rdepth) );
-#       " FROM allocations WHERE cidr = ? AND rdepth = ? AND vrf = ?", undef, ($block, $rdepth, $vrf) );
+    my $binfo = $dbh->selectrow_hashref("SELECT cidr AS block, custid, type, city, circuitid, ".
+        "description, notes, modifystamp AS lastmod, privdata, vrf, swip, rdns, parent_id, master_id".
+        " FROM allocations WHERE id = ?", undef, ($id) );
     return $binfo;
   }