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

Add xfrm mark in IpSecConfig

Browse Source 
Bug: 63589600
Test: runtest frameworks-net
Change-Id: I2d38d781b8b31d8bf39fd4e9a7e31509f15a9e16
This commit is contained in:
Di Lu
2018-01-11 11:35:25 -08:00
parent 656040874d
commit fcf78b1727
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/net/java/com/android/server/IpSecServiceParameterizedTest.java
View File

@@ -136,7 +136,12 @@ public class IpSecServiceParameterizedTest {
verify(mMockNetd) verify(mMockNetd)
.ipSecDeleteSecurityAssociation( .ipSecDeleteSecurityAssociation(
eq(spiResp.resourceId), anyString(), anyString(), eq(TEST_SPI)); eq(spiResp.resourceId),
anyString(),
anyString(),
eq(TEST_SPI),
anyInt(),
anyInt());
// Verify quota and RefcountedResource objects cleaned up // Verify quota and RefcountedResource objects cleaned up
IpSecService.UserRecord userRecord = IpSecService.UserRecord userRecord =
@@ -168,7 +173,12 @@ public class IpSecServiceParameterizedTest {
verify(mMockNetd) verify(mMockNetd)
.ipSecDeleteSecurityAssociation( .ipSecDeleteSecurityAssociation(
eq(spiResp.resourceId), anyString(), anyString(), eq(TEST_SPI)); eq(spiResp.resourceId),
anyString(),
anyString(),
eq(TEST_SPI),
anyInt(),
anyInt());
// Verify quota and RefcountedResource objects cleaned up // Verify quota and RefcountedResource objects cleaned up
assertEquals(0, userRecord.mSpiQuotaTracker.mCurrent); assertEquals(0, userRecord.mSpiQuotaTracker.mCurrent);
@@ -221,6 +231,8 @@ public class IpSecServiceParameterizedTest {
anyString(), anyString(),
anyLong(), anyLong(),
eq(TEST_SPI), eq(TEST_SPI),
anyInt(),
anyInt(),
eq(IpSecAlgorithm.AUTH_HMAC_SHA256), eq(IpSecAlgorithm.AUTH_HMAC_SHA256),
eq(AUTH_KEY), eq(AUTH_KEY),
anyInt(), anyInt(),
@@ -254,6 +266,8 @@ public class IpSecServiceParameterizedTest {
anyString(), anyString(),
anyLong(), anyLong(),
eq(TEST_SPI), eq(TEST_SPI),
anyInt(),
anyInt(),
eq(""), eq(""),
eq(new byte[] {}), eq(new byte[] {}),
eq(0), eq(0),
@@ -280,7 +294,12 @@ public class IpSecServiceParameterizedTest {
verify(mMockNetd) verify(mMockNetd)
.ipSecDeleteSecurityAssociation( .ipSecDeleteSecurityAssociation(
eq(createTransformResp.resourceId), anyString(), anyString(), eq(TEST_SPI)); eq(createTransformResp.resourceId),
anyString(),
anyString(),
eq(TEST_SPI),
anyInt(),
anyInt());
// Verify quota and RefcountedResource objects cleaned up // Verify quota and RefcountedResource objects cleaned up
IpSecService.UserRecord userRecord = IpSecService.UserRecord userRecord =
@@ -314,7 +333,12 @@ public class IpSecServiceParameterizedTest {
verify(mMockNetd) verify(mMockNetd)
.ipSecDeleteSecurityAssociation( .ipSecDeleteSecurityAssociation(
eq(createTransformResp.resourceId), anyString(), anyString(), eq(TEST_SPI)); eq(createTransformResp.resourceId),
anyString(),
anyString(),
eq(TEST_SPI),
anyInt(),
anyInt());
// Verify quota and RefcountedResource objects cleaned up // Verify quota and RefcountedResource objects cleaned up
assertEquals(0, userRecord.mTransformQuotaTracker.mCurrent); assertEquals(0, userRecord.mTransformQuotaTracker.mCurrent);