Changeset 753 for trunk

Timestamp:

06/29/15 18:31:06 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Start fine-tuning flag storage for deciding if we can/should do an RPC
call for rDNS. See #41.

• Tweak getBlockData with an additional JOIN to fill in the revavailable and revpartial fields. The dnsavail table maps various larger-than-/24 parents to sets of actual /24 reverse zones (should work fine with /16 too) to let eg suitable sets of /29 blocks in a /22 make RPC calls or not, depending on which /24 the allocation is in.
• Add bypass return in mergeBlocks() based on revavailable or revpartial being set on the allocation. For now this is just a simple yes/no; future changes could do more complex things depending on which one was set how.

File:

• trunk/cgi-bin/IPDB.pm (modified) (2 diffs)

trunk/cgi-bin/IPDB.pm

@@ -2456 +2456 @@
 # ...  er, how do we detect this?
 
+  # Return early if the block wasn't flagged as rDNS-able
+  return \@retlist unless $binfo->{revavail} || $binfo->{revpartial};
+
   if ($args{newtype} =~ /.[cm]/) {
 
@@ -2914 +2917 @@
   } else {
     my $binfo = $dbh->selectrow_hashref(qq(
-        SELECT a.id, a.cidr AS block, a.city, a.vrf, a.parent_id, a.master_id, swip, $commonfields,
-                f.cidr AS reserve, f.id as reserve_id
-        FROM allocations a LEFT JOIN freeblocks f ON a.id=f.reserve_for
+        SELECT a.id, a.cidr AS block, a.city, a.vrf, a.parent_id, a.master_id, swip, revzone, $commonfields,
+                f.cidr AS reserve, f.id as reserve_id,
+                d.zone >>= a.cidr AS revavail, d.zone << a.cidr AS revpartial
+        FROM allocations a
+        LEFT JOIN freeblocks f ON a.id=f.reserve_for
+        LEFT JOIN dnsavail d ON a.parent_id = d.parent_alloc AND (a.cidr <<= d.zone OR a.cidr >> d.zone)
         WHERE a.id = ?
         ), undef, ($id) );