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

Merge changes I37dd459d,I1959f308 into rvc-dev

Browse Source 
* changes:
  Add tests for Tunnel, Transport mode application with released SPIs
  Use TransformRecord to get SPI instead of SpiRecord
This commit is contained in:
TreeHugger Robot
2020-05-12 20:30:03 +00:00
committed by Android (Google) Code Review
parent 55119e823e 003c5c9807
commit d7aa055b61
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1776,7 +1776,7 @@ public class IpSecService extends IIpSecService.Stub {
socketRecord = socketRecord =
userRecord.mEncapSocketRecords.getResourceOrThrow(c.getEncapSocketResourceId()); userRecord.mEncapSocketRecords.getResourceOrThrow(c.getEncapSocketResourceId());
} }
SpiRecord spiRecord = userRecord.mSpiRecords.getResourceOrThrow(c.getSpiResourceId()); SpiRecord spiRecord = transformInfo.getSpiRecord();
int mark = int mark =
(direction == IpSecManager.DIRECTION_OUT) (direction == IpSecManager.DIRECTION_OUT)
@@ -1809,7 +1809,7 @@ public class IpSecService extends IIpSecService.Stub {
// Set outbound SPI only. We want inbound to use any valid SA (old, new) on rekeys, // Set outbound SPI only. We want inbound to use any valid SA (old, new) on rekeys,
// but want to guarantee outbound packets are sent over the new SA. // but want to guarantee outbound packets are sent over the new SA.
spi = transformInfo.getSpiRecord().getSpi(); spi = spiRecord.getSpi();
} }
// Always update the policy with the relevant XFRM_IF_ID // Always update the policy with the relevant XFRM_IF_ID