fix handshake ipaddress

pedroSG94 · Nov 8, 2023 · 5327b3b · 5327b3b
1 parent 8f034fc
commit 5327b3b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/app/src/main/java/com/pedro/streamer/openglexample/OpenGlSrtActivity.java b/app/src/main/java/com/pedro/streamer/openglexample/OpenGlSrtActivity.java
@@ -398,7 +398,7 @@ public void onClick(View view) {
         if (srtCamera1.isRecording()
                 || srtCamera1.prepareAudio() && srtCamera1.prepareVideo()) {
           button.setText(R.string.stop_button);
-          srtCamera1.startStream(etUrl.getText().toString());
+          srtCamera1.startStream("srt://192.168.0.191:9999/srt://192.168.0.191:9999/app/stream");
         } else {
           Toast.makeText(this, "Error preparing stream, This device cant do it",
                   Toast.LENGTH_SHORT).show();

diff --git a/srt/src/main/java/com/pedro/srt/srt/CommandsManager.kt b/srt/src/main/java/com/pedro/srt/srt/CommandsManager.kt
@@ -48,6 +48,7 @@ class CommandsManager {
   var startTS = 0L //microSeconds
   var audioDisabled = false
   var videoDisabled = false
+  var host = ""
   //Avoid write a packet in middle of other.
   private val writeSync = Mutex(locked = false)
 
@@ -63,7 +64,7 @@ class CommandsManager {
   suspend fun writeHandshake(socket: SrtSocket?, handshake: Handshake = Handshake()) {
     writeSync.withLock {
       handshake.initialPacketSequence = sequenceNumber
-      handshake.ipAddress = getIPAddress()
+      handshake.ipAddress = host
       handshake.write(getTs(), 0)
       Log.i(TAG, handshake.toString())
       socket?.write(handshake)
@@ -144,25 +145,14 @@ class CommandsManager {
     MTU = Constants.MTU
     socketId = 0
     startTS = 0L
+    host = ""
     packetHandlingQueue.clear()
   }
 
   private fun generateInitialSequence(): Int {
     return Random.nextInt(0, Int.MAX_VALUE)
   }
 
-  private fun getIPAddress(): String {
-    val interfaces: List<NetworkInterface> = NetworkInterface.getNetworkInterfaces().toList()
-    val vpnInterfaces = interfaces.filter { it.displayName.contains("tun") }
-    val address: String by lazy { interfaces.findAddress().firstOrNull() ?: "0.0.0.0" }
-    return if (vpnInterfaces.isNotEmpty()) {
-      val vpnAddresses = vpnInterfaces.findAddress()
-      vpnAddresses.firstOrNull() ?: address
-    } else {
-      address
-    }
-  }
-
   private fun List<NetworkInterface>.findAddress(): List<String?> = this.asSequence()
     .map { addresses -> addresses.inetAddresses.asSequence() }
     .flatten()

diff --git a/srt/src/main/java/com/pedro/srt/srt/SrtClient.kt b/srt/src/main/java/com/pedro/srt/srt/SrtClient.kt
@@ -162,6 +162,7 @@ class SrtClient(private val connectCheckerSrt: ConnectCheckerSrt) {
         val streamName =
           if (srtMatcher.group(4).isNullOrEmpty()) "" else "/" + srtMatcher.group(4)
         val path = "${srtMatcher.group(3)}$streamName".trim()
+        commandsManager.host = host
 
         val error = runCatching {
           socket = SrtSocket(host, port)

diff --git a/srt/src/main/java/com/pedro/srt/srt/packets/control/handshake/Handshake.kt b/srt/src/main/java/com/pedro/srt/srt/packets/control/handshake/Handshake.kt
@@ -25,6 +25,7 @@ import com.pedro.srt.utils.readUInt32
 import com.pedro.srt.utils.writeUInt16
 import com.pedro.srt.utils.writeUInt32
 import java.io.InputStream
+import java.net.InetAddress
 
 /**
  * Created by pedro on 21/8/23.
@@ -103,9 +104,15 @@ data class Handshake(
   }
 
   private fun writeAddress() {
-      val numbers = ipAddress.split(".").map { it.trim().toInt() }
-    numbers.forEach {
-      buffer.writeUInt32(it)
+    val address = InetAddress.getByName(ipAddress)
+    val bytes = address.address.toList().chunked(4).map { it.reversed() }
+    bytes.forEach {
+      buffer.write(it.toByteArray())
+    }
+    if (bytes.size == 1) { //ipv4
+      buffer.writeUInt32(0)
+      buffer.writeUInt32(0)
+      buffer.writeUInt32(0)
     }
   }
 

diff --git a/...src/main/java/com/pedro/srt/srt/packets/control/handshake/extension/HandshakeExtension.kt b/...src/main/java/com/pedro/srt/srt/packets/control/handshake/extension/HandshakeExtension.kt
@@ -25,7 +25,7 @@ import com.pedro.srt.utils.writeUInt32
  *
  */
 data class HandshakeExtension(
-  private val version: String = "1.4.4",
+  private val version: String = "1.5.3",
   private val flags: Int = ExtensionContentFlag.REXMITFLG.value or ExtensionContentFlag.CRYPT.value,
   private val receiverDelay: Int = 120,
   private val senderDelay: Int = 0,