Changeset 748 for trunk

Timestamp:

06/17/15 16:59:08 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Fill in next major subbranch of mergeBlocks() rDNS calls;
clearpeer/clearall.
See #8.

File:

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

trunk/cgi-bin/IPDB.pm

@@ -2518 +2518 @@
 
     } # scope eq 'keepall' || 'mergepeer'
+    else {
+
+      # Assemble a list of blocks to convert from template to individual records...
+      my @convlist;
+      my @dellist;
+      my @fulldellist;
+# There may be an impossible edge case that can be optimized away in here...
+      foreach my $mblock (@retlist) {
+        my $checkcidr = new NetAddr::IP $mblock->{block};
+        next if $mblock->{block} =~ $newblock;
+        if (!$block->contains($checkcidr)) {
+          # Blocks not within the original get deleted
+          push @fulldellist, $mblock->{block};
+        }
+        elsif ($mblock->{mtype} =~ /.[cmdp]/) {
+          # Containers and pools get deleted
+          push @dellist, $mblock->{block};
+        } else {
+          # Whatever's left over gets converted
+          push @convlist, $mblock->{block};
+        }
+      } # foreach @retlist
+      # And do the calls.
+      if ($args{scope} eq 'clearpeer') {
+        # Not happy doing this many, but there isn't really a better way.
+        # We delete ALL EVARYTHING in peer blocks...
+        _rpc('delRevSet', cidrlist => join(',', @fulldellist), rpcuser => $args{user}, delforward => 'y',
+            delsubs => 'y', parpatt => $pinfo->{rdns}) if @fulldellist;
+        # ... and just the template for container or pool templates in $prime...
+        _rpc('delRevSet', cidrlist => join(',', @dellist), rpcuser => $args{user}, delforward => 'y',
+            delsubs => 'n', parpatt => $pinfo->{rdns}) if @dellist;
+        # ... and convert a few to record groups
+        _rpc('templatesToRecords', templates => \@convlist, rpcuser => $args{user}) if @convlist;
+      }
+      if ($args{scope} eq 'clearall') {
+# consider just doing join(',',$newblock->split($newblock->masklen+1))?
+        _rpc('delRevSet', cidrlist => join(',', @fulldellist, @dellist, @convlist, $binfo->{block}),
+            rpcuser => $args{user}, delforward => 'y', delsubs => 'y', parpatt => $pinfo->{rdns});
+      }
+
+    } # scope eq 'clearpeer' || 'clearall'
 
   } # type grouping for rDNS calls