commit ad600cb86a32f490a6d2855fc32fb480edc0360b
author Benedict Wong <benedictwong@google.com> Mon May 14 17:22:35 2018 -0700
committer Benedict Wong <benedictwong@google.com> Thu Aug 30 11:10:36 2018 -0700
tree 17d8e586785ba151955662227b4175b84ad9138d
parent 46296709e3cf4f1a8e73f58272ec078f00153309

Rename tunnel mode local/remote addresses to src/dst

Update tunnel mode addresses to more correctly reflect their usage.
These addresses are used for matching SAs, which should be denoted as
source/destination pairs instead of local or remote.

Bug: 79384676
Test: Tests passing (integration + unit tests)
Change-Id: I2bbc3bb5add11155d83475c61a9dcea7be26bf0b

server/NetdNativeService.cpp

diff --git a/server/NetdNativeService.cpp b/server/NetdNativeService.cpp
index f9ce83b..c8e0c7e 100644
--- a/server/NetdNativeService.cpp
+++ b/server/NetdNativeService.cpp
@@ -549,13 +549,9 @@
     ENFORCE_PERMISSION(CONNECTIVITY_INTERNAL);
     gLog.log("ipSecAddSecurityAssociation()");
     return asBinderStatus(gCtls->xfrmCtrl.ipSecAddSecurityAssociation(
-              transformId, mode, sourceAddress, destinationAddress,
-              underlyingNetId,
-              spi, markValue, markMask,
-              authAlgo, authKey, authTruncBits,
-              cryptAlgo, cryptKey, cryptTruncBits,
-              aeadAlgo, aeadKey, aeadIcvBits,
-              encapType, encapLocalPort, encapRemotePort));
+            transformId, mode, sourceAddress, destinationAddress, underlyingNetId, spi, markValue,
+            markMask, authAlgo, authKey, authTruncBits, cryptAlgo, cryptKey, cryptTruncBits,
+            aeadAlgo, aeadKey, aeadIcvBits, encapType, encapLocalPort, encapRemotePort));
 }
 
 binder::Status NetdNativeService::ipSecDeleteSecurityAssociation(
@@ -605,65 +601,39 @@
                     socket));
 }
 
-binder::Status NetdNativeService::ipSecAddSecurityPolicy(
-        int32_t transformId,
-        int32_t direction,
-        const std::string& sourceAddress,
-        const std::string& destinationAddress,
-        int32_t spi,
-        int32_t markValue,
-        int32_t markMask){
+binder::Status NetdNativeService::ipSecAddSecurityPolicy(int32_t transformId, int32_t direction,
+                                                         const std::string& tmplSrcAddress,
+                                                         const std::string& tmplDstAddress,
+                                                         int32_t spi, int32_t markValue,
+                                                         int32_t markMask) {
     // Necessary locking done in IpSecService and kernel
     ENFORCE_PERMISSION(NETWORK_STACK);
     gLog.log("ipSecAddSecurityPolicy()");
     return asBinderStatus(gCtls->xfrmCtrl.ipSecAddSecurityPolicy(
-                    transformId,
-                    direction,
-                    sourceAddress,
-                    destinationAddress,
-                    spi,
-                    markValue,
-                    markMask));
+            transformId, direction, tmplSrcAddress, tmplDstAddress, spi, markValue, markMask));
 }
 
-binder::Status NetdNativeService::ipSecUpdateSecurityPolicy(
-        int32_t transformId,
-        int32_t direction,
-        const std::string& sourceAddress,
-        const std::string& destinationAddress,
-        int32_t spi,
-        int32_t markValue,
-        int32_t markMask){
+binder::Status NetdNativeService::ipSecUpdateSecurityPolicy(int32_t transformId, int32_t direction,
+                                                            const std::string& tmplSrcAddress,
+                                                            const std::string& tmplDstAddress,
+                                                            int32_t spi, int32_t markValue,
+                                                            int32_t markMask) {
     // Necessary locking done in IpSecService and kernel
     ENFORCE_PERMISSION(NETWORK_STACK);
     gLog.log("ipSecAddSecurityPolicy()");
     return asBinderStatus(gCtls->xfrmCtrl.ipSecUpdateSecurityPolicy(
-                    transformId,
-                    direction,
-                    sourceAddress,
-                    destinationAddress,
-                    spi,
-                    markValue,
-                    markMask));
+            transformId, direction, tmplSrcAddress, tmplDstAddress, spi, markValue, markMask));
 }
 
-binder::Status NetdNativeService::ipSecDeleteSecurityPolicy(
-        int32_t transformId,
-        int32_t direction,
-        const std::string& sourceAddress,
-        const std::string& destinationAddress,
-        int32_t markValue,
-        int32_t markMask){
+binder::Status NetdNativeService::ipSecDeleteSecurityPolicy(int32_t transformId, int32_t direction,
+                                                            const std::string& tmplSrcAddress,
+                                                            const std::string& tmplDstAddress,
+                                                            int32_t markValue, int32_t markMask) {
     // Necessary locking done in IpSecService and kernel
     ENFORCE_PERMISSION(NETWORK_STACK);
     gLog.log("ipSecAddSecurityPolicy()");
     return asBinderStatus(gCtls->xfrmCtrl.ipSecDeleteSecurityPolicy(
-                    transformId,
-                    direction,
-                    sourceAddress,
-                    destinationAddress,
-                    markValue,
-                    markMask));
+            transformId, direction, tmplSrcAddress, tmplDstAddress, markValue, markMask));
 }
 
 binder::Status NetdNativeService::addVirtualTunnelInterface(