From fbe3a82340a36a7222cea705590942063ada72d0 Mon Sep 17 00:00:00 2001 From: Jonathan Basseri Date: Thu, 16 Nov 2017 10:58:01 -0800 Subject: [PATCH] Use consistent naming for allocating SPI. Throughout the IPsec code (API, system server, netd) we use "reserve" SPI and "allocate" SPI interchangeably. This renames to use "allocate" everywhere for self-consistency and consistency with the kernel (ALLOCSPI). In javadoc, I am leaving the word "reserve" in several places because it is still an accurate description of how the method behaves. Bug: 69128142 Test: TreeHugger should be enough Change-Id: I8ea603b4612303b0393beef04032671fa53d2106 --- .../java/android/net/IpSecManagerTest.java | 20 ++++++++++--------- .../server/IpSecServiceParameterizedTest.java | 6 +++--- .../com/android/server/IpSecServiceTest.java | 8 ++++---- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/tests/net/java/android/net/IpSecManagerTest.java b/tests/net/java/android/net/IpSecManagerTest.java index ccb0f3b07d..0f40b4562b 100644 --- a/tests/net/java/android/net/IpSecManagerTest.java +++ b/tests/net/java/android/net/IpSecManagerTest.java @@ -80,7 +80,7 @@ public class IpSecManagerTest { int resourceId = 1; IpSecSpiResponse spiResp = new IpSecSpiResponse(IpSecManager.Status.OK, resourceId, DROID_SPI); - when(mMockIpSecService.reserveSecurityParameterIndex( + when(mMockIpSecService.allocateSecurityParameterIndex( eq(IpSecTransform.DIRECTION_IN), eq(GOOGLE_DNS_4.getHostAddress()), eq(DROID_SPI), @@ -88,7 +88,7 @@ public class IpSecManagerTest { .thenReturn(spiResp); IpSecManager.SecurityParameterIndex droidSpi = - mIpSecManager.reserveSecurityParameterIndex( + mIpSecManager.allocateSecurityParameterIndex( IpSecTransform.DIRECTION_IN, GOOGLE_DNS_4, DROID_SPI); assertEquals(DROID_SPI, droidSpi.getSpi()); @@ -102,7 +102,7 @@ public class IpSecManagerTest { int resourceId = 1; IpSecSpiResponse spiResp = new IpSecSpiResponse(IpSecManager.Status.OK, resourceId, DROID_SPI); - when(mMockIpSecService.reserveSecurityParameterIndex( + when(mMockIpSecService.allocateSecurityParameterIndex( eq(IpSecTransform.DIRECTION_OUT), eq(GOOGLE_DNS_4.getHostAddress()), eq(IpSecManager.INVALID_SECURITY_PARAMETER_INDEX), @@ -110,7 +110,7 @@ public class IpSecManagerTest { .thenReturn(spiResp); IpSecManager.SecurityParameterIndex randomSpi = - mIpSecManager.reserveSecurityParameterIndex( + mIpSecManager.allocateSecurityParameterIndex( IpSecTransform.DIRECTION_OUT, GOOGLE_DNS_4); assertEquals(DROID_SPI, randomSpi.getSpi()); @@ -127,12 +127,13 @@ public class IpSecManagerTest { public void testAllocSpiResUnavaiableExeption() throws Exception { IpSecSpiResponse spiResp = new IpSecSpiResponse(IpSecManager.Status.RESOURCE_UNAVAILABLE, 0, 0); - when(mMockIpSecService.reserveSecurityParameterIndex( + when(mMockIpSecService.allocateSecurityParameterIndex( anyInt(), anyString(), anyInt(), anyObject())) .thenReturn(spiResp); try { - mIpSecManager.reserveSecurityParameterIndex(IpSecTransform.DIRECTION_OUT, GOOGLE_DNS_4); + mIpSecManager.allocateSecurityParameterIndex( + IpSecTransform.DIRECTION_OUT, GOOGLE_DNS_4); fail("ResourceUnavailableException was not thrown"); } catch (IpSecManager.ResourceUnavailableException e) { } @@ -144,12 +145,13 @@ public class IpSecManagerTest { @Test public void testAllocSpiSpiUnavaiableExeption() throws Exception { IpSecSpiResponse spiResp = new IpSecSpiResponse(IpSecManager.Status.SPI_UNAVAILABLE, 0, 0); - when(mMockIpSecService.reserveSecurityParameterIndex( + when(mMockIpSecService.allocateSecurityParameterIndex( anyInt(), anyString(), anyInt(), anyObject())) .thenReturn(spiResp); try { - mIpSecManager.reserveSecurityParameterIndex(IpSecTransform.DIRECTION_OUT, GOOGLE_DNS_4); + mIpSecManager.allocateSecurityParameterIndex( + IpSecTransform.DIRECTION_OUT, GOOGLE_DNS_4); fail("ResourceUnavailableException was not thrown"); } catch (IpSecManager.ResourceUnavailableException e) { } @@ -161,7 +163,7 @@ public class IpSecManagerTest { @Test public void testRequestAllocInvalidSpi() throws Exception { try { - mIpSecManager.reserveSecurityParameterIndex( + mIpSecManager.allocateSecurityParameterIndex( IpSecTransform.DIRECTION_OUT, GOOGLE_DNS_4, 0); fail("Able to allocate invalid spi"); } catch (IllegalArgumentException e) { diff --git a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java index 5c031eb113..3d57fff9ae 100644 --- a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java +++ b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java @@ -125,7 +125,7 @@ public class IpSecServiceParameterizedTest { .thenReturn(TEST_SPI_OUT); IpSecSpiResponse spiResp = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( IpSecTransform.DIRECTION_OUT, mRemoteAddr, TEST_SPI_OUT, new Binder()); assertEquals(IpSecManager.Status.OK, spiResp.status); assertEquals(TEST_SPI_OUT, spiResp.spi); @@ -142,7 +142,7 @@ public class IpSecServiceParameterizedTest { .thenReturn(TEST_SPI_OUT); IpSecSpiResponse spiResp = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( IpSecTransform.DIRECTION_OUT, mRemoteAddr, TEST_SPI_OUT, new Binder()); mIpSecService.releaseSecurityParameterIndex(spiResp.resourceId); @@ -162,7 +162,7 @@ public class IpSecServiceParameterizedTest { .thenReturn(returnSpi); IpSecSpiResponse spi = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( direction, NetworkUtils.numericToInetAddress(remoteAddress).getHostAddress(), IpSecManager.INVALID_SECURITY_PARAMETER_INDEX, diff --git a/tests/net/java/com/android/server/IpSecServiceTest.java b/tests/net/java/com/android/server/IpSecServiceTest.java index 0720886f88..6cea9a8a0b 100644 --- a/tests/net/java/com/android/server/IpSecServiceTest.java +++ b/tests/net/java/com/android/server/IpSecServiceTest.java @@ -255,7 +255,7 @@ public class IpSecServiceTest { for (String address : invalidAddresses) { try { IpSecSpiResponse spiResp = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( IpSecTransform.DIRECTION_OUT, address, DROID_SPI, new Binder()); fail("Invalid address was passed through IpSecService validation: " + address); } catch (IllegalArgumentException e) { @@ -336,7 +336,7 @@ public class IpSecServiceTest { // Reserve spis until it fails. for (int i = 0; i < MAX_NUM_SPIS; i++) { IpSecSpiResponse newSpi = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( 0x1, InetAddress.getLoopbackAddress().getHostAddress(), DROID_SPI + i, @@ -352,7 +352,7 @@ public class IpSecServiceTest { // Try to reserve one more SPI, and should fail. IpSecSpiResponse extraSpi = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( 0x1, InetAddress.getLoopbackAddress().getHostAddress(), DROID_SPI + MAX_NUM_SPIS, @@ -366,7 +366,7 @@ public class IpSecServiceTest { // Should successfully reserve one more spi. extraSpi = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( 0x1, InetAddress.getLoopbackAddress().getHostAddress(), DROID_SPI + MAX_NUM_SPIS,