vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-26 04:28:00 +01:00
Code Issues Releases Wiki Activity

Merge pull request #543 from guusdk/websocket-default-port

Browse source 
Websocket implicit discovery should use common ports
This commit is contained in:
Florian Schmaus 2023-02-03 20:54:32 +01:00 committed by GitHub
commit ae2c53f78c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
smack-websocket/src/main/java/org/jivesoftware/smack/websocket/XmppWebSocketTransportModule.java
View file

@ -223,16 +223,17 @@ public final class XmppWebSocketTransportModule
} }
if (moduleDescriptor.isImplicitWebSocketEndpointEnabled()) { if (moduleDescriptor.isImplicitWebSocketEndpointEnabled()) {
String urlWithoutScheme = "://" + host + ":5443/ws"; for (final int securePort : new int[] {5443, 5281, 7443}) {
SecureWebSocketRemoteConnectionEndpoint implicitSecureEndpoint = SecureWebSocketRemoteConnectionEndpoint.from( SecureWebSocketRemoteConnectionEndpoint implicitSecureEndpoint = SecureWebSocketRemoteConnectionEndpoint.from(
WebSocketRemoteConnectionEndpoint.SECURE_WEB_SOCKET_SCHEME + urlWithoutScheme); WebSocketRemoteConnectionEndpoint.SECURE_WEB_SOCKET_SCHEME + "://" + host + ":" + securePort + "/ws");
result.discoveredSecureEndpoints.add(implicitSecureEndpoint); result.discoveredSecureEndpoints.add(implicitSecureEndpoint);
}
for (final int insecurePort : new int[] {5443, 5280, 7070}) {
InsecureWebSocketRemoteConnectionEndpoint implicitInsecureEndpoint = InsecureWebSocketRemoteConnectionEndpoint.from( InsecureWebSocketRemoteConnectionEndpoint implicitInsecureEndpoint = InsecureWebSocketRemoteConnectionEndpoint.from(
WebSocketRemoteConnectionEndpoint.INSECURE_WEB_SOCKET_SCHEME + urlWithoutScheme); WebSocketRemoteConnectionEndpoint.INSECURE_WEB_SOCKET_SCHEME + "://" + host + ":" + insecurePort + "/ws");
result.discoveredInsecureEndpoints.add(implicitInsecureEndpoint); result.discoveredInsecureEndpoints.add(implicitInsecureEndpoint);
} }
}
final LookupConnectionEndpointsResult endpointsResult; final LookupConnectionEndpointsResult endpointsResult;
if (result.isEmpty()) { if (result.isEmpty()) {