Changeset 677 for trunk/cgi-bin

Timestamp:

01/16/15 17:34:45 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Collect and pass through per-IP rDNS. Still need to cache these locally.
See #1.

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (2 diffs)
• main.cgi (modified) (2 diffs)

trunk/cgi-bin/IPDB.pm

@@ -1149 +1149 @@
       if $args{rdns};
 
+    # and the per-IP set, if there is one.
+    _rpc('updateRevSet', %{$args{iprev}}, rpcuser => $args{user});
+
     return ('OK', 'OK');
 
@@ -1296 +1299 @@
   $binfo->{block} =~ s|/32$||;
   _rpc('addOrUpdateRevRec', cidr => $binfo->{block}, name => $args{rdns}, rpcuser => $args{user});
+
+  # and the per-IP set, if there is one.
+  _rpc('updateRevSet', %{$args{iprev}}, rpcuser => $args{user});
+
   return ('OK','OK');
 } # end updateBlock()

trunk/cgi-bin/main.cgi

@@ -551 +551 @@
   # IP, or the error message if an error occurred.
 
+##fixme:  consider just passing \%webvar to allocateBlock()?
+  # collect per-IP rDNS fields.  only copy over the ones that actually have something in them.
+  my %iprev;
+  foreach (keys %webvar) {
+    $iprev{$_} = $webvar{$_} if /host_[\d.a-fA-F:]+/ && $webvar{$_};
+  }
+
   my ($code,$msg) = allocateBlock($ip_dbh, cidr => $webvar{fullcidr}, fbid => $webvar{fbid},
         parent => $webvar{parent}, custid => $webvar{custid}, type => $webvar{alloctype}, city => $webvar{city}, 
         desc => $webvar{desc}, notes => $webvar{notes}, circid => $webvar{circid},
-        privdata => $webvar{privdata}, nodeid => $webvar{node}, rdns => $webvar{rdns}, user => $authuser);
+        privdata => $webvar{privdata}, nodeid => $webvar{node}, rdns => $webvar{rdns}, user => $authuser,
+        iprev => \%iprev);
 
   if ($code eq 'OK') {
@@ -804 +812 @@
   $updargs{node} = $webvar{node} if $webvar{node};
 
-  my ($code,$msg) = updateBlock($ip_dbh, %updargs);
+  # collect per-IP rDNS fields.  only copy over the ones that actually have something in them.
+  my %iprev;
+  foreach (keys %webvar) {
+    $iprev{$_} = $webvar{$_} if /host_[\d.a-fA-F:]+/ && $webvar{$_};
+  }
+
+  my ($code,$msg) = updateBlock($ip_dbh, %updargs, iprev => \%iprev);
 
   if ($code eq 'FAIL') {