From 1f4aeebe383f5ede1af4442820ed87cd4dea762f Mon Sep 17 00:00:00 2001 From: boris Date: Tue, 2 Jun 2015 12:22:23 +0000 Subject: [PATCH] Supports server reflexive candidates for single-port UDP, and automatically detects mappings for EC2. --- .../ice/harvest/SinglePortUdpHarvester.java | 44 ++++++++++++++++++- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/src/org/ice4j/ice/harvest/SinglePortUdpHarvester.java b/src/org/ice4j/ice/harvest/SinglePortUdpHarvester.java index 78200c0..b9bfce3 100644 --- a/src/org/ice4j/ice/harvest/SinglePortUdpHarvester.java +++ b/src/org/ice4j/ice/harvest/SinglePortUdpHarvester.java @@ -113,11 +113,20 @@ 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)); + harvesters.add( + new SinglePortUdpHarvester(address, publicAddress)); } catch (IOException ioe) { @@ -163,6 +172,11 @@ 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}. */ @@ -172,9 +186,12 @@ 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) + public SinglePortUdpHarvester(TransportAddress localAddress, + TransportAddress publicAddress) throws IOException { this.localAddress = localAddress; @@ -196,6 +213,18 @@ 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. @@ -391,6 +420,17 @@ 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); + } + return new ArrayList(Arrays.asList(candidate)); }