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.cpp

diff --git a/server/XfrmController.cpp b/server/XfrmController.cpp
index b8d4e07..eae6928 100644
--- a/server/XfrmController.cpp
+++ b/server/XfrmController.cpp
@@ -745,41 +745,41 @@
 }
 
 netdutils::Status XfrmController::ipSecAddSecurityPolicy(int32_t transformId, int32_t direction,
-                                                         const std::string& localAddress,
-                                                         const std::string& remoteAddress,
+                                                         const std::string& tmplSrcAddress,
+                                                         const std::string& tmplDstAddress,
                                                          int32_t spi, int32_t markValue,
                                                          int32_t markMask) {
-    return processSecurityPolicy(transformId, direction, localAddress, remoteAddress, spi,
+    return processSecurityPolicy(transformId, direction, tmplSrcAddress, tmplDstAddress, spi,
                                  markValue, markMask, XFRM_MSG_NEWPOLICY);
 }
 
 netdutils::Status XfrmController::ipSecUpdateSecurityPolicy(int32_t transformId, int32_t direction,
-                                                            const std::string& localAddress,
-                                                            const std::string& remoteAddress,
+                                                            const std::string& tmplSrcAddress,
+                                                            const std::string& tmplDstAddress,
                                                             int32_t spi, int32_t markValue,
                                                             int32_t markMask) {
-    return processSecurityPolicy(transformId, direction, localAddress, remoteAddress, spi,
+    return processSecurityPolicy(transformId, direction, tmplSrcAddress, tmplDstAddress, spi,
                                  markValue, markMask, XFRM_MSG_UPDPOLICY);
 }
 
 netdutils::Status XfrmController::ipSecDeleteSecurityPolicy(int32_t transformId, int32_t direction,
-                                                            const std::string& localAddress,
-                                                            const std::string& remoteAddress,
+                                                            const std::string& tmplSrcAddress,
+                                                            const std::string& tmplDstAddress,
                                                             int32_t markValue, int32_t markMask) {
-    return processSecurityPolicy(transformId, direction, localAddress, remoteAddress, 0, markValue,
-                                 markMask, XFRM_MSG_DELPOLICY);
+    return processSecurityPolicy(transformId, direction, tmplSrcAddress, tmplDstAddress, 0,
+                                 markValue, markMask, XFRM_MSG_DELPOLICY);
 }
 
 netdutils::Status XfrmController::processSecurityPolicy(int32_t transformId, int32_t direction,
-                                                        const std::string& localAddress,
-                                                        const std::string& remoteAddress,
+                                                        const std::string& tmplSrcAddress,
+                                                        const std::string& tmplDstAddress,
                                                         int32_t spi, int32_t markValue,
                                                         int32_t markMask, int32_t msgType) {
     ALOGD("XfrmController::%s, line=%d", __FUNCTION__, __LINE__);
     ALOGD("transformId=%d", transformId);
     ALOGD("direction=%d", direction);
-    ALOGD("localAddress=%s", localAddress.c_str());
-    ALOGD("remoteAddress=%s", remoteAddress.c_str());
+    ALOGD("tmplSrcAddress=%s", tmplSrcAddress.c_str());
+    ALOGD("tmplDstAddress=%s", tmplDstAddress.c_str());
     ALOGD("spi=%0.8x", spi);
     ALOGD("markValue=%d", markValue);
     ALOGD("markMask=%d", markMask);
@@ -791,8 +791,8 @@
     XfrmSocketImpl sock;
     RETURN_IF_NOT_OK(sock.open());
 
-    RETURN_IF_NOT_OK(
-        fillXfrmId(localAddress, remoteAddress, spi, markValue, markMask, transformId, &saInfo));
+    RETURN_IF_NOT_OK(fillXfrmId(tmplSrcAddress, tmplDstAddress, spi, markValue, markMask,
+                                transformId, &saInfo));
 
     if (msgType == XFRM_MSG_DELPOLICY) {
         return deleteTunnelModeSecurityPolicy(saInfo, sock, static_cast<XfrmDirection>(direction));