commit 1a76ed76b4e20be18d48074f2a7f4f9677deb887
author Yuyang Huang <yuyanghuang@google.com> Sat Mar 23 19:37:52 2024 +0900
committer Yuyang Huang <yuyanghuang@google.com> Mon Mar 25 21:02:24 2024 +0900
tree 1c8437c3ffdc29cfc606d3eb0f8426fcde7c0860
parent c4b66a5fc21c6a888a0365fce93e25970f188def

Add addDataCopy helper for simplified data region copying

Introduced the addDataCopy(byte[] content) helper method to streamline
data region byte copying. This helper automatically updates data and
generates the appropriate addDataCopy(int src, int len) call.

Test: TH
Change-Id: Idb28c2cb94ceccf5922ae99f295518bb3cfdd6e6

tests/unit/src/android/net/apf/ApfV5Test.kt

diff --git a/tests/unit/src/android/net/apf/ApfV5Test.kt b/tests/unit/src/android/net/apf/ApfV5Test.kt
index 510cba6..6e3b93e 100644
--- a/tests/unit/src/android/net/apf/ApfV5Test.kt
+++ b/tests/unit/src/android/net/apf/ApfV5Test.kt
@@ -31,6 +31,7 @@
 import android.net.apf.BaseApfGenerator.Register.R1
 import androidx.test.filters.SmallTest
 import androidx.test.runner.AndroidJUnit4
+import com.android.net.module.util.HexDump
 import com.android.net.module.util.Struct
 import com.android.net.module.util.structs.EthernetHeader
 import com.android.net.module.util.structs.Ipv4Header
@@ -597,6 +598,31 @@
     }
 
     @Test
+    fun testCopyContentToTxBuffer() {
+        val program = ApfV6Generator()
+                .addData()
+                .addAllocate(18)
+                .addDataCopy(HexDump.hexStringToByteArray("112233445566"))
+                .addDataCopy(HexDump.hexStringToByteArray("223344"))
+                .addDataCopy(HexDump.hexStringToByteArray("778899"))
+                .addDataCopy(HexDump.hexStringToByteArray("112233445566"))
+                .addTransmitWithoutChecksum()
+                .generate()
+        assertContentEquals(listOf(
+                "0: data        9, 112233445566778899",
+                "12: allocate    18",
+                "16: datacopy    src=3, len=6",
+                "19: datacopy    src=4, len=3",
+                "22: datacopy    src=9, len=3",
+                "25: datacopy    src=3, len=6",
+                "28: transmit    ip_ofs=255"
+        ), ApfJniUtils.disassembleApf(program).map{ it.trim() })
+        assertPass(MIN_APF_VERSION_IN_DEV, program, testPacket)
+        val transmitPkt = HexDump.toHexString(ApfJniUtils.getTransmittedPacket())
+        assertEquals("112233445566223344778899112233445566", transmitPkt)
+    }
+
+    @Test
     fun testPassDrop() {
         var program = ApfV6Generator()
                 .addDrop()