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

Commit 472276a8 authored by Erik Kline's avatar Erik Kline
Browse files

Clear IPv4 address on tethering teardown. 

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - wlan0 in STA mode, wlan1 up/down in AP mode
      no lingering IPv4 mode
    - USB tethering up/down works
    - bluetooth tethering yields:
05-18 17:50:49.726   719   756 D TetherController: untetherInterface(bt-pan)
05-18 17:50:49.729  1194  1230 E Tethering: [bt-pan] ERROR Failed to clear IPv4 address on interface bt-pan: java.lang.IllegalStateException: command '224 interface setcfg bt-pan 0.0.0.0 0' failed with '400 224 Failed to clear address (No such device)'
      which is acceptable (no actual crash, just a log message)
Bug: 79905644
Change-Id: Iaf29788a6692d810f3160e3f21d06b7452ecbaa6
parent 7d2d403a

services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java

+6 −1
Original line number Diff line number Diff line
@@ -185,7 +185,12 @@ public class TetherInterfaceStateMachine extends StateMachine { 


    private boolean startIPv4() { return configureIPv4(true); }



    private void stopIPv4() { configureIPv4(false); }

    private void stopIPv4() {

        configureIPv4(false);

        // NOTE: All of configureIPv4() will be refactored out of existence

        // into calls to InterfaceController, shared with startIPv4().

        mInterfaceCtrl.clearIPv4Address();

    }



    // TODO: Refactor this in terms of calls to InterfaceController.

    private boolean configureIPv4(boolean enabled) {

tests/net/java/com/android/server/connectivity/TetheringTest.java

+4 −3
Original line number Diff line number Diff line
@@ -775,11 +775,12 @@ public class TetheringTest { 
        sendWifiApStateChanged(WIFI_AP_STATE_ENABLED, TEST_WLAN_IFNAME, IFACE_IP_MODE_TETHERED);

        mLooper.dispatchAll();



        // We verify get/set called twice here: once for setup and once during

        // We verify get/set called thrice here: once for setup and twice during

        // teardown because all events happen over the course of the single

        // dispatchAll() above.

        // dispatchAll() above. Note that once the TISM IPv4 address config

        // code is refactored the two calls during shutdown will revert to one.

        verify(mNMService, times(2)).getInterfaceConfig(TEST_WLAN_IFNAME);

        verify(mNMService, times(2))

        verify(mNMService, times(3))

                .setInterfaceConfig(eq(TEST_WLAN_IFNAME), any(InterfaceConfiguration.class));

        verify(mNMService, times(1)).tetherInterface(TEST_WLAN_IFNAME);

        verify(mWifiManager).updateInterfaceIpState(

tests/net/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachineTest.java

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ public class TetherInterfaceStateMachineTest { 
        dispatchCommand(TetherInterfaceStateMachine.CMD_TETHER_UNREQUESTED);

        InOrder inOrder = inOrder(mNMService, mStatsService, mTetherHelper);

        inOrder.verify(mNMService).untetherInterface(IFACE_NAME);

        inOrder.verify(mNMService).setInterfaceConfig(eq(IFACE_NAME), any());

        inOrder.verify(mTetherHelper).updateInterfaceState(

                mTestedSm, STATE_AVAILABLE, TETHER_ERROR_NO_ERROR);

        inOrder.verify(mTetherHelper).updateLinkProperties(
@@ -270,6 +271,7 @@ public class TetherInterfaceStateMachineTest { 
        inOrder.verify(mNMService).stopInterfaceForwarding(IFACE_NAME, UPSTREAM_IFACE);

        inOrder.verify(mNMService).disableNat(IFACE_NAME, UPSTREAM_IFACE);

        inOrder.verify(mNMService).untetherInterface(IFACE_NAME);

        inOrder.verify(mNMService).setInterfaceConfig(eq(IFACE_NAME), any());

        inOrder.verify(mTetherHelper).updateInterfaceState(

                mTestedSm, STATE_AVAILABLE, TETHER_ERROR_NO_ERROR);

        inOrder.verify(mTetherHelper).updateLinkProperties(