Merge changes I97015365,Ic9db4b9b into rvc-dev am: 1cb71607bc am: 3194765421 (6ec53ea7) · Commits · e / os / android_frameworks_base

core/java/android/net/NattKeepalivePacketData.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static android.net.InvalidPacketException.ERROR_INVALID_IP_ADDRESS;
		import static android.net.InvalidPacketException.ERROR_INVALID_PORT;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.net.util.IpUtils;
		import android.os.Parcel;
		@@ -30,6 +31,7 @@ import java.net.Inet4Address;
		import java.net.InetAddress;
		import java.nio.ByteBuffer;
		import java.nio.ByteOrder;
		import java.util.Objects;

		/** @hide */
		@SystemApi
		@@ -121,4 +123,19 @@ public final class NattKeepalivePacketData extends KeepalivePacketData implement
		return new NattKeepalivePacketData[size];
		}
		};

		@Override
		public boolean equals(@Nullable final Object o) {
		if (!(o instanceof NattKeepalivePacketData)) return false;
		final NattKeepalivePacketData other = (NattKeepalivePacketData) o;
		return this.srcAddress.equals(other.srcAddress)
		&& this.dstAddress.equals(other.dstAddress)
		&& this.srcPort == other.srcPort
		&& this.dstPort == other.dstPort;
		}

		@Override
		public int hashCode() {
		return Objects.hash(srcAddress, dstAddress, srcPort, dstPort);
		}
		}

tests/net/common/java/android/net/NattKeepalivePacketDataTest.kt

0 → 100644

+114 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 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

		import android.net.InvalidPacketException.ERROR_INVALID_IP_ADDRESS
		import android.net.InvalidPacketException.ERROR_INVALID_PORT
		import android.net.NattSocketKeepalive.NATT_PORT
		import android.os.Build
		import androidx.test.filters.SmallTest
		import androidx.test.runner.AndroidJUnit4
		import com.android.testutils.assertEqualBothWays
		import com.android.testutils.assertFieldCountEquals
		import com.android.testutils.assertParcelSane
		import com.android.testutils.DevSdkIgnoreRule
		import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo
		import com.android.testutils.parcelingRoundTrip
		import java.net.InetAddress
		import org.junit.Assert.assertEquals
		import org.junit.Assert.assertNotEquals
		import org.junit.Assert.fail
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith

		@RunWith(AndroidJUnit4::class)
		@SmallTest
		class NattKeepalivePacketDataTest {
		@Rule @JvmField
		val ignoreRule: DevSdkIgnoreRule = DevSdkIgnoreRule()

		/* Refer to the definition in {@code NattKeepalivePacketData} */
		private val IPV4_HEADER_LENGTH = 20
		private val UDP_HEADER_LENGTH = 8

		private val TEST_PORT = 4243
		private val TEST_PORT2 = 4244
		private val TEST_SRC_ADDRV4 = "198.168.0.2".address()
		private val TEST_DST_ADDRV4 = "198.168.0.1".address()
		private val TEST_ADDRV6 = "2001:db8::1".address()

		private fun String.address() = InetAddresses.parseNumericAddress(this)
		private fun nattKeepalivePacket(
		srcAddress: InetAddress? = TEST_SRC_ADDRV4,
		srcPort: Int = TEST_PORT,
		dstAddress: InetAddress? = TEST_DST_ADDRV4,
		dstPort: Int = NATT_PORT
		) = NattKeepalivePacketData.nattKeepalivePacket(srcAddress, srcPort, dstAddress, dstPort)

		@Test @IgnoreUpTo(Build.VERSION_CODES.Q)
		fun testConstructor() {
		try {
		nattKeepalivePacket(dstPort = TEST_PORT)
		fail("Dst port is not NATT port should cause exception")
		} catch (e: InvalidPacketException) {
		assertEquals(e.error, ERROR_INVALID_PORT)
		}

		try {
		nattKeepalivePacket(srcAddress = TEST_ADDRV6)
		fail("A v6 srcAddress should cause exception")
		} catch (e: InvalidPacketException) {
		assertEquals(e.error, ERROR_INVALID_IP_ADDRESS)
		}

		try {
		nattKeepalivePacket(dstAddress = TEST_ADDRV6)
		fail("A v6 dstAddress should cause exception")
		} catch (e: InvalidPacketException) {
		assertEquals(e.error, ERROR_INVALID_IP_ADDRESS)
		}

		try {
		parcelingRoundTrip(
		NattKeepalivePacketData(TEST_SRC_ADDRV4, TEST_PORT, TEST_DST_ADDRV4, TEST_PORT,
		byteArrayOf(12, 31, 22, 44)))
		fail("Invalid data should cause exception")
		} catch (e: IllegalArgumentException) { }
		}

		@Test @IgnoreUpTo(Build.VERSION_CODES.Q)
		fun testParcel() {
		assertParcelSane(nattKeepalivePacket(), 0)
		}

		@Test @IgnoreUpTo(Build.VERSION_CODES.Q)
		fun testEquals() {
		assertEqualBothWays(nattKeepalivePacket(), nattKeepalivePacket())
		assertNotEquals(nattKeepalivePacket(dstAddress = TEST_SRC_ADDRV4), nattKeepalivePacket())
		assertNotEquals(nattKeepalivePacket(srcAddress = TEST_DST_ADDRV4), nattKeepalivePacket())
		// Test src port only because dst port have to be NATT_PORT
		assertNotEquals(nattKeepalivePacket(srcPort = TEST_PORT2), nattKeepalivePacket())
		// Make sure the parceling test is updated if fields are added in the base class.
		assertFieldCountEquals(5, KeepalivePacketData::class.java)
		}

		@Test @IgnoreUpTo(Build.VERSION_CODES.Q)
		fun testHashCode() {
		assertEquals(nattKeepalivePacket().hashCode(), nattKeepalivePacket().hashCode())
		}
		}
		No newline at end of file