From c51e33697129da0d2eb85b0a73694efc8411a1a8 Mon Sep 17 00:00:00 2001 From: Mark Sergienko Date: Wed, 3 Jun 2026 17:12:56 +0100 Subject: [PATCH 1/2] Use Java socket by default for RTMP --- rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpClient.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpClient.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpClient.kt index 61a9e1087..cce32fbb8 100644 --- a/rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpClient.kt +++ b/rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpClient.kt @@ -109,7 +109,7 @@ class RtmpClient(private val connectChecker: ConnectChecker) { get() = rtmpSender.getSentVideoFrames() val bytesSend: Long get() = rtmpSender.getBytesSend() - var socketType = SocketType.KTOR + var socketType = SocketType.JAVA var socketTimeout = StreamSocket.DEFAULT_TIMEOUT var shouldFailOnRead = false var shouldSendPings = false From ba91726070cb0ccef7b209e1338d89876c7132fb Mon Sep 17 00:00:00 2001 From: Mark Sergienko Date: Thu, 4 Jun 2026 11:37:49 +0100 Subject: [PATCH 2/2] Enable hostname verification for Java TLS sockets --- .../com/pedro/common/socket/java/TcpStreamSocketJava.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/pedro/common/socket/java/TcpStreamSocketJava.kt b/common/src/main/java/com/pedro/common/socket/java/TcpStreamSocketJava.kt index 925a2bf31..94dcf3fe8 100644 --- a/common/src/main/java/com/pedro/common/socket/java/TcpStreamSocketJava.kt +++ b/common/src/main/java/com/pedro/common/socket/java/TcpStreamSocketJava.kt @@ -30,6 +30,12 @@ class TcpStreamSocketJava( val socketAddress: SocketAddress = InetSocketAddress(host, port) socket.connect(socketAddress, timeout.toInt()) socket.soTimeout = timeout.toInt() + if (socket is SSLSocket) { + socket.sslParameters = socket.sslParameters.apply { + endpointIdentificationAlgorithm = "HTTPS" + } + socket.startHandshake() + } return socket } -} \ No newline at end of file +}