Merge changes from topic "dedup-interfaceparams" (6c6d7bb4) · Commits · e / os / android_packages_modules_NetworkStack

common/moduleutils/Android.bp

+0 −3

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

common/moduleutils/src/android/net/util/InterfaceParams.java

deleted100644 → 0

+0 −101

Original line number	Original line	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.util;

	import android.net.MacAddress;
	import android.text.TextUtils;

	import java.net.NetworkInterface;
	import java.net.SocketException;


	/**
	* Encapsulate the interface parameters common to IpClient/IpServer components.
	*
	* Basically all java.net.NetworkInterface methods throw Exceptions. IpClient
	* and IpServer (sub)components need most or all of this information at some
	* point during their lifecycles, so pass only this simplified object around
	* which can be created once when IpClient/IpServer are told to start.
	*
	* @hide
	*/
	public class InterfaceParams {
	public final String name;
	public final int index;
	public final boolean hasMacAddress;
	public final MacAddress macAddr;
	public final int defaultMtu;

	// TODO: move the below to NetworkStackConstants when this class is moved to the NetworkStack.
	private static final int ETHER_MTU = 1500;
	private static final int IPV6_MIN_MTU = 1280;


	public static InterfaceParams getByName(String name) {
	final NetworkInterface netif = getNetworkInterfaceByName(name);
	if (netif == null) return null;

	// Not all interfaces have MAC addresses, e.g. rmnet_data0.
	final MacAddress macAddr = getMacAddress(netif);

	try {
	return new InterfaceParams(name, netif.getIndex(), macAddr, netif.getMTU());
	} catch (IllegalArgumentException\|SocketException e) {
	return null;
	}
	}

	public InterfaceParams(String name, int index, MacAddress macAddr) {
	this(name, index, macAddr, ETHER_MTU);
	}

	public InterfaceParams(String name, int index, MacAddress macAddr, int defaultMtu) {
	if (TextUtils.isEmpty(name)) {
	throw new IllegalArgumentException("impossible interface name");
	}

	if (index <= 0) throw new IllegalArgumentException("invalid interface index");

	this.name = name;
	this.index = index;
	this.hasMacAddress = (macAddr != null);
	this.macAddr = hasMacAddress ? macAddr : MacAddress.fromBytes(new byte[] {
	0x02, 0x00, 0x00, 0x00, 0x00, 0x00 });
	this.defaultMtu = (defaultMtu > IPV6_MIN_MTU) ? defaultMtu : IPV6_MIN_MTU;
	}

	@Override
	public String toString() {
	return String.format("%s/%d/%s/%d", name, index, macAddr, defaultMtu);
	}

	private static NetworkInterface getNetworkInterfaceByName(String name) {
	try {
	return NetworkInterface.getByName(name);
	} catch (NullPointerException\|SocketException e) {
	return null;
	}
	}

	private static MacAddress getMacAddress(NetworkInterface netif) {
	try {
	return MacAddress.fromBytes(netif.getHardwareAddress());
	} catch (IllegalArgumentException\|NullPointerException\|SocketException e) {
	return null;
	}
	}
	}

src/android/net/apf/ApfFilter.java

+1 −1

src/android/net/dhcp/DhcpClient.java

+1 −1

src/android/net/ip/ConnectivityPacketTracker.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,6 @@ import static android.system.OsConstants.SOCK_NONBLOCK;
	import static android.system.OsConstants.SOCK_RAW;		import static android.system.OsConstants.SOCK_RAW;

	import android.net.util.ConnectivityPacketSummary;		import android.net.util.ConnectivityPacketSummary;
	import android.net.util.InterfaceParams;
	import android.net.util.NetworkStackUtils;		import android.net.util.NetworkStackUtils;
	import android.os.Handler;		import android.os.Handler;
	import android.os.SystemClock;		import android.os.SystemClock;
	@@ -36,6 +35,7 @@ import android.util.Log;

	import com.android.internal.util.HexDump;		import com.android.internal.util.HexDump;
	import com.android.internal.util.TokenBucket;		import com.android.internal.util.TokenBucket;
			import com.android.net.module.util.InterfaceParams;
	import com.android.net.module.util.PacketReader;		import com.android.net.module.util.PacketReader;

	import java.io.FileDescriptor;		import java.io.FileDescriptor;