From c03cfaa674bb6bcea6ce7e01335e0538846aa333 Mon Sep 17 00:00:00 2001 From: damencho Date: Thu, 5 Nov 2015 15:28:03 -0600 Subject: [PATCH] Removes adding mapped addresses as they are configured from the outside. They can be different settings for that, not only coming from aws harvester. --- .../ice/harvest/MultiplexingTcpHostHarvester.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/main/java/org/ice4j/ice/harvest/MultiplexingTcpHostHarvester.java b/src/main/java/org/ice4j/ice/harvest/MultiplexingTcpHostHarvester.java index 10a4c05..fc6aa3c 100644 --- a/src/main/java/org/ice4j/ice/harvest/MultiplexingTcpHostHarvester.java +++ b/src/main/java/org/ice4j/ice/harvest/MultiplexingTcpHostHarvester.java @@ -639,17 +639,6 @@ public class MultiplexingTcpHostHarvester serverSocketChannels.add(channel); } - // Automatically add a mapping if we're on EC2 - TransportAddress ec2Face = AwsCandidateHarvester.getDiscoveredFace(); - TransportAddress ec2Mask; - if (ec2Face != null && - (ec2Mask = AwsCandidateHarvester.getDiscoveredMask()) != null) - { - addMappedAddress(ec2Mask.getAddress(), ec2Face.getAddress()); - logger.info("Adding an EC2 mapping for TCP: " - + ec2Face + "->" + ec2Mask); - } - acceptThread = new AcceptThread(); acceptThread.start();