LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Merge "Relax IPsec resource count restrictions." am: cae8b10659 am: 40cc67b7eb am: 60f9dc1cf1" into rvc-d1-dev-plus-aosp am: 4088e221e1 am: 1e7561700e

Browse Source 
Change-Id: I1c5fdb5dcbce1e5c400ce12eaa52717ac54bf28f
This commit is contained in:
Automerger Merge Worker
2020-03-25 00:49:05 +00:00
parent 09b77ea7bf 9c4df64d77
commit 1c8508a174
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/IpSecService.java
View File

@@ -359,10 +359,14 @@ public class IpSecService extends IIpSecService.Stub {
@VisibleForTesting @VisibleForTesting
static final class UserRecord { static final class UserRecord {
/* Maximum number of each type of resource that a single UID may possess */ /* Maximum number of each type of resource that a single UID may possess */
public static final int MAX_NUM_TUNNEL_INTERFACES = 2;
public static final int MAX_NUM_ENCAP_SOCKETS = 2; // Up to 4 active VPNs/IWLAN with potential soft handover.
public static final int MAX_NUM_TRANSFORMS = 4; public static final int MAX_NUM_TUNNEL_INTERFACES = 8;
public static final int MAX_NUM_SPIS = 8; public static final int MAX_NUM_ENCAP_SOCKETS = 16;
// SPIs and Transforms are both cheap, and are 1:1 correlated.
public static final int MAX_NUM_TRANSFORMS = 64;
public static final int MAX_NUM_SPIS = 64;
/** /**
* Store each of the OwnedResource types in an (thinly wrapped) sparse array for indexing * Store each of the OwnedResource types in an (thinly wrapped) sparse array for indexing