Snap for 7913023 from 181ee419d1648ff51162518fa11173e45905dd6c to mainline-media-swcodec-release (4e96806e) · Commits · e / os / android_packages_modules_NetworkStack

Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -215,6 +215,8 @@ java_defaults {
		static_libs: [
		"androidx.annotation_annotation",
		"modules-utils-build_system",
		"modules-utils-preconditions",
		"modules-utils-statemachine",
		"netd_aidl_interface-lateststable-java",
		"networkstack-client",
		"net-utils-framework-common",

common/moduleutils/Android.bp

+0 −3

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ filegroup {
		name: "net-module-utils-srcs",
		srcs: [
		"src/android/net/shared/NetdUtils.java",
		"src/android/net/shared/RouteUtils.java",
		"src/android/net/util/InterfaceParams.java",
		"src/android/net/util/SharedLog.java",
		],
		@@ -41,7 +40,6 @@ filegroup {
		"src/android/net/util/SharedLog.java",
		"src/android/net/shared/NetdUtils.java",
		"src/android/net/shared/NetworkMonitorUtils.java",
		"src/android/net/shared/RouteUtils.java",
		],
		visibility: [
		"//packages/modules/Connectivity/service",
		@@ -65,7 +63,6 @@ filegroup {
		"src/android/net/ip/IpNeighborMonitor.java",
		"src/android/net/ip/NetlinkMonitor.java",
		"src/android/net/shared/NetdUtils.java",
		"src/android/net/shared/RouteUtils.java",
		"src/android/net/util/InterfaceParams.java",
		"src/android/net/util/SharedLog.java",
		],

common/moduleutils/src/android/net/shared/NetdUtils.java

+0 −23

Original line number	Diff line number	Diff line
		@@ -16,21 +16,15 @@

		package android.net.shared;

		import static android.net.RouteInfo.RTN_UNICAST;
		import static android.system.OsConstants.EBUSY;

		import android.net.INetd;
		import android.net.IpPrefix;
		import android.net.RouteInfo;
		import android.net.TetherConfigParcel;
		import android.os.RemoteException;
		import android.os.ServiceSpecificException;
		import android.os.SystemClock;
		import android.util.Log;

		import java.util.ArrayList;
		import java.util.List;

		/**
		* Implements common operations on INetd
		* @hide
		@@ -47,23 +41,6 @@ public class NetdUtils {
		netd.tetherStartWithConfiguration(config);
		}

		/** Setup interface for tethering. */
		public static void tetherInterface(final INetd netd, final String iface, final IpPrefix dest)
		throws RemoteException, ServiceSpecificException {
		tetherInterface(netd, iface, dest, 20 /* maxAttempts /, 50 / pollingIntervalMs */);
		}

		/** Setup interface with configurable retries for tethering. */
		public static void tetherInterface(final INetd netd, final String iface, final IpPrefix dest,
		int maxAttempts, int pollingIntervalMs)
		throws RemoteException, ServiceSpecificException {
		netd.tetherInterfaceAdd(iface);
		networkAddInterface(netd, iface, maxAttempts, pollingIntervalMs);
		List<RouteInfo> routes = new ArrayList<>();
		routes.add(new RouteInfo(dest, null, iface, RTN_UNICAST));
		RouteUtils.addRoutesToLocalNetwork(netd, iface, routes);
		}

		/**
		* Retry Netd#networkAddInterface for EBUSY error code.
		* If the same interface (e.g., wlan0) is in client mode and then switches to tethered mode.

common/moduleutils/src/android/net/shared/RouteUtils.java

deleted100644 → 0

+0 −115

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package android.net.shared;

		import static android.net.RouteInfo.RTN_THROW;
		import static android.net.RouteInfo.RTN_UNICAST;
		import static android.net.RouteInfo.RTN_UNREACHABLE;

		import android.net.INetd;
		import android.net.IpPrefix;
		import android.net.RouteInfo;
		import android.os.RemoteException;
		import android.os.ServiceSpecificException;

		import java.util.List;

		/** @hide*/
		public class RouteUtils {

		/** Used to modify the specified route. */
		public enum ModifyOperation {
		ADD,
		REMOVE,
		}

		private static String findNextHop(final RouteInfo route) {
		final String nextHop;
		switch (route.getType()) {
		case RTN_UNICAST:
		if (route.hasGateway()) {
		nextHop = route.getGateway().getHostAddress();
		} else {
		nextHop = INetd.NEXTHOP_NONE;
		}
		break;
		case RTN_UNREACHABLE:
		nextHop = INetd.NEXTHOP_UNREACHABLE;
		break;
		case RTN_THROW:
		nextHop = INetd.NEXTHOP_THROW;
		break;
		default:
		nextHop = INetd.NEXTHOP_NONE;
		break;
		}
		return nextHop;
		}

		/** Add \|routes\| to local network. */
		public static void addRoutesToLocalNetwork(final INetd netd, final String iface,
		final List<RouteInfo> routes) {

		for (RouteInfo route : routes) {
		if (!route.isDefaultRoute()) {
		modifyRoute(netd, ModifyOperation.ADD, INetd.LOCAL_NET_ID, route);
		}
		}

		// IPv6 link local should be activated always.
		modifyRoute(netd, ModifyOperation.ADD, INetd.LOCAL_NET_ID,
		new RouteInfo(new IpPrefix("fe80::/64"), null, iface, RTN_UNICAST));
		}

		/** Remove routes from local network. */
		public static int removeRoutesFromLocalNetwork(final INetd netd, final List<RouteInfo> routes) {
		int failures = 0;

		for (RouteInfo route : routes) {
		try {
		modifyRoute(netd, ModifyOperation.REMOVE, INetd.LOCAL_NET_ID, route);
		} catch (IllegalStateException e) {
		failures++;
		}
		}

		return failures;
		}

		/** Add or remove \|route\|. */
		public static void modifyRoute(final INetd netd, final ModifyOperation op, final int netId,
		final RouteInfo route) {
		final String ifName = route.getInterface();
		final String dst = route.getDestination().toString();
		final String nextHop = findNextHop(route);

		try {
		switch(op) {
		case ADD:
		netd.networkAddRoute(netId, ifName, dst, nextHop);
		break;
		case REMOVE:
		netd.networkRemoveRoute(netId, ifName, dst, nextHop);
		break;
		default:
		throw new IllegalStateException("Unsupported modify operation:" + op);
		}
		} catch (RemoteException \| ServiceSpecificException e) {
		throw new IllegalStateException(e);
		}
		}

		}

src/android/net/ip/IpReachabilityMonitor.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -570,7 +570,7 @@ public class IpReachabilityMonitor {
		}
		}

		mNumSolicits = numSolicits;
		mNumSolicits = isMulticastResolicitEnabled() ? (numSolicits + numResolicits) : numSolicits;
		mInterSolicitIntervalMs = interSolicitIntervalMs;
		}