Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove preference of "official servers" #51

Merged
merged 1 commit into from
Nov 17, 2023
Merged

Remove preference of "official servers" #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 1 addition & 28 deletions ice-adapter/src/main/java/com/faforever/iceadapter/ice/PeerIceModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,42 +165,15 @@ private List<IceServer> getViableIceServers() {
return allIceServers;
}

List<IceServer> fafIceServers = allIceServers.stream()
.filter(server -> server.getTurnAddresses().stream()
.anyMatch(transportAddress -> transportAddress.getHostString().contains("faforever.com")))
.toList();
// Try official servers first
List<IceServer> viableIceServers = fafIceServers.stream()
.filter(IceServer::hasAcceptableLatency)
.collect(Collectors.toList());
if (!viableIceServers.isEmpty()) {
log.info("Using official ice servers: {}", viableIceServers.stream().map(it -> "[" + it.getTurnAddresses().stream().map(TransportAddress::toString).collect(Collectors.joining(", ")) + "]").collect(Collectors.joining(", ")));
return viableIceServers;
}

// Try servers with acceptable latency
viableIceServers = allIceServers.stream()
List<IceServer> viableIceServers = allIceServers.stream()
.filter(IceServer::hasAcceptableLatency)
.collect(Collectors.toList());
if (!viableIceServers.isEmpty()) {
log.info("Using all viable ice servers: {}", viableIceServers.stream().map(it -> "[" + it.getTurnAddresses().stream().map(TransportAddress::toString).collect(Collectors.joining(", ")) + "]").collect(Collectors.joining(", ")));
return viableIceServers;
}

// Try the closest server
Optional<IceServer> closestIceServer = allIceServers.stream()
.filter(server -> server.getRoundTripTime().join().isPresent())
.min(Comparator.comparing(server -> server.getRoundTripTime().join().getAsDouble()));
if (closestIceServer.isPresent()) {
log.info("Using closest ice server: {}", closestIceServer.get().getTurnAddresses().stream().map(TransportAddress::toString).collect(Collectors.joining(", ")));
viableIceServers.add(closestIceServer.get());
}

if (!viableIceServers.isEmpty()) {
log.info("Using all reachable ice servers: {}", viableIceServers.stream().map(it -> "[" + it.getTurnAddresses().stream().map(TransportAddress::toString).collect(Collectors.joining(", ")) + "]").collect(Collectors.joining(", ")));
return viableIceServers;
}

log.info("Using all ice servers: {}", allIceServers.stream().map(it -> "[" + it.getTurnAddresses().stream().map(TransportAddress::toString).collect(Collectors.joining(", ")) + "]").collect(Collectors.joining(", ")));
return allIceServers;
}
Expand Down