Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15275d79 authored by Xiao Ma's avatar Xiao Ma
Browse files

Transition to appropriate state after all left addresses have been cleared. 

State machine will transit to RunningState directly after clearing all
left addresses even if the preconnection flag is enabled, that seems
incorrect to skip PreconnectingState. Rely on the preconnection flag
to determine which correct state should transit to.

Bug: 159109671
Test: atest NetworkStackIntegrationTests NetworkStackTests
Change-Id: I3d520a50f26ba7fac804c85c968013b2cb7cab91
parent f1a5da71

src/android/net/ip/IpClient.java

+1 −1
Original line number Diff line number Diff line
@@ -1772,7 +1772,7 @@ public class IpClient extends StateMachine { 
                case EVENT_NETLINK_LINKPROPERTIES_CHANGED:

                    handleLinkPropertiesUpdate(NO_CALLBACKS);

                    if (readyToProceed()) {

                        transitionTo(mRunningState);

                        transitionTo(isUsingPreconnection() ? mPreconnectingState : mRunningState);

                    }

                    break;

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

+22 −2
Original line number Diff line number Diff line
@@ -1667,8 +1667,7 @@ public class IpClientIntegrationTest { 
        HandlerUtilsKt.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

    }



    @Test

    public void testIpClientClearingIpAddressState() throws Exception {

    private void doIPv4OnlyProvisioningAndExitWithLeftAddress() throws Exception {

        final long currentTime = System.currentTimeMillis();

        performDhcpHandshake(true /* isSuccessLease */, TEST_LEASE_DURATION_S,

                true /* isDhcpLeaseCacheEnabled */, false /* shouldReplyRapidCommitAck */,
@@ -1693,6 +1692,11 @@ public class IpClientIntegrationTest { 
        // TODO: once IpClient gets IP addresses directly from netlink instead of from netd, it

        // may be sufficient to call waitForIdle to see if IpClient has seen the address.

        addIpAddressAndWaitForIt(mIfaceName);

    }



    @Test

    public void testIpClientClearingIpAddressState() throws Exception {

        doIPv4OnlyProvisioningAndExitWithLeftAddress();



        ProvisioningConfiguration config = new ProvisioningConfiguration.Builder()

                .withoutIpReachabilityMonitor()
@@ -1711,6 +1715,22 @@ public class IpClientIntegrationTest { 
        assertEquals("0.0.0.0", cfg.ipv4Addr);

    }



    @Test

    public void testIpClientClearingIpAddressState_enablePreconnection() throws Exception {

        doIPv4OnlyProvisioningAndExitWithLeftAddress();



        // Enter ClearingIpAddressesState to clear the remaining IPv4 addresses and transition to

        // PreconnectionState instead of RunningState.

        startIpClientProvisioning(false /* isDhcpLeaseCacheEnabled */,

                false /* shouldReplyRapidCommitAck */, true /* isDhcpPreConnectionEnabled */,

                false /* isDhcpIpConflictDetectEnabled */);

        assertDiscoverPacketOnPreconnectionStart();



        // Force to enter RunningState.

        mIpc.notifyPreconnectionComplete(false /* abort */);

        HandlerUtilsKt.waitForIdle(mIpc.getHandler(), TEST_TIMEOUT_MS);

    }



    @Test

    public void testDhcpClientPreconnection_success() throws Exception {

        doIpClientProvisioningWithPreconnectionTest(true /* shouldReplyRapidCommitAck */,