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

Commit abb8f89b authored by Tom Giordano's avatar Tom Giordano
Browse files

tethering: Tolerate socket exception from ifindex look-up 

The code already handles the case of internalNetworkInterface being null,
but this would never happen since it throws an exception if
NetworkInterface.getByName(internalInterface) fails. Catch the exception
and continue processing.

This is needed with some older usb gadget code which don't populate
/sys/class/net/usb0/.

Change-Id: I15adead7835ff3a4f77f87175ac85c5d9f45f9c0
parent 617d93f6

services/java/com/android/server/NetworkManagementService.java

+7 −5
Original line number Diff line number Diff line
@@ -850,12 +850,14 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
        }

    }



    private void modifyNat(String cmd, String internalInterface, String externalInterface)

            throws SocketException {

    private void modifyNat(String cmd, String internalInterface, String externalInterface) {

        cmd = String.format("nat %s %s %s", cmd, internalInterface, externalInterface);



        NetworkInterface internalNetworkInterface =

                NetworkInterface.getByName(internalInterface);

        NetworkInterface internalNetworkInterface = null;

        try {

            internalNetworkInterface = NetworkInterface.getByName(internalInterface);

        } catch (SocketException e) {

            Log.e(TAG, "failed to get ifindex. continuing.");

        }

        if (internalNetworkInterface == null) {

            cmd += " 0";

        } else {