Changeset 557

Timestamp:

12/19/12 12:00:11 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Work in progress, see #5:
Update getBlockData() to handle new table logic and fields

File:

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

trunk/cgi-bin/IPDB.pm

@@ -1207 +1207 @@
 
 ## IPDB::getBlockData()
-# Get CIDR or IP, custid, type, city, circuit ID, description, notes, modification time, private/restricted 
-# data, for a CIDR block or pool IP
-# Also returns SWIP status flag for CIDR blocks
-# Takes the block/IP to look up
-# Returns an arrayref to a list of hashrefs
+# Get CIDR or IP, custid, type, city, circuit ID, description, notes, modification time,
+# 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
+# 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;
 
-  my $keycol = 'cidr';
-  my $blocktable = 'allocations';
-  my $poolip = 0;
-
-  # 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) {
-    $poolip = 1;
-    $keycol = 'ip';
-    $blocktable = 'poolips';
-  }
-  my $binfo = $dbh->selectrow_hashref("SELECT $keycol AS block, custid, type, city, circuitid, description,".
-        " notes, modifystamp AS lastmod, privdata".($poolip ? '' : ', swip')." FROM $blocktable".
-        " WHERE $keycol = ?", undef, ($block) );
-  return $binfo;
+  # 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 = ? AND vrf = ?", undef, ($block, $vrf) );
+    return $binfo;
+  } elsif ($btype =~ /^.i$/) {
+    my $binfo = $dbh->selectrow_hashref("SELECT ip AS block, custid, type, city, circuitid, description,".
+        " notes, modifystamp AS lastmod, privdata, vrf, pool, rdepth".
+        " FROM poolips WHERE ip = ? AND vrf = ?", undef, ($block, $vrf) );
+    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".
+        " FROM allocations WHERE cidr = ? AND rdepth = ?", undef, ($block, $rdepth) );
+#       " FROM allocations WHERE cidr = ? AND rdepth = ? AND vrf = ?", undef, ($block, $rdepth, $vrf) );
+    return $binfo;
+  }
 } # end getBlockData()