LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Create v4 mapped v6 correctly" into main

Browse Source
This commit is contained in:
Chiachang Wang
2023-07-20 05:06:18 +00:00
committed by Gerrit Code Review
parent 7a042d869f 65240048ce
commit 49ef2e917c
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/common/java/android/net/NattKeepalivePacketDataTest.kt
View File

@@ -28,6 +28,7 @@ import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo
import com.android.testutils.assertEqualBothWays import com.android.testutils.assertEqualBothWays
import com.android.testutils.assertParcelingIsLossless import com.android.testutils.assertParcelingIsLossless
import com.android.testutils.parcelingRoundTrip import com.android.testutils.parcelingRoundTrip
import java.net.Inet6Address
import java.net.InetAddress import java.net.InetAddress
import kotlin.test.assertFailsWith import kotlin.test.assertFailsWith
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
@@ -44,10 +45,33 @@ class NattKeepalivePacketDataTest {
private val TEST_PORT = 4243 private val TEST_PORT = 4243
private val TEST_PORT2 = 4244 private val TEST_PORT2 = 4244
// ::FFFF:1.2.3.4
private val SRC_V4_MAPPED_V6_ADDRESS_BYTES = byteArrayOf(
0x00.toByte(),
0x00.toByte(),
0x00.toByte(),
0x00.toByte(),
0x00.toByte(),
0x00.toByte(),
0x00.toByte(),
0x00.toByte(),
0x00.toByte(),
0x00.toByte(),
0xff.toByte(),
0xff.toByte(),
0x01.toByte(),
0x02.toByte(),
0x03.toByte(),
0x04.toByte()
)
private val TEST_SRC_ADDRV4 = "198.168.0.2".address() private val TEST_SRC_ADDRV4 = "198.168.0.2".address()
private val TEST_DST_ADDRV4 = "198.168.0.1".address() private val TEST_DST_ADDRV4 = "198.168.0.1".address()
private val TEST_ADDRV6 = "2001:db8::1".address() private val TEST_ADDRV6 = "2001:db8::1".address()
private val TEST_ADDRV4MAPPEDV6 = "::ffff:1.2.3.4".address() // This constant requires to be an Inet6Address, but InetAddresses.parseNumericAddress() will
// convert v4 mapped v6 address into an Inet4Address. So use Inet6Address.getByAddress() to
// create the address.
private val TEST_ADDRV4MAPPEDV6 = Inet6Address.getByAddress(null /* host */,
SRC_V4_MAPPED_V6_ADDRESS_BYTES, -1 /* scope_id */)
private val TEST_ADDRV4 = "1.2.3.4".address() private val TEST_ADDRV4 = "1.2.3.4".address()
private fun String.address() = InetAddresses.parseNumericAddress(this) private fun String.address() = InetAddresses.parseNumericAddress(this)