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
diff --git a/server/NetdNativeService.h b/server/NetdNativeService.h
index a956149..2e77043 100644
--- a/server/NetdNativeService.h
+++ b/server/NetdNativeService.h
@@ -151,31 +151,20 @@
binder::Status ipSecRemoveTransportModeTransform(
const android::base::unique_fd& socket);
- binder::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);
+ binder::Status ipSecAddSecurityPolicy(int32_t transformId, int32_t direction,
+ const std::string& tmplSrcAddress,
+ const std::string& tmplDstAddress, int32_t spi,
+ int32_t markValue, int32_t markMask);
- binder::Status 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 ipSecUpdateSecurityPolicy(int32_t transformId, int32_t direction,
+ const std::string& tmplSrcAddress,
+ const std::string& tmplDstAddress, int32_t spi,
+ int32_t markValue, int32_t markMask);
- binder::Status ipSecDeleteSecurityPolicy(
- int32_t transformId,
- int32_t direction,
- const std::string& sourceAddress,
- const std::string& destinationAddress,
- int32_t markValue,
- int32_t markMask);
+ binder::Status ipSecDeleteSecurityPolicy(int32_t transformId, int32_t direction,
+ const std::string& tmplSrcAddress,
+ const std::string& tmplDstAddress, int32_t markValue,
+ int32_t markMask);
binder::Status trafficCheckBpfStatsEnable(bool* ret) override;