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

Commit 3f10c691 authored by Sagar Regmi's avatar Sagar Regmi Committed by Ricardo Cerqueira
Browse files

Broadcast upstream interface change event independently for IPv4 & IPv6 

On change in tethering upstream interface for IPV4 or IPV6 address,
broadcast an intent with the information viz iface name, ip address
type and update type(i.e add or delete).

Change-Id: Ia80738bcf09692209674a47b6c6c1c082a201b16
CRs-Fixed: 680728
parent 5197a47f

services/core/java/com/android/server/connectivity/Tethering.java

+58 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



package com.android.server.connectivity;



import android.app.Notification;

import android.app.NotificationManager;

import android.app.PendingIntent;
@@ -63,6 +62,9 @@ import java.util.HashMap; 
import java.util.Iterator;

import java.util.Set;



import static android.system.OsConstants.AF_INET;

import static android.system.OsConstants.AF_INET6;



/**

 * @hide

 *
@@ -77,6 +79,30 @@ public class Tethering extends BaseNetworkObserver { 
    private final static boolean DBG = true;

    private final static boolean VDBG = false;



    /* Intent to indicate change in upstream interface change */

    public static final String UPSTREAM_IFACE_CHANGED_ACTION =

                         "com.android.server.connectivity.UPSTREAM_IFACE_CHANGED";



    // Upstream Interface Name i.e. rmnet_data0, wlan0 etc.

    public static final String EXTRA_UPSTREAM_IFACE = "tetheringUpstreamIface";



    // Tethered Interface Name i.e. rndis0, wlan0, usb0 etc.

    public static final String EXTRA_TETHERED_IFACE = "tetheredClientIface";



    // Upstream Interface IP Type i.e IPV6 or IPV4

    public static final String EXTRA_UPSTREAM_IP_TYPE = "tetheringUpstreamIpType";



    // Update Type i.e Add upstream interface or delete upstream interface

    public static final String EXTRA_UPSTREAM_UPDATE_TYPE = "tetheringUpstreamUpdateType";



    // Default Value for Extra Infomration

    public static final int EXTRA_UPSTREAM_INFO_DEFAULT = -1;



    private enum UpstreamInfoUpdateType {

        UPSTREAM_IFACE_REMOVED,

        UPSTREAM_IFACE_ADDED

    }



    // TODO - remove both of these - should be part of interface inspection/selection stuff

    private String[] mTetherableUsbRegexs;

    private String[] mTetherableWifiRegexs;
@@ -437,6 +463,20 @@ public class Tethering extends BaseNetworkObserver { 
        }

    }



    private void sendUpstreamIfaceChangeBroadcast( String upstreamIface, String tetheredIface,

                                                   int ip_type,

                                                   UpstreamInfoUpdateType update_type) {

        if (DBG) Log.d(TAG, "sendUpstreamIfaceChangeBroadcast upstreamIface:" + upstreamIface +

                            " tetheredIface:" + tetheredIface +

                            " IP Type: "+ ip_type + " update_type" + update_type);

        Intent intent = new Intent(UPSTREAM_IFACE_CHANGED_ACTION);

        intent.putExtra(EXTRA_UPSTREAM_IFACE, upstreamIface);

        intent.putExtra(EXTRA_TETHERED_IFACE, tetheredIface);

        intent.putExtra(EXTRA_UPSTREAM_IP_TYPE, ip_type);

        intent.putExtra(EXTRA_UPSTREAM_UPDATE_TYPE, update_type.ordinal());



        mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);

    }

    private void showTetheredNotification(int icon) {

        NotificationManager notificationManager =

                (NotificationManager)mContext.getSystemService(Context.NOTIFICATION_SERVICE);
@@ -971,7 +1011,13 @@ public class Tethering extends BaseNetworkObserver { 
                        if (VDBG) Log.e(TAG, "Exception in forceUpdate: " + e.toString());

                    }

                    try {

                        if(VDBG) Log.d(TAG, "Disabling NAT - Tethered Iface = " + mIfaceName +

                                            " mMyUpstreamIfaceName= " + mMyUpstreamIfaceName);

                        mNMService.disableNat(mIfaceName, mMyUpstreamIfaceName);

                        sendUpstreamIfaceChangeBroadcast( mMyUpstreamIfaceName,

                                                     mIfaceName,

                                                     AF_INET,

                                                     UpstreamInfoUpdateType.UPSTREAM_IFACE_REMOVED);

                    } catch (Exception e) {

                        if (VDBG) Log.e(TAG, "Exception in disableNat: " + e.toString());

                    }
@@ -1013,6 +1059,9 @@ public class Tethering extends BaseNetworkObserver { 
                        break;

                    case CMD_TETHER_CONNECTION_CHANGED:

                        String newUpstreamIfaceName = (String)(message.obj);

                        if(VDBG) Log.d(TAG, "Current Upstream Iface = " + mMyUpstreamIfaceName +

                                            " New Upstream Iface = " + newUpstreamIfaceName +

                                            " Tethered Iface = "+ mIfaceName);

                        if ((mMyUpstreamIfaceName == null && newUpstreamIfaceName == null) ||

                                (mMyUpstreamIfaceName != null &&

                                mMyUpstreamIfaceName.equals(newUpstreamIfaceName))) {
@@ -1022,7 +1071,14 @@ public class Tethering extends BaseNetworkObserver { 
                        cleanupUpstream();

                        if (newUpstreamIfaceName != null) {

                            try {

                                if(VDBG) Log.d(TAG,"Enabling NAT - Tethered Iface = " + mIfaceName +

                                                   " newUpstreamIfaceName =" +newUpstreamIfaceName);

                                mNMService.enableNat(mIfaceName, newUpstreamIfaceName);

                                sendUpstreamIfaceChangeBroadcast(

                                                       newUpstreamIfaceName,

                                                       mIfaceName,

                                                       AF_INET,

                                                       UpstreamInfoUpdateType.UPSTREAM_IFACE_ADDED);

                            } catch (Exception e) {

                                Log.e(TAG, "Exception enabling Nat: " + e.toString());

                                try {
@@ -1452,6 +1508,7 @@ public class Tethering extends BaseNetworkObserver { 
                        }

                        break;

                    case CMD_UPSTREAM_CHANGED:

                        if(VDBG) Log.d(TAG, "CMD_UPSTREAM_CHANGED event received");

                        // need to try DUN immediately if Wifi goes down

                        mTryCell = !WAIT_FOR_NETWORK_TO_SETTLE;

                        chooseUpstreamType(mTryCell);