From c1cf40d38eae3933db6abc400a6d1c046ba5dd67 Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Mon, 7 Apr 2025 19:25:05 -0700 Subject: [PATCH] Move UDP header assembly to build() Test: TH Flag: EXEMPT mainline Bug: 1000001 Change-Id: I5e070a57bfa40f95b72549cb02662f6557f78d45 --- .../com/android/testutils/PacketBuilderUtils.kt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/staticlibs/testutils/devicetests/com/android/testutils/PacketBuilderUtils.kt b/staticlibs/testutils/devicetests/com/android/testutils/PacketBuilderUtils.kt index 87288ca6bb..511e24f2c3 100644 --- a/staticlibs/testutils/devicetests/com/android/testutils/PacketBuilderUtils.kt +++ b/staticlibs/testutils/devicetests/com/android/testutils/PacketBuilderUtils.kt @@ -456,20 +456,17 @@ class UdpPkt( ) : Packet { constructor(srcPort: Int, dstPort: Int) : this(srcPort.toShort(), dstPort.toShort()) - val outputStream = ByteArrayOutputStream() - init { + override fun build(payload: FinalizedPacket?, pseudo: PseudoHeaderPacket?): FinalizedPacket { + require(pseudo != null) + val udpHeader = ByteBuffer.allocate(8) .putShort(srcPort) .putShort(dstPort) .putShort(0) // length; to be filled in later. .putShort(0) // checksum; to be filled in later. udpHeader.flip() + val outputStream = ByteArrayOutputStream() outputStream.write(udpHeader.array()) - } - - override fun build(payload: FinalizedPacket?, pseudo: PseudoHeaderPacket?): FinalizedPacket { - require(pseudo != null) - if (payload != null) { outputStream.write(payload.bytes) }