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

Commit 3743623e authored by Mark Chien's avatar Mark Chien Committed by Automerger Merge Worker
Browse files

Merge "Allow wifi p2p to use legacy dedicated address" am: 5063505f am: 08feabb3 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398

Change-Id: Ica17499f82135bc96b87ca4071b603bb8cc23053
parents 47c5c8d1 08feabb3

packages/Tethering/res/values/config.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -73,6 +73,9 @@ 
    <!-- Use the old dnsmasq DHCP server for tethering instead of the framework implementation. -->

    <!-- Use the old dnsmasq DHCP server for tethering instead of the framework implementation. -->

    <bool translatable="false" name="config_tether_enable_legacy_dhcp_server">false</bool>

    <bool translatable="false" name="config_tether_enable_legacy_dhcp_server">false</bool>





    <!-- Use legacy wifi p2p dedicated address instead of randomize address. -->

    <bool translatable="false" name="config_tether_enable_legacy_wifi_p2p_dedicated_ip">false</bool>



    <!-- Dhcp range (min, max) to use for tethering purposes -->

    <!-- Dhcp range (min, max) to use for tethering purposes -->

    <string-array translatable="false" name="config_tether_dhcp_range">

    <string-array translatable="false" name="config_tether_dhcp_range">

    </string-array>

    </string-array>

packages/Tethering/res/values/overlayable.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
            -->

            -->

            <item type="bool" name="config_tether_enable_bpf_offload"/>

            <item type="bool" name="config_tether_enable_bpf_offload"/>

            <item type="bool" name="config_tether_enable_legacy_dhcp_server"/>

            <item type="bool" name="config_tether_enable_legacy_dhcp_server"/>

            <item type="bool" name="config_tether_enable_legacy_wifi_p2p_dedicated_ip"/>

            <item type="integer" name="config_tether_offload_poll_interval"/>

            <item type="integer" name="config_tether_offload_poll_interval"/>

            <item type="array" name="config_tether_upstream_types"/>

            <item type="array" name="config_tether_upstream_types"/>

            <item type="bool" name="config_tether_upstream_automatic"/>

            <item type="bool" name="config_tether_upstream_automatic"/>

packages/Tethering/src/com/android/networkstack/tethering/PrivateAddressCoordinator.java

+17 −2
Original line number Original line Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

 */

package com.android.networkstack.tethering;

package com.android.networkstack.tethering;





import static android.net.TetheringManager.TETHERING_WIFI_P2P;



import static java.util.Arrays.asList;

import static java.util.Arrays.asList;





import android.content.Context;

import android.content.Context;
@@ -58,6 +60,7 @@ public class PrivateAddressCoordinator { 
    private static final int BYTE_MASK = 0xff;

    private static final int BYTE_MASK = 0xff;

    // reserved for bluetooth tethering.

    // reserved for bluetooth tethering.

    private static final int BLUETOOTH_RESERVED = 44;

    private static final int BLUETOOTH_RESERVED = 44;

    private static final int WIFI_P2P_RESERVED = 49;

    private static final byte DEFAULT_ID = (byte) 42;

    private static final byte DEFAULT_ID = (byte) 42;





    // Upstream monitor would be stopped when tethering is down. When tethering restart, downstream

    // Upstream monitor would be stopped when tethering is down. When tethering restart, downstream
@@ -71,15 +74,18 @@ public class PrivateAddressCoordinator { 
    // 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16

    // 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16

    // Tethering use 192.168.0.0/16 that has 256 contiguous class C network numbers.

    // Tethering use 192.168.0.0/16 that has 256 contiguous class C network numbers.

    private static final String DEFAULT_TETHERING_PREFIX = "192.168.0.0/16";

    private static final String DEFAULT_TETHERING_PREFIX = "192.168.0.0/16";

    private static final String LEGACY_WIFI_P2P_IFACE_ADDRESS = "192.168.49.1/24";

    private final IpPrefix mTetheringPrefix;

    private final IpPrefix mTetheringPrefix;

    private final ConnectivityManager mConnectivityMgr;

    private final ConnectivityManager mConnectivityMgr;

    private final TetheringConfiguration mConfig;





    public PrivateAddressCoordinator(Context context) {

    public PrivateAddressCoordinator(Context context, TetheringConfiguration config) {

        mDownstreams = new ArraySet<>();

        mDownstreams = new ArraySet<>();

        mUpstreamPrefixMap = new ArrayMap<>();

        mUpstreamPrefixMap = new ArrayMap<>();

        mTetheringPrefix = new IpPrefix(DEFAULT_TETHERING_PREFIX);

        mTetheringPrefix = new IpPrefix(DEFAULT_TETHERING_PREFIX);

        mConnectivityMgr = (ConnectivityManager) context.getSystemService(

        mConnectivityMgr = (ConnectivityManager) context.getSystemService(

                Context.CONNECTIVITY_SERVICE);

                Context.CONNECTIVITY_SERVICE);

        mConfig = config;

    }

    }





    /**

    /**
@@ -141,12 +147,21 @@ public class PrivateAddressCoordinator { 
        mUpstreamPrefixMap.removeAll(toBeRemoved);

        mUpstreamPrefixMap.removeAll(toBeRemoved);

    }

    }





    private boolean isReservedSubnet(final int subnet) {

        return subnet == BLUETOOTH_RESERVED || subnet == WIFI_P2P_RESERVED;

    }



    /**

    /**

     * Pick a random available address and mark its prefix as in use for the provided IpServer,

     * Pick a random available address and mark its prefix as in use for the provided IpServer,

     * returns null if there is no available address.

     * returns null if there is no available address.

     */

     */

    @Nullable

    @Nullable

    public LinkAddress requestDownstreamAddress(final IpServer ipServer) {

    public LinkAddress requestDownstreamAddress(final IpServer ipServer) {

        if (mConfig.shouldEnableWifiP2pDedicatedIp()

                && ipServer.interfaceType() == TETHERING_WIFI_P2P) {

            return new LinkAddress(LEGACY_WIFI_P2P_IFACE_ADDRESS);

        }



        // Address would be 192.168.[subAddress]/24.

        // Address would be 192.168.[subAddress]/24.

        final byte[] bytes = mTetheringPrefix.getRawAddress();

        final byte[] bytes = mTetheringPrefix.getRawAddress();

        final int subAddress = getRandomSubAddr();

        final int subAddress = getRandomSubAddr();
@@ -154,7 +169,7 @@ public class PrivateAddressCoordinator { 
        bytes[3] = getSanitizedAddressSuffix(subAddress, (byte) 0, (byte) 1, (byte) 0xff);

        bytes[3] = getSanitizedAddressSuffix(subAddress, (byte) 0, (byte) 1, (byte) 0xff);

        for (int i = 0; i < MAX_UBYTE; i++) {

        for (int i = 0; i < MAX_UBYTE; i++) {

            final int newSubNet = (subNet + i) & BYTE_MASK;

            final int newSubNet = (subNet + i) & BYTE_MASK;

            if (newSubNet == BLUETOOTH_RESERVED) continue;

            if (isReservedSubnet(newSubNet)) continue;





            bytes[2] = (byte) newSubNet;

            bytes[2] = (byte) newSubNet;

            final InetAddress addr;

            final InetAddress addr;

packages/Tethering/src/com/android/networkstack/tethering/Tethering.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -320,10 +320,13 @@ public class Tethering { 
        mExecutor = new TetheringThreadExecutor(mHandler);

        mExecutor = new TetheringThreadExecutor(mHandler);

        mActiveDataSubIdListener = new ActiveDataSubIdListener(mExecutor);

        mActiveDataSubIdListener = new ActiveDataSubIdListener(mExecutor);

        mNetdCallback = new NetdCallback();

        mNetdCallback = new NetdCallback();

        mPrivateAddressCoordinator = new PrivateAddressCoordinator(mContext);





        // Load tethering configuration.

        // Load tethering configuration.

        updateConfiguration();

        updateConfiguration();

        // It is OK for the configuration to be passed to the PrivateAddressCoordinator at

        // construction time because the only part of the configuration it uses is

        // shouldEnableWifiP2pDedicatedIp(), and currently do not support changing that.

        mPrivateAddressCoordinator = new PrivateAddressCoordinator(mContext, mConfig);





        // Must be initialized after tethering configuration is loaded because BpfCoordinator

        // Must be initialized after tethering configuration is loaded because BpfCoordinator

        // constructor needs to use the configuration.

        // constructor needs to use the configuration.

packages/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java

+16 −0
Original line number Original line Diff line number Diff line
@@ -84,6 +84,9 @@ public class TetheringConfiguration { 
    public static final String TETHER_ENABLE_LEGACY_DHCP_SERVER =

    public static final String TETHER_ENABLE_LEGACY_DHCP_SERVER =

            "tether_enable_legacy_dhcp_server";

            "tether_enable_legacy_dhcp_server";





    public static final String USE_LEGACY_WIFI_P2P_DEDICATED_IP =

            "use_legacy_wifi_p2p_dedicated_ip";



    /**

    /**

     * Default value that used to periodic polls tether offload stats from tethering offload HAL

     * Default value that used to periodic polls tether offload stats from tethering offload HAL

     * to make the data warnings work.

     * to make the data warnings work.
@@ -113,6 +116,7 @@ public class TetheringConfiguration { 
    private final int mOffloadPollInterval;

    private final int mOffloadPollInterval;

    // TODO: Add to TetheringConfigurationParcel if required.

    // TODO: Add to TetheringConfigurationParcel if required.

    private final boolean mEnableBpfOffload;

    private final boolean mEnableBpfOffload;

    private final boolean mEnableWifiP2pDedicatedIp;





    public TetheringConfiguration(Context ctx, SharedLog log, int id) {

    public TetheringConfiguration(Context ctx, SharedLog log, int id) {

        final SharedLog configLog = log.forSubComponent("config");

        final SharedLog configLog = log.forSubComponent("config");
@@ -156,6 +160,10 @@ public class TetheringConfiguration { 
                R.integer.config_tether_offload_poll_interval,

                R.integer.config_tether_offload_poll_interval,

                DEFAULT_TETHER_OFFLOAD_POLL_INTERVAL_MS);

                DEFAULT_TETHER_OFFLOAD_POLL_INTERVAL_MS);





        mEnableWifiP2pDedicatedIp = getResourceBoolean(res,

                R.bool.config_tether_enable_legacy_wifi_p2p_dedicated_ip,

                false /* defaultValue */);



        configLog.log(toString());

        configLog.log(toString());

    }

    }
@@ -199,6 +207,11 @@ public class TetheringConfiguration { 
        return !TextUtils.isEmpty(provisioningAppNoUi);

        return !TextUtils.isEmpty(provisioningAppNoUi);

    }

    }





    /** Check whether dedicated wifi p2p address is enabled. */

    public boolean shouldEnableWifiP2pDedicatedIp() {

        return mEnableWifiP2pDedicatedIp;

    }



    /** Does the dumping.*/

    /** Does the dumping.*/

    public void dump(PrintWriter pw) {

    public void dump(PrintWriter pw) {

        pw.print("activeDataSubId: ");

        pw.print("activeDataSubId: ");
@@ -233,6 +246,9 @@ public class TetheringConfiguration { 




        pw.print("enableLegacyDhcpServer: ");

        pw.print("enableLegacyDhcpServer: ");

        pw.println(enableLegacyDhcpServer);

        pw.println(enableLegacyDhcpServer);



        pw.print("enableWifiP2pDedicatedIp: ");

        pw.println(mEnableWifiP2pDedicatedIp);

    }

    }





    /** Returns the string representation of this object.*/

    /** Returns the string representation of this object.*/