From c47ecee6398a86b479abfc87c078a18019f99ac1 Mon Sep 17 00:00:00 2001 From: Boris Grozev Date: Wed, 16 Nov 2016 16:31:23 -0600 Subject: [PATCH] feat: Appends known mappings to the TCP harvester. --- .../org/ice4j/ice/harvest/TcpHarvester.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/main/java/org/ice4j/ice/harvest/TcpHarvester.java b/src/main/java/org/ice4j/ice/harvest/TcpHarvester.java index 94d288d..752f5f8 100644 --- a/src/main/java/org/ice4j/ice/harvest/TcpHarvester.java +++ b/src/main/java/org/ice4j/ice/harvest/TcpHarvester.java @@ -107,6 +107,7 @@ public class TcpHarvester { super(port); this.ssltcp = false; + addMappedAddresses(); } /** @@ -125,6 +126,7 @@ public class TcpHarvester { super(port, Collections.list(NetworkInterface.getNetworkInterfaces())); this.ssltcp = ssltcp; + addMappedAddresses(); } /** @@ -147,6 +149,7 @@ public class TcpHarvester { super(port, interfaces); this.ssltcp = ssltcp; + addMappedAddresses(); } /** @@ -163,6 +166,7 @@ public class TcpHarvester { super(transportAddresses); this.ssltcp = false; + addMappedAddresses(); } /** @@ -182,6 +186,21 @@ public class TcpHarvester { super(transportAddresses); this.ssltcp = ssltcp; + addMappedAddresses(); + } + + /** + * Adds the mapped addresses known from {@link MappingCandidateHarvesters}. + */ + private void addMappedAddresses() + { + for (MappingCandidateHarvester harvester + : MappingCandidateHarvesters.getHarvesters()) + { + addMappedAddress( + harvester.getMask().getAddress(), + harvester.getFace().getAddress()); + } } /** @@ -196,6 +215,11 @@ public class TcpHarvester public void addMappedAddress(InetAddress publicAddress, InetAddress localAddress) { + if (logger.isLoggable(Level.FINE)) + { + logger.fine("Adding a mapped address: " + localAddress + + " => " + publicAddress); + } mappedAddresses.put(publicAddress, localAddress); }