commit 2eb48f02656aded7a54b3e2ce309f2edb412b241
author Patrick Rohr <prohr@google.com> Fri Apr 19 14:21:12 2024 -0700
committer Patrick Rohr <prohr@google.com> Mon Apr 22 11:29:02 2024 -0700
tree 1623bb9ea92dd34168f4e487da7017a4c92fc7d8
parent c03867b7575da41047a97a4e97b40b9f70d7e787

Log ping packet and reply and use ByteArray.toHexString

ByteArray.toHexString is experimental stdlib API, so it requires a
special annotation to be used. If there is a good reason not to use the
experimental API, an extension function "asHexString()" could be added
to.
Unfortunately, ByteArray does not have a companion object, so it is not
possible to add a fun ByteArray.Companion.fromHexString().

Test: TH
Change-Id: Ifedc998e95d6a1e4cdeb5bd9982b9456e64e649c

tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt

diff --git a/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt b/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
index 7a4d90b..79779e2 100644
--- a/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
+++ b/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
@@ -39,6 +39,7 @@
 import android.system.OsConstants.IPPROTO_ICMP
 import android.system.OsConstants.SOCK_DGRAM
 import android.system.OsConstants.SOCK_NONBLOCK
+import android.util.Log
 import androidx.test.platform.app.InstrumentationRegistry
 import com.android.compatibility.common.util.PropertyUtil.getVsrApiLevel
 import com.android.compatibility.common.util.SystemUtil.runShellCommand
@@ -83,6 +84,8 @@
 @AppModeFull(reason = "CHANGE_NETWORK_STATE permission can't be granted to instant apps")
 @RunWith(DevSdkIgnoreRunner::class)
 @NetworkStackModuleTest
+// ByteArray.toHexString is experimental API
+@kotlin.ExperimentalStdlibApi
 class ApfIntegrationTest {
     companion object {
         private val PING_DESTINATION = InetSocketAddress("8.8.8.8", 0)
@@ -124,6 +127,8 @@
 
         override fun handlePacket(recvbuf: ByteArray, length: Int) {
             // Only copy the ping data and complete the future.
+            val result = recvbuf.sliceArray(8..<length)
+            Log.i(TAG, "Received ping reply: ${result.toHexString()}")
             futureReply.complete(recvbuf.sliceArray(8..<length))
         }
 
@@ -142,6 +147,7 @@
             // +-+-+-+-+-
             val icmpHeader = byteArrayOf(0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
             val packet = icmpHeader + data
+            Log.i(TAG, "Sent ping: ${packet.toHexString()}")
             Os.sendto(sockFd!!, packet, 0, packet.size, 0, PING_DESTINATION)
         }
 
@@ -303,7 +309,7 @@
     }
 
     fun installProgram(bytes: ByteArray) {
-        val prog = HexDump.toHexString(bytes, 0 /* offset */, bytes.size, false /* upperCase */)
+        val prog = bytes.toHexString()
         val result = runShellCommandOrThrow("cmd network_stack apf $ifname install $prog").trim()
         // runShellCommandOrThrow only throws on S+.
         assertThat(result).isEqualTo("success")