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

Commit a31e073b authored by Luke Huang's avatar Luke Huang
Browse files

Nat-related commands porting 

Test: runtest frameworks-net passes
Test: manual testing of nat works
Change-Id: I759bc418153cf9ab302791d350331abaae8a7a24
parent 1d899f6b

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

+4 −32
Original line number Diff line number Diff line
@@ -1323,40 +1323,12 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
        modifyInterfaceForward(false, fromIface, toIface);

    }



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

            throws SocketException {

        final Command cmd = new Command("nat", action, internalInterface, externalInterface);



        final NetworkInterface internalNetworkInterface = NetworkInterface.getByName(

                internalInterface);

        if (internalNetworkInterface == null) {

            cmd.appendArg("0");

        } else {

            // Don't touch link-local routes, as link-local addresses aren't routable,

            // kernel creates link-local routes on all interfaces automatically

            List<InterfaceAddress> interfaceAddresses = excludeLinkLocal(

                    internalNetworkInterface.getInterfaceAddresses());

            cmd.appendArg(interfaceAddresses.size());

            for (InterfaceAddress ia : interfaceAddresses) {

                InetAddress addr = NetworkUtils.getNetworkPart(

                        ia.getAddress(), ia.getNetworkPrefixLength());

                cmd.appendArg(addr.getHostAddress() + "/" + ia.getNetworkPrefixLength());

            }

        }



        try {

            mConnector.execute(cmd);

        } catch (NativeDaemonConnectorException e) {

            throw e.rethrowAsParcelableException();

        }

    }



    @Override

    public void enableNat(String internalInterface, String externalInterface) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

        try {

            modifyNat("enable", internalInterface, externalInterface);

        } catch (SocketException e) {

            mNetdService.tetherAddForward(internalInterface, externalInterface);

        } catch (RemoteException | ServiceSpecificException e) {

            throw new IllegalStateException(e);

        }

    }
@@ -1365,8 +1337,8 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
    public void disableNat(String internalInterface, String externalInterface) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

        try {

            modifyNat("disable", internalInterface, externalInterface);

        } catch (SocketException e) {

            mNetdService.tetherRemoveForward(internalInterface, externalInterface);

        } catch (RemoteException | ServiceSpecificException e) {

            throw new IllegalStateException(e);

        }

    }