Merge "Move stopping DhcpClient to IpClient.StoppingState#enter." (799f86a8) · Commits · e / os / android_packages_modules_NetworkStack

src/android/net/ip/IpClient.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -2001,6 +2001,9 @@ public class IpClient extends StateMachine {
		if (mDhcpClient == null) {
		// There's no DHCPv4 for which to wait; proceed to stopped.
		deferMessage(obtainMessage(CMD_JUMP_STOPPING_TO_STOPPED));
		} else {
		mDhcpClient.sendMessage(DhcpClient.CMD_STOP_DHCP);
		mDhcpClient.doQuit();
		}

		// Restore the interface MTU to initial value if it has changed.
		@@ -2314,11 +2317,6 @@ public class IpClient extends StateMachine {
		mIpReachabilityMonitor = null;
		}

		if (mDhcpClient != null) {
		mDhcpClient.sendMessage(DhcpClient.CMD_STOP_DHCP);
		mDhcpClient.doQuit();
		}

		if (mPacketTracker != null) {
		mPacketTracker.stop();
		mPacketTracker = null;

tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java

+46 −0

Original line number	Diff line number	Diff line
		@@ -2074,6 +2074,52 @@ public abstract class IpClientIntegrationTestCommon {
		verify(mCb, timeout(TEST_TIMEOUT_MS)).setFallbackMulticastFilter(false);
		}

		@Test
		@SignatureRequiredTest(reason = "needs mocked alarm and access to IpClient handler thread")
		public void testDhcpClientPreconnection_DelayedAbortAndTransitToStoppedState()
		throws Exception {
		ProvisioningConfiguration config = new ProvisioningConfiguration.Builder()
		.withoutIpReachabilityMonitor()
		.withPreconnection()
		.build();
		setDhcpFeatures(false /* isDhcpLeaseCacheEnabled /, false / shouldReplyRapidCommitAck */,
		false /* isDhcpIpConflictDetectEnabled /, false / isIPv6OnlyPreferredEnabled */);
		startIpClientProvisioning(config);
		assertDiscoverPacketOnPreconnectionStart();

		// IpClient is in the PreconnectingState, simulate provisioning timeout event
		// and force IpClient state machine transit to StoppingState.
		final ArgumentCaptor<LinkProperties> captor = ArgumentCaptor.forClass(LinkProperties.class);
		final OnAlarmListener alarm = expectAlarmSet(null /* inOrder */, "TIMEOUT", 18,
		mIpc.getHandler());
		mIpc.getHandler().post(() -> alarm.onAlarm());

		verify(mCb, timeout(TEST_TIMEOUT_MS)).onProvisioningFailure(captor.capture());
		final LinkProperties lp = captor.getValue();
		assertNotNull(lp);
		assertEquals(mIfaceName, lp.getInterfaceName());
		assertEquals(0, lp.getLinkAddresses().size());
		assertEquals(0, lp.getRoutes().size());
		assertEquals(0, lp.getMtu());
		assertEquals(0, lp.getDnsServers().size());

		// Send preconnection abort message, but IpClient should ignore it at this moment and
		// transit to StoppedState finally.
		mIpc.notifyPreconnectionComplete(false /* abort */);
		mIpc.stop();
		HandlerUtils.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

		reset(mCb);

		// Start provisioning again to verify IpClient can process CMD_START correctly at
		// StoppedState.
		startIpClientProvisioning(false /* isDhcpLeaseCacheEnabled */,
		false /* shouldReplyRapidCommitAck /, false / isPreConnectionEnabled */,
		false /* isDhcpIpConflictDetectEnabled /, false / isIPv6OnlyPreferredEnabled */);
		final DhcpPacket discover = getNextDhcpPacket();
		assertTrue(discover instanceof DhcpDiscoverPacket);
		}

		@Test
		public void testDhcpDecline_conflictByArpReply() throws Exception {
		doIpAddressConflictDetectionTest(true /* causeIpAddressConflict */,