Separate network and interface addition/removal netd APIs. (992f2525) · Commits · e / os / android_frameworks_base

core/java/android/net/LinkProperties.java

+29 −0

Original line number	Diff line number	Diff line
		@@ -642,6 +642,35 @@ public class LinkProperties implements Parcelable {
		return result;
		}

		/**
		* Compares all interface names in this LinkProperties with another
		* LinkProperties, examining both the the base link and all stacked links.
		*
		* @param target a LinkProperties with the new list of interface names
		* @return the differences between the interface names.
		* @hide
		*/
		public CompareResult<String> compareAllInterfaceNames(LinkProperties target) {
		/*
		* Duplicate the interface names into removed, we will be removing
		* interface names which are common between this and target
		* leaving the interface names that are different. And interface names which
		* are in target but not in this are placed in added.
		*/
		CompareResult<String> result = new CompareResult<String>();

		result.removed = getAllInterfaceNames();
		result.added.clear();
		if (target != null) {
		for (String r : target.getAllInterfaceNames()) {
		if (! result.removed.remove(r)) {
		result.added.add(r);
		}
		}
		}
		return result;
		}


		@Override
		/**

core/java/android/os/INetworkManagementService.aidl

+13 −3

Original line number	Diff line number	Diff line
		@@ -410,15 +410,25 @@ interface INetworkManagementService
		boolean isNetworkActive();

		/**
		* setup a new network
		* Setup a new network.
		*/
		void createNetwork(int netId, String iface);
		void createNetwork(int netId);

		/**
		* remove a network
		* Remove a network.
		*/
		void removeNetwork(int netId);

		/**
		* Add an interface to a network.
		*/
		void addInterfaceToNetwork(String iface, int netId);

		/**
		* Remove an Interface from a network.
		*/
		void removeInterfaceFromNetwork(String iface, int netId);

		void addLegacyRouteForNetId(int netId, in RouteInfo routeInfo, int uid);
		void removeLegacyRouteForNetId(int netId, in RouteInfo routeInfo, int uid);

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

+26 −2

Original line number	Diff line number	Diff line
		@@ -5088,6 +5088,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		LinkProperties newLp = networkAgent.linkProperties;
		int netId = networkAgent.network.netId;

		updateInterfaces(newLp, oldLp, netId);
		updateMtu(newLp, oldLp);
		// TODO - figure out what to do for clat
		// for (LinkProperties lp : newLp.getStackedLinks()) {
		@@ -5096,6 +5097,30 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		updateRoutes(newLp, oldLp, netId);
		updateDnses(newLp, oldLp, netId);
		}

		private void updateInterfaces(LinkProperties newLp, LinkProperties oldLp, int netId) {
		CompareResult<String> interfaceDiff = new CompareResult<String>();
		if (oldLp != null) {
		interfaceDiff = oldLp.compareAllInterfaceNames(newLp);
		} else if (newLp != null) {
		interfaceDiff.added = newLp.getAllInterfaceNames();
		}
		for (String iface : interfaceDiff.added) {
		try {
		mNetd.addInterfaceToNetwork(iface, netId);
		} catch (Exception e) {
		loge("Exception adding interface: " + e);
		}
		}
		for (String iface : interfaceDiff.removed) {
		try {
		mNetd.removeInterfaceFromNetwork(iface, netId);
		} catch (Exception e) {
		loge("Exception removing interface: " + e);
		}
		}
		}

		private void updateRoutes(LinkProperties newLp, LinkProperties oldLp, int netId) {
		CompareResult<RouteInfo> routeDiff = new CompareResult<RouteInfo>();
		if (oldLp != null) {
		@@ -5300,8 +5325,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		if (state == NetworkInfo.State.CONNECTED) {
		// TODO - check if we want it (optimization)
		try {
		mNetd.createNetwork(networkAgent.network.netId,
		networkAgent.linkProperties.getInterfaceName());
		mNetd.createNetwork(networkAgent.network.netId);
		} catch (Exception e) {
		loge("Error creating Network " + networkAgent.network.netId);
		}

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

+24 −2

Original line number	Diff line number	Diff line
		@@ -1938,11 +1938,11 @@ public class NetworkManagementService extends INetworkManagementService.Stub
		}

		@Override
		public void createNetwork(int netId, String iface) {
		public void createNetwork(int netId) {
		mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

		try {
		mConnector.execute("network", "create", netId, iface);
		mConnector.execute("network", "create", netId);
		} catch (NativeDaemonConnectorException e) {
		throw e.rethrowAsParcelableException();
		}
		@@ -1959,6 +1959,28 @@ public class NetworkManagementService extends INetworkManagementService.Stub
		}
		}

		@Override
		public void addInterfaceToNetwork(String iface, int netId) {
		mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

		try {
		mConnector.execute("network", "addiface", netId, iface);
		} catch (NativeDaemonConnectorException e) {
		throw e.rethrowAsParcelableException();
		}
		}

		@Override
		public void removeInterfaceFromNetwork(String iface, int netId) {
		mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

		try {
		mConnector.execute("network", "removeiface", netId, iface);
		} catch (NativeDaemonConnectorException e) {
		throw e.rethrowAsParcelableException();
		}
		}

		@Override
		public void addLegacyRouteForNetId(int netId, RouteInfo routeInfo, int uid) {
		modifyLegacyRouteForNetId(netId, routeInfo, uid, ADD);