Merge branch 'master' into dependabot/gradle/camerax-1.5.1

Author: pedroSG94

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ dokka = "2.0.0"
 appcompat = "1.6.1"
 #noinspection GradleDependency, version 2.2.0 need min sdk 21
 constraintlayout = "2.1.4"
-ktor = "3.3.0"
+ktor = "3.3.1"
 camerax = "1.5.1"
 multidex = "2.0.1"
 annotation = "1.9.1"

srt/src/main/java/com/pedro/srt/srt/SrtClient.kt

@@ -236,6 +236,7 @@ class SrtClient(private val connectChecker: ConnectChecker) {
 
           commandsManager.writeHandshake(socket, response.copy(
             encryption = commandsManager.getEncryptType(),
+            extensionField = ExtensionField.calculateValue(response.extensionField),
             handshakeType = HandshakeType.CONCLUSION,
             handshakeExtension = HandshakeExtension(
               flags = ExtensionContentFlag.TSBPDSND.value or ExtensionContentFlag.TSBPDRCV.value or

srt/src/main/java/com/pedro/srt/srt/packets/control/handshake/ExtensionField.kt

@@ -22,9 +22,15 @@ import java.io.IOException
  * Created by pedro on 22/8/23.
  */
 enum class ExtensionField(val value: Int) {
-  HS_REQ(1), KM_REQ(2), CONFIG(4), HS_V5_MAGIC(18967);
+  HS_V5_FLAG(131072), HS_REQ(1), KM_REQ(2), CONFIG(4), HS_V5_MAGIC(18967);
 
   companion object {
     infix fun from(value: Int): ExtensionField = entries.firstOrNull { it.value == value } ?: throw IOException("unknown extension field: $value")
+
+    fun calculateValue(value: Int): Int {
+      val hsV5enabled = value and HS_V5_FLAG.value != 0
+      val extensionField = HS_REQ.value or CONFIG.value
+      return if (hsV5enabled) HS_V5_FLAG.value or KM_REQ.value or extensionField else extensionField
+    }
   }
 }

srt/src/test/java/com/pedro/srt/srt/control/HandshakeTest.kt

@@ -22,6 +22,7 @@ import com.pedro.srt.srt.packets.control.handshake.Handshake
 import com.pedro.srt.srt.packets.control.handshake.HandshakeType
 import com.pedro.srt.srt.packets.control.handshake.extension.ExtensionContentFlag
 import com.pedro.srt.srt.packets.control.handshake.extension.HandshakeExtension
+import junit.framework.TestCase.assertEquals
 import org.junit.Assert.assertArrayEquals
 import org.junit.Test
 import java.io.ByteArrayInputStream
@@ -31,6 +32,12 @@ import java.io.ByteArrayInputStream
  */
 class HandshakeTest {
 
+  @Test
+  fun `test extension field calculation`() {
+    assertEquals(131079, ExtensionField.calculateValue(150039))
+    assertEquals(5, ExtensionField.calculateValue(18967))
+  }
+
   @Test
   fun `GIVEN a handshake packet WHEN write packet in a buffer THEN get expected buffer`() {
     val expectedData = byteArrayOf(-128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, -60, 0, 0, 0, 64, 0, 0, 0, 4, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 5, -36, 0, 0, 32, 0, -1, -1, -1, -1, 45, 116, -9, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 0, 1, 5, 3, 0, 0, 0, 63, 0, 120, 0, 0, 0, 5, 0, 1, 116, 115, 101, 116)