Changeset 744 for trunk

Timestamp:

06/11/15 17:34:46 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Fill in first major block of rDNS for mergeBlocks(); new allocation is
a container. See #1 and #8.

File:

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

trunk/cgi-bin/IPDB.pm

@@ -2447 +2447 @@
   }
 
+# Make the assumption that any change crossing /24 or /16 boundaries will not come out right.  Reverse DNS
+# updates for this operation are already complex enough without handling those edge cases.
+# ...  er, how do we detect this?
+
+  if ($args{newtype} =~ /.[cm]/) {
+
+    if ($args{scope} eq 'keepall') {
+      # Add new rDNS for new container
+      _rpc('addOrUpdateRevRec', cidr => $binfo->{block}, name => $binfo->{rdns}, rpcuser => $args{user});
+
+    } else {
+      # Resize rDNS template for $prime
+      _rpc('resizeTemplate', oldcidr => "$binfo->{block}", newcidr => $newblock->network.'', rpcuser => $args{user});
+
+      # Assemble a list of blocks to delete...
+      my $cidrlist;
+      foreach my $mblock (@retlist) {
+        $cidrlist .= $mblock->{block}."," unless $mblock->{block} =~ $newblock;
+      }
+
+      # ... then make slight variant batch delete calls depending on the merge scope
+      if ($args{scope} eq 'mergepeer') {
+        # Delete separate rDNS for other peers
+        $cidrlist =~ s/,$//;
+        _rpc('delRevSet', cidrlist => $cidrlist, rpcuser => $args{user}, delforward => 'y', delsubs => 'n',
+            parpatt => $pinfo->{rdns});
+
+      } elsif ($args{scope} eq 'clearpeer') {
+        # Delete all rDNS within other peers
+        $cidrlist =~ s/,$//;
+        _rpc('delRevSet', cidrlist => $cidrlist, rpcuser => $args{user}, delforward => 'y', delsubs => 'y',
+            parpatt => $pinfo->{rdns})
+
+      } elsif ($args{scope} eq 'clearall') {
+        # Delete all other records within the new block
+        $cidrlist .= $binfo->{block};
+        _rpc('delRevSet', cidrlist => $cidrlist, rpcuser => $args{user}, delforward => 'y', delsubs => 'y',
+            parpatt => $pinfo->{rdns});
+
+      } # scope, second level
+    } # scope, !keepall
+
+  } # type grouping for rDNS calls
+
+
   return \@retlist;