Add XFRM-I support to IpSecService

This change adds support for XFRM-I to all IpSecService netd calls.
Fallback logic is in netd, and thus both VTI and XFRM-I parameters are
always passed down to IpSecService.

Bug: 78589502
Test: All java, CTS tests passing
Change-Id: Ie4186f0ad7e50763b21831f6fa411b5ee436de78
This commit is contained in:
Benedict Wong
2018-09-06 11:31:25 -07:00
parent c606db86c8
commit 12b70569f9
2 changed files with 52 additions and 4 deletions

View File

@@ -47,6 +47,7 @@ public class IpSecConfigTest {
assertNull(c.getEncryption());
assertNull(c.getAuthentication());
assertEquals(IpSecManager.INVALID_RESOURCE_ID, c.getSpiResourceId());
assertEquals(0, c.getXfrmInterfaceId());
}
private IpSecConfig getSampleConfig() {
@@ -77,6 +78,7 @@ public class IpSecConfigTest {
c.setNattKeepaliveInterval(42);
c.setMarkValue(12);
c.setMarkMask(23);
c.setXfrmInterfaceId(34);
return c;
}