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

Merge "Automatically set IPsec tunnel interface as up" am: 1f1da2083a am: 1e6fcb32b1

Browse Source 
Change-Id: I01d10d2e1c0fcc52b88901609fae068d6d5268f7
This commit is contained in:
Benedict Wong
2020-03-25 05:01:20 +00:00
committed by Automerger Merge Worker
parent 60f9dc1cf1 1e6fcb32b1
commit 43a6ad2f9e
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,7 @@ import android.net.TrafficStats;
import android.net.util.NetdService; import android.net.util.NetdService;
import android.os.Binder; import android.os.Binder;
import android.os.IBinder; import android.os.IBinder;
import android.os.INetworkManagementService;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceSpecificException; import android.os.ServiceSpecificException;
@@ -114,6 +115,9 @@ public class IpSecService extends IIpSecService.Stub {
/* Binder context for this service */ /* Binder context for this service */
private final Context mContext; private final Context mContext;
/* NetworkManager instance */
private final INetworkManagementService mNetworkManager;
/** /**
* The next non-repeating global ID for tracking resources between users, this service, and * The next non-repeating global ID for tracking resources between users, this service, and
* kernel data structures. Accessing this variable is not thread safe, so it is only read or * kernel data structures. Accessing this variable is not thread safe, so it is only read or
@@ -992,12 +996,13 @@ public class IpSecService extends IIpSecService.Stub {
* *
* @param context Binder context for this service * @param context Binder context for this service
*/ */
private IpSecService(Context context) { private IpSecService(Context context, INetworkManagementService networkManager) {
this(context, IpSecServiceConfiguration.GETSRVINSTANCE); this(context, networkManager, IpSecServiceConfiguration.GETSRVINSTANCE);
} }
static IpSecService create(Context context) throws InterruptedException { static IpSecService create(Context context, INetworkManagementService networkManager)
final IpSecService service = new IpSecService(context); throws InterruptedException {
final IpSecService service = new IpSecService(context, networkManager);
service.connectNativeNetdService(); service.connectNativeNetdService();
return service; return service;
} }
@@ -1011,9 +1016,11 @@ public class IpSecService extends IIpSecService.Stub {
/** @hide */ /** @hide */
@VisibleForTesting @VisibleForTesting
public IpSecService(Context context, IpSecServiceConfiguration config) { public IpSecService(Context context, INetworkManagementService networkManager,
IpSecServiceConfiguration config) {
this( this(
context, context,
networkManager,
config, config,
(fd, uid) -> { (fd, uid) -> {
try { try {
@@ -1027,9 +1034,10 @@ public class IpSecService extends IIpSecService.Stub {
/** @hide */ /** @hide */
@VisibleForTesting @VisibleForTesting
public IpSecService( public IpSecService(Context context, INetworkManagementService networkManager,
Context context, IpSecServiceConfiguration config, UidFdTagger uidFdTagger) { IpSecServiceConfiguration config, UidFdTagger uidFdTagger) {
mContext = context; mContext = context;
mNetworkManager = Objects.requireNonNull(networkManager);
mSrvConfig = config; mSrvConfig = config;
mUidFdTagger = uidFdTagger; mUidFdTagger = uidFdTagger;
} }
@@ -1308,6 +1316,10 @@ public class IpSecService extends IIpSecService.Stub {
final INetd netd = mSrvConfig.getNetdInstance(); final INetd netd = mSrvConfig.getNetdInstance();
netd.ipSecAddTunnelInterface(intfName, localAddr, remoteAddr, ikey, okey, resourceId); netd.ipSecAddTunnelInterface(intfName, localAddr, remoteAddr, ikey, okey, resourceId);
Binder.withCleanCallingIdentity(() -> {
mNetworkManager.setInterfaceUp(intfName);
});
for (int selAddrFamily : ADDRESS_FAMILIES) { for (int selAddrFamily : ADDRESS_FAMILIES) {
// Always send down correct local/remote addresses for template. // Always send down correct local/remote addresses for template.
netd.ipSecAddSecurityPolicy( netd.ipSecAddSecurityPolicy(