Commit 98b65937 authored Jan 10, 2020 by Xiao Ma

Return actual payload (DHCPDISCOVER) bytes array when starting FILS.

Generally "ByteBuffer packet" has been allocated with a maximum
length of 1500. Calling packet.array() is to return a byte array
of length 1500 but the actual DHCPDISCOVER packet payload is much
less. Return actual DHCP packet byte array instead in this patch,
which allows caller use the payload byte array directly without
extra operation (e.g. calling packet.remaining() to get the correct
length of actual payload).

Bug: 140223017
Test: atest NetworkStackTests NetworkStackIntegrationTests
Change-Id: Ib08f2450fb649ea1ffcdbf8dedc829965f13da86

parent d22d5b28

src/android/net/dhcp/DhcpClient.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1270,7 +1270,7 @@ public class DhcpClient extends StateMachine {
		DO_UNICAST, REQUESTED_PARAMS, true /* rapid commit */, mHostname);

		l2Packet.dstMacAddress = MacAddress.fromBytes(DhcpPacket.ETHER_BROADCAST);
		l2Packet.payload = packet.array();
		l2Packet.payload = Arrays.copyOf(packet.array(), packet.limit());
		mController.sendMessage(CMD_START_PRECONNECTION, l2Packet);
		}
		}