fix: Fix creating STUN harvesters when no local addresses are allowed. (#265)

This commit is contained in:
bgrozev 2022-10-21 16:21:23 -05:00 committed by GitHub
parent 28a23e1859
commit 76e8a1968d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -220,17 +220,14 @@ public class MappingCandidateHarvesters
List<Callable<StunMappingCandidateHarvester>> tasks = new LinkedList<>();
// Create a StunMappingCandidateHarvester for each local:remote address
// pair.
List<InetAddress> localAddresses
= HostCandidateHarvester.getAllAllowedAddresses();
// Create a StunMappingCandidateHarvester for each local:remote address pair.
List<InetAddress> localAddresses = HostCandidateHarvester.getAllAllowedAddresses();
for (String stunServer : stunServers)
{
String[] addressAndPort = stunServer.split(":");
if (addressAndPort.length < 2)
{
logger.severe("Failed to parse STUN server address: "
+ stunServer);
logger.severe("Failed to parse STUN server address: " + stunServer);
continue;
}
int port;
@ -259,15 +256,12 @@ public class MappingCandidateHarvesters
continue;
}
TransportAddress localAddress
= new TransportAddress(localInetAddress, 0, Transport.UDP);
TransportAddress localAddress = new TransportAddress(localInetAddress, 0, Transport.UDP);
logger.info("Using " + remoteAddress + " for StunMappingCandidateHarvester (localAddress="
+ localAddress + ").");
final StunMappingCandidateHarvester stunHarvester
= new StunMappingCandidateHarvester(
localAddress,
remoteAddress);
= new StunMappingCandidateHarvester(localAddress, remoteAddress);
Callable<StunMappingCandidateHarvester> task = () ->
{
@ -278,8 +272,14 @@ public class MappingCandidateHarvesters
}
}
// Now run discover() on all created harvesters in parallel and pick
// the ones which succeeded.
if (tasks.isEmpty())
{
logger.warning("STUN mapping harvesters are configured, but no allowed local addresses were found." +
" Not using STUN.");
return stunHarvesters;
}
// Now run discover() on all created harvesters in parallel and pick the ones which succeeded.
ExecutorService es = ExecutorFactory.createFixedThreadPool(tasks.size(), "ice4j.Harvester-executor-");
try