ClatdController - eBPF - redirect to v4-... interface
This makes the eBPF clat kernel data path nearly identical to the clatd
userspace path.
Test: built and booted on aosp/master aosp_blueline-eng and internal/qt-dev crosshatch-eng
atest clatd_test libbpf_android_test libnetdbpf_test netd_integration_test netd_unit_test netdutils_test resolv_integration_test resolv_unit_test
Bug: 65674744
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ic30d16896a77a27a23a1a9e28623039fd787d2d5
diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index 551b947..373d545 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -268,10 +268,8 @@
.local6 = tracker.v6,
};
ClatIngressValue value = {
- // Redirect the mangled packets to the same interface so we can see them in tcpdump.
- // TODO: move the tun interface creation to netd, and use that ifindex instead.
// TODO: move all the clat code to eBPF and remove the tun interface entirely.
- .oif = tracker.ifIndex,
+ .oif = tracker.v4ifIndex,
.local4 = tracker.v4,
};