diff --git a/src/main/java/org/ice4j/ice/harvest/SinglePortUdpHarvester.java b/src/main/java/org/ice4j/ice/harvest/SinglePortUdpHarvester.java
index 1d0ef40..0487797 100644
--- a/src/main/java/org/ice4j/ice/harvest/SinglePortUdpHarvester.java
+++ b/src/main/java/org/ice4j/ice/harvest/SinglePortUdpHarvester.java
@@ -133,28 +133,6 @@ public class SinglePortUdpHarvester
logger.info("Failed to get network interfaces: " + se);
}
- TransportAddress ec2Mask = AwsCandidateHarvester.getMask();
- for (TransportAddress address : addresses)
- {
- TransportAddress publicAddress = null;
- if (ec2Mask != null
- && ec2Mask.getAddress().equals(address.getAddress()))
- {
- publicAddress = AwsCandidateHarvester.getFace();
- }
-
- try
- {
- harvesters.add(
- new SinglePortUdpHarvester(address, publicAddress));
- }
- catch (IOException ioe)
- {
- logger.info("Failed to create SinglePortUdpHarvester for "
- + "address " + address + ": " + ioe);
- }
- }
-
return harvesters;
}
@@ -192,11 +170,6 @@ public class SinglePortUdpHarvester
*/
private final DatagramSocket socket;
- /**
- * The public address that this harvester will use for reflexive candidates.
- */
- private TransportAddress publicAddress = null;
-
/**
* The thread reading from {@link #socket}.
*/
@@ -206,12 +179,9 @@ public class SinglePortUdpHarvester
* Initializes a new SinglePortUdpHarvester instance which is to
* bind on the specified local address.
* @param localAddress the address to bind to.
- * @param publicAddress the public address that this harvester will use for
- * reflexive candidates.
* @throws IOException if initialization fails.
*/
- public SinglePortUdpHarvester(TransportAddress localAddress,
- TransportAddress publicAddress)
+ public SinglePortUdpHarvester(TransportAddress localAddress)
throws IOException
{
this.localAddress = localAddress;
@@ -233,18 +203,6 @@ public class SinglePortUdpHarvester
thread.start();
}
- /**
- * Initializes a new SinglePortUdpHarvester instance which is to
- * bind on the specified local address.
- * @param localAddress the address to bind to.
- * @throws IOException if initialization fails.
- */
- public SinglePortUdpHarvester(TransportAddress localAddress)
- throws IOException
- {
- this(localAddress, null);
- }
-
/**
* Perpetually reads datagrams from {@link #socket} and handles them
* accordingly.
@@ -440,16 +398,16 @@ public class SinglePortUdpHarvester
candidates.put(ufrag, candidate);
component.addLocalCandidate(candidate);
- if (publicAddress != null)
- {
- ServerReflexiveCandidate mappedCandidate
- = new ServerReflexiveCandidate(
- publicAddress,
- candidate,
- candidate.getStunServerAddress(),
- CandidateExtendedType.STATICALLY_MAPPED_CANDIDATE);
- component.addLocalCandidate(mappedCandidate);
- }
+// if (publicAddress != null)
+// {
+// ServerReflexiveCandidate mappedCandidate
+// = new ServerReflexiveCandidate(
+// publicAddress,
+// candidate,
+// candidate.getStunServerAddress(),
+// CandidateExtendedType.STATICALLY_MAPPED_CANDIDATE);
+// component.addLocalCandidate(mappedCandidate);
+// }
return new ArrayList(Arrays.asList(candidate));
}