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/XfrmController.h

diff --git a/server/XfrmController.h b/server/XfrmController.h
index d4c4779..96a2fae 100644
--- a/server/XfrmController.h
+++ b/server/XfrmController.h
@@ -158,20 +158,19 @@
     ipSecRemoveTransportModeTransform(const android::base::unique_fd& socket);
 
     static netdutils::Status ipSecAddSecurityPolicy(int32_t transformId, int32_t direction,
-                                                    const std::string& sourceAddress,
-                                                    const std::string& destinationAddress,
-                                                    int32_t spi, int32_t markValue,
-                                                    int32_t markMask);
+                                                    const std::string& tmplSrcAddress,
+                                                    const std::string& tmplDstAddress, int32_t spi,
+                                                    int32_t markValue, int32_t markMask);
 
     static netdutils::Status ipSecUpdateSecurityPolicy(int32_t transformId, int32_t direction,
-                                                       const std::string& sourceAddress,
-                                                       const std::string& destinationAddress,
+                                                       const std::string& tmplSrcAddress,
+                                                       const std::string& tmplDstAddress,
                                                        int32_t spi, int32_t markValue,
                                                        int32_t markMask);
 
     static netdutils::Status ipSecDeleteSecurityPolicy(int32_t transformId, int32_t direction,
-                                                       const std::string& sourceAddress,
-                                                       const std::string& destinationAddress,
+                                                       const std::string& tmplSrcAddress,
+                                                       const std::string& tmplDstAddress,
                                                        int32_t markValue, int32_t markMask);
 
     static int addVirtualTunnelInterface(const std::string& deviceName,
@@ -345,8 +344,8 @@
                                          uint32_t* outSpi, const XfrmSocket& sock);
 
     static netdutils::Status processSecurityPolicy(int32_t transformId, int32_t direction,
-                                                   const std::string& localAddress,
-                                                   const std::string& remoteAddress, int32_t spi,
+                                                   const std::string& tmplSrcAddress,
+                                                   const std::string& tmplDstAddress, int32_t spi,
                                                    int32_t markValue, int32_t markMask,
                                                    int32_t msgType);
     static netdutils::Status updateTunnelModeSecurityPolicy(const XfrmSaInfo& record,