Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use IPV6_MIN_MTU from NetworkConstants in Ikev2Vpn" am: 75304108e7 am: 8f85ecd1f5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512879

Change-Id: I516719d803ccd2b4cda91eb38ecd108babab50b8
This commit is contained in:
Remi NGUYEN VAN
2020-12-04 04:12:18 +00:00
committed by Automerger Merge Worker
parent 3e28c9d242 8f85ecd1f5
commit 6a1cb62078
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/net/Ikev2VpnProfile.java
View File

@@ -16,12 +16,9 @@
package android.net;
import static android.net.PlatformVpnProfile.TYPE_IKEV2_IPSEC_PSK;
import static android.net.PlatformVpnProfile.TYPE_IKEV2_IPSEC_RSA;
import static android.net.PlatformVpnProfile.TYPE_IKEV2_IPSEC_USER_PASS;
import static com.android.internal.annotations.VisibleForTesting.Visibility;
import static com.android.internal.util.Preconditions.checkStringNotEmpty;
import static com.android.net.module.util.NetworkStackConstants.IPV6_MIN_MTU;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -158,9 +155,8 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
// IPv6 MTU is greater; since profiles may be started by the system on IPv4 and IPv6
// networks, the VPN must provide a link fulfilling the stricter of the two conditions
// (at least that of the IPv6 MTU).
if (mMaxMtu < LinkProperties.MIN_MTU_V6) {
throw new IllegalArgumentException(
"Max MTU must be at least" + LinkProperties.MIN_MTU_V6);
if (mMaxMtu < IPV6_MIN_MTU) {
throw new IllegalArgumentException("Max MTU must be at least" + IPV6_MIN_MTU);
}
switch (mType) {
@@ -811,9 +807,8 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
// IPv6 MTU is greater; since profiles may be started by the system on IPv4 and IPv6
// networks, the VPN must provide a link fulfilling the stricter of the two conditions
// (at least that of the IPv6 MTU).
if (mtu < LinkProperties.MIN_MTU_V6) {
throw new IllegalArgumentException(
"Max MTU must be at least " + LinkProperties.MIN_MTU_V6);
if (mtu < IPV6_MIN_MTU) {
throw new IllegalArgumentException("Max MTU must be at least " + IPV6_MIN_MTU);
}
mMaxMtu = mtu;
return this;

3
core/java/android/net/LinkProperties.java
View File

@@ -81,8 +81,7 @@ public final class LinkProperties implements Parcelable {
private static final int MIN_MTU = 68;
/** @hide */
public static final int MIN_MTU_V6 = 1280;
private static final int MIN_MTU_V6 = 1280;
private static final int MAX_MTU = 10000;