Changeset 637

Timestamp:

10/09/14 18:06:51 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

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

• Update another miscellaenous sub; getBlockRDNS()

File:

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

trunk/cgi-bin/IPDB.pm

@@ -1559 +1559 @@
 sub getBlockRDNS {
   my $dbh = shift;
-  my $block = shift;
-  my $rdepth = shift;   # do we really need this?
   my %args = @_;
 
-  $args{vrf} = '' if !$args{vrf};
-
-  my $cidr = new NetAddr::IP $block;
-
-  my ($rdns,$rfrom) = $dbh->selectrow_array("SELECT rdns,cidr FROM allocations WHERE cidr >>= ? UNION ".
-        "SELECT rdns,cidr FROM masterblocks WHERE cidr >>= ? ORDER BY cidr", undef, ($cidr,$cidr) );
+  $args{type} = 'b' if !$args{type};
+
+  # snag entry from database
+  my ($rdns,$rfrom,$pid);
+  if ($args{type} =~ /.i/) {
+    ($rdns, $rfrom, $pid) = $dbh->selectrow_array("SELECT rdns,ip,parent_id FROM poolips WHERE id = ?",
+        undef, ($args{id}) );
+  } else {
+    ($rdns, $rfrom, $pid) = $dbh->selectrow_array("SELECT rdns,cidr,parent_id FROM allocations WHERE id = ?",
+        undef, ($args{id}) );
+  }
+
+  # Can't see a way this could end up empty, for any case I care about.  If the caller 
+  # doesn't know an allocation ID to request, then they don't know anything else anyway.
+  my $selfblock = $rfrom;
+
+  my $type;
+  while (!$rdns && $pid) {
+    ($rdns, $rfrom, $pid, $type) = $dbh->selectrow_array(
+        "SELECT rdns,cidr,parent_id,type FROM allocations WHERE id = ?",
+        undef, ($pid) );
+    last if $type eq 'mm';  # break loops in unfortunate legacy data
+  }
+
+  # use the actual allocation to check against the DNS utility;  we don't want
+  # to always go chasing up the chain to the master...  which may (usually won't)
+  # be present directly in DNS anyway
+  my $cidr = new NetAddr::IP $selfblock;
 
   if ($rpc_url) {
@@ -1575 +1595 @@
 
     my ($rpcblock) = ($cidr->masklen <= 24 ? $cidr->split( ($cidr->masklen <= 16 ? 16 : 24) ) : $cidr);
-
     my %rpcargs = (
         rpcuser => $args{user},
@@ -1582 +1601 @@
         );
 
-    $rdns = _rpc('getRevPattern', %rpcargs);
+    my $remote_rdns = _rpc('getRevPattern', %rpcargs);
+    $rdns = $remote_rdns if $remote_rdns;
   }