Changeset 586 for trunk/cgi-bin

Timestamp:

01/17/13 15:47:14 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Add rDNS to edit allocation part 1 - retrieve information for
the edit page. See #1.

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (3 diffs)
• main.cgi (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -1462 +1462 @@
   } 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".
+        " notes, modifystamp AS lastmod, privdata, vrf, pool, rdepth, rdns".
         " FROM poolips WHERE ip = ?", undef, ($block) );
 #       " FROM poolips WHERE ip = ? AND vrf = ?", undef, ($block, $vrf) );
@@ -1468 +1468 @@
   } else {
     my $binfo = $dbh->selectrow_hashref("SELECT cidr AS block, parent, custid, type, city, circuitid, ".
-        "description, notes, modifystamp AS lastmod, privdata, vrf, swip, rdepth".
+        "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) );
@@ -1502 +1502 @@
     # or sub-/19 /24 to retrieve - it's the least-wrong way to do things.
 
-    my ($rpcblock) = $cidr->split( ($cidr->masklen <= 16 ? 16 : 24) );
+    my ($rpcblock) = ($cidr->masklen <= 24 ? $cidr->split( ($cidr->masklen <= 16 ? 16 : 24) ) : $cidr);
+
     my %rpcargs = (
         rpcuser => $args{user},
-        rpcsystem => 'ipdb',
         group => $revgroup,     # not sure how this could sanely be exposed, tbh...
         cidr => "$rpcblock",
         );
 
-    eval {
-      $result = $server->call('dnsdb.getRevPattern', %rpcargs);
-    };
-    if ($@) {
-      my $msg = $@;
-      $msg =~ s/Fault returned from XML RPC Server, fault code 4: error executing RPC `dnsdb.addRDNS'\.\s//;
-    }
+    $rdns = _rpc('getRevPattern', %rpcargs);
   }
 

trunk/cgi-bin/main.cgi

@@ -654 +654 @@
   $blockinfo->{type} =~ s/\s//;
 
+  # Get rDNS info;  duplicates a bit of getBlockData but also does the RPC call if possible
+  $blockinfo->{rdns} = getBlockRDNS($ip_dbh, $webvar{block}, $webvar{rdepth}, user => $authuser);
+
   $page->param(block => $webvar{block});
+  $page->param(rdns     => $blockinfo->{rdns});
   $page->param(rdepth   => $blockinfo->{rdepth});