Changeset 747 for trunk/cgi-bin

Timestamp:

06/17/15 16:42:05 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Add first subbranch of "merge to pool" rDNS calls - keepall/mergepeer.
See #8.

File:

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

trunk/cgi-bin/IPDB.pm

@@ -2492 +2492 @@
     } # scope, !keepall
 
+  } elsif ($args{newtype} =~ /.[dp]/) {
+    # Merge to pool
+
+    # Resize rDNS template for $prime
+    _rpc('resizeTemplate', oldcidr => "$binfo->{block}", newcidr => $newblock->network.'', rpcuser => $args{user});
+
+    if ($args{scope} eq 'keepall' || $args{scope} eq 'mergepeer') {
+      # Assemble a list of blocks to convert from template to individual records...
+      my @convlist;
+      my @dellist;
+      foreach my $mblock (@retlist) {
+        next if $mblock->{block} =~ $newblock;
+        if ($mblock->{mtype} =~ /.[cmdp]/) {
+          # Container and pool templates get deleted
+          push @dellist, $mblock->{block};
+        } else {
+          # Not-containers get converted to per-IP reverse records
+          push @convlist, $mblock->{block};
+        }
+      }
+      # And do the calls.
+      _rpc('delRevSet', cidrlist => join(',', @dellist), rpcuser => $args{user}, delforward => 'y', delsubs => 'n',
+          parpatt => $pinfo->{rdns});
+      _rpc('templatesToRecords', templates => \@convlist, rpcuser => $args{user});
+
+    } # scope eq 'keepall' || 'mergepeer'
+
   } # type grouping for rDNS calls
-
 
   return \@retlist;