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

Merge "Change reserveSecurityParameterIndex() to take a remoteAddress"

Browse Source 
am: d118826971

Change-Id: Ie59322c4e80aab89d784a2fcb3edd6458677bbb7
This commit is contained in:
Nathan Harold
2017-03-30 03:39:46 +00:00
committed by android-build-merger
parent caf765db81 909d66e80a
commit d083810c0b
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/java/android/net/IpSecManager.java
View File

@@ -81,7 +81,7 @@ public final class IpSecManager {
public static final class SecurityParameterIndex implements AutoCloseable {
private final IIpSecService mService;
private final InetAddress mDestinationAddress;
private final InetAddress mRemoteAddress;
private final CloseGuard mCloseGuard = CloseGuard.get();
private int mSpi;
@@ -91,10 +91,10 @@ public final class IpSecManager {
}
private SecurityParameterIndex(
IIpSecService service, InetAddress destinationAddress, int spi)
IIpSecService service, int direction, InetAddress remoteAddress, int spi)
throws ResourceUnavailableException, SpiUnavailableException {
mService = service;
mDestinationAddress = destinationAddress;
mRemoteAddress = remoteAddress;
mSpi = spi;
mCloseGuard.open("open");
}
@@ -102,13 +102,9 @@ public final class IpSecManager {
/**
* Release an SPI that was previously reserved.
*
* <p>Release an SPI for use by other users in the system. This will fail if the SPI is
* currently in use by an IpSecTransform.
*
* @param destinationAddress SPIs must be unique for each combination of SPI and destination
* address. Thus, the destinationAddress to which the SPI will communicate must be
* supplied.
* @param spi the previously reserved SPI to be freed.
* <p>Release an SPI for use by other users in the system. If a SecurityParameterIndex is
* applied to an IpSecTransform, it will become unusable for future transforms but should
* still be closed to ensure system resources are released.
*/
@Override
public void close() {
@@ -134,13 +130,13 @@ public final class IpSecManager {
public static final int INVALID_SECURITY_PARAMETER_INDEX = 0;
/**
* Reserve an SPI for traffic bound towards the specified destination address.
* Reserve an SPI for traffic bound towards the specified remote address.
*
* <p>If successful, this SPI is guaranteed available until released by a call to {@link
* SecurityParameterIndex#close()}.
*
* @param destinationAddress SPIs must be unique for each combination of SPI and destination
* address.
* @param direction {@link IpSecTransform#DIRECTION_IN} or {@link IpSecTransform#DIRECTION_OUT}
* @param remoteAddress address of the remote. SPIs must be unique for each remoteAddress.
* @param requestedSpi the requested SPI, or '0' to allocate a random SPI.
* @return the reserved SecurityParameterIndex
* @throws ResourceUnavailableException indicating that too many SPIs are currently allocated
@@ -148,9 +144,9 @@ public final class IpSecManager {
* @throws SpiUnavailableException indicating that a particular SPI cannot be reserved
*/
public SecurityParameterIndex reserveSecurityParameterIndex(
InetAddress destinationAddress, int requestedSpi)
int direction, InetAddress remoteAddress, int requestedSpi)
throws SpiUnavailableException, ResourceUnavailableException {
return new SecurityParameterIndex(mService, destinationAddress, requestedSpi);
return new SecurityParameterIndex(mService, direction, remoteAddress, requestedSpi);
}
/**

4
core/java/android/net/IpSecTransform.java
View File

@@ -307,7 +307,7 @@ public final class IpSecTransform implements AutoCloseable {
* <p>Care should be chosen when selecting an SPI to ensure that is is as unique as
* possible. Random number generation is a reasonable approach to selecting an SPI. For
* outbound SPIs, they must be reserved by calling {@link
* IpSecManager#reserveSecurityParameterIndex(InetAddress, int)}. Otherwise, Transforms will
* IpSecManager#reserveSecurityParameterIndex(int, InetAddress, int)}. Otherwise, Transforms will
* fail to build.
*
* <p>Unless an SPI is set for a given direction, traffic in that direction will be
@@ -329,7 +329,7 @@ public final class IpSecTransform implements AutoCloseable {
* <p>Care should be chosen when selecting an SPI to ensure that is is as unique as
* possible. Random number generation is a reasonable approach to selecting an SPI. For
* outbound SPIs, they must be reserved by calling {@link
* IpSecManager#reserveSecurityParameterIndex(InetAddress, int)}. Otherwise, Transforms will
* IpSecManager#reserveSecurityParameterIndex(int, InetAddress, int)}. Otherwise, Transforms will
* fail to activate.
*
* <p>Unless an SPI is set for a given direction, traffic in that direction will be