MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update call routing to return ipv6 ips in RFC3986 format

This commit is contained in:
adel-signal 2024-02-23 08:57:58 -08:00 committed by GitHub
parent a5774bf6ff
commit 665a26d164
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/main/java/org/whispersystems/textsecuregcm/calls/routing/TurnCallRouter.java
View File

@ -134,7 +134,11 @@ public class TurnCallRouter {
ipv4Selection = ipv4Selection.stream().limit(limit - ipv6Selection.size()).toList(); ipv4Selection = ipv4Selection.stream().limit(limit - ipv6Selection.size()).toList();
} }
return Stream.concat(ipv4Selection.stream(), ipv6Selection.stream()).map(InetAddress::getHostAddress).toList(); return Stream.concat(
ipv4Selection.stream().map(InetAddress::getHostAddress),
// map ipv6 to RFC3986 format i.e. surrounded by brackets
ipv6Selection.stream().map(i -> String.format("[%s]", i.getHostAddress()))
).toList();
} }
private static List<String> getUrlsForInstances(List<String> instanceIps) { private static List<String> getUrlsForInstances(List<String> instanceIps) {

56
service/src/test/java/org/whispersystems/textsecuregcm/calls/routing/TurnCallRouterTest.java
View File

@ -165,20 +165,20 @@ public class TurnCallRouterTest {
"turn:9.9.9.2:80?transport=tcp", "turn:9.9.9.2:80?transport=tcp",
"turns:9.9.9.2:443?transport=tcp", "turns:9.9.9.2:443?transport=tcp",
"stun:2222:1111:0:abc2:0:0:0:0", "stun:[2222:1111:0:abc2:0:0:0:0]",
"turn:2222:1111:0:abc2:0:0:0:0", "turn:[2222:1111:0:abc2:0:0:0:0]",
"turn:2222:1111:0:abc2:0:0:0:0:80?transport=tcp", "turn:[2222:1111:0:abc2:0:0:0:0]:80?transport=tcp",
"turns:2222:1111:0:abc2:0:0:0:0:443?transport=tcp", "turns:[2222:1111:0:abc2:0:0:0:0]:443?transport=tcp",
"stun:2222:1111:0:abc0:0:0:0:0", "stun:[2222:1111:0:abc0:0:0:0:0]",
"turn:2222:1111:0:abc0:0:0:0:0", "turn:[2222:1111:0:abc0:0:0:0:0]",
"turn:2222:1111:0:abc0:0:0:0:0:80?transport=tcp", "turn:[2222:1111:0:abc0:0:0:0:0]:80?transport=tcp",
"turns:2222:1111:0:abc0:0:0:0:0:443?transport=tcp", "turns:[2222:1111:0:abc0:0:0:0:0]:443?transport=tcp",
"stun:2222:1111:0:abc1:0:0:0:0", "stun:[2222:1111:0:abc1:0:0:0:0]",
"turn:2222:1111:0:abc1:0:0:0:0", "turn:[2222:1111:0:abc1:0:0:0:0]",
"turn:2222:1111:0:abc1:0:0:0:0:80?transport=tcp", "turn:[2222:1111:0:abc1:0:0:0:0]:80?transport=tcp",
"turns:2222:1111:0:abc1:0:0:0:0:443?transport=tcp" "turns:[2222:1111:0:abc1:0:0:0:0]:443?transport=tcp"
))); )));
} }
@ -196,10 +196,10 @@ public class TurnCallRouterTest {
"turn:1.1.1.1:80?transport=tcp", "turn:1.1.1.1:80?transport=tcp",
"turns:1.1.1.1:443?transport=tcp", "turns:1.1.1.1:443?transport=tcp",
"stun:2222:1111:0:dead:0:0:0:0", "stun:[2222:1111:0:dead:0:0:0:0]",
"turn:2222:1111:0:dead:0:0:0:0", "turn:[2222:1111:0:dead:0:0:0:0]",
"turn:2222:1111:0:dead:0:0:0:0:80?transport=tcp", "turn:[2222:1111:0:dead:0:0:0:0]:80?transport=tcp",
"turns:2222:1111:0:dead:0:0:0:0:443?transport=tcp" "turns:[2222:1111:0:dead:0:0:0:0]:443?transport=tcp"
))); )));
} }
@ -225,20 +225,20 @@ public class TurnCallRouterTest {
"turn:9.9.9.1:80?transport=tcp", "turn:9.9.9.1:80?transport=tcp",
"turns:9.9.9.1:443?transport=tcp", "turns:9.9.9.1:443?transport=tcp",
"stun:2222:1111:0:abc3:0:0:0:0", "stun:[2222:1111:0:abc3:0:0:0:0]",
"turn:2222:1111:0:abc3:0:0:0:0", "turn:[2222:1111:0:abc3:0:0:0:0]",
"turn:2222:1111:0:abc3:0:0:0:0:80?transport=tcp", "turn:[2222:1111:0:abc3:0:0:0:0]:80?transport=tcp",
"turns:2222:1111:0:abc3:0:0:0:0:443?transport=tcp", "turns:[2222:1111:0:abc3:0:0:0:0]:443?transport=tcp",
"stun:2222:1111:0:abc2:0:0:0:0", "stun:[2222:1111:0:abc2:0:0:0:0]",
"turn:2222:1111:0:abc2:0:0:0:0", "turn:[2222:1111:0:abc2:0:0:0:0]",
"turn:2222:1111:0:abc2:0:0:0:0:80?transport=tcp", "turn:[2222:1111:0:abc2:0:0:0:0]:80?transport=tcp",
"turns:2222:1111:0:abc2:0:0:0:0:443?transport=tcp", "turns:[2222:1111:0:abc2:0:0:0:0]:443?transport=tcp",
"stun:2222:1111:0:abc0:0:0:0:0", "stun:[2222:1111:0:abc0:0:0:0:0]",
"turn:2222:1111:0:abc0:0:0:0:0", "turn:[2222:1111:0:abc0:0:0:0:0]",
"turn:2222:1111:0:abc0:0:0:0:0:80?transport=tcp", "turn:[2222:1111:0:abc0:0:0:0:0]:80?transport=tcp",
"turns:2222:1111:0:abc0:0:0:0:0:443?transport=tcp" "turns:[2222:1111:0:abc0:0:0:0:0]:443?transport=tcp"
))); )));
} }