diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2022-06-16 14:12:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-16 14:12:17 +0000 |
| commit | 2290035f5f1d3b2126d1be5c504bb827d696e0bb (patch) | |
| tree | e720d1aef2bf5055b8c80a17c605d4de5e028898 | |
| parent | 9915f97f124bd0399fbceca0ea776e070c1aabde (diff) | |
| parent | d017856865a3b331e429727bec569ad03fbb04d7 (diff) | |
| download | netd-2290035f5f1d3b2126d1be5c504bb827d696e0bb.tar.gz | |
Use CLAT_MARK from the netd AIDL interface. am: d017856865
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/netd/+/18922713
Change-Id: I8be805c343575fef7061f95daafb56e6bb972415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | server/BandwidthController.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/server/BandwidthController.cpp b/server/BandwidthController.cpp index b076c875..8dba75a5 100644 --- a/server/BandwidthController.cpp +++ b/server/BandwidthController.cpp @@ -55,6 +55,7 @@ #include "FirewallController.h" /* For makeCriticalCommands */ #include "Fwmark.h" #include "NetdConstants.h" +#include "android/net/INetd.h" #include "bpf/BpfUtils.h" /* Alphabetical */ @@ -66,9 +67,6 @@ const char BandwidthController::LOCAL_RAW_PREROUTING[] = "bw_raw_PREROUTING"; const char BandwidthController::LOCAL_MANGLE_POSTROUTING[] = "bw_mangle_POSTROUTING"; const char BandwidthController::LOCAL_GLOBAL_ALERT[] = "bw_global_alert"; -// Sync from packages/modules/Connectivity/bpf_progs/clatd.c -#define CLAT_MARK 0xdeadc1a7 - auto BandwidthController::iptablesRestoreFunction = execIptablesRestoreWithOutput; using android::base::Join; @@ -76,6 +74,7 @@ using android::base::StartsWith; using android::base::StringAppendF; using android::base::StringPrintf; using android::net::FirewallController; +using android::net::INetd::CLAT_MARK; using android::netdutils::StatusOr; using android::netdutils::UniqueFile; |