commit 7acf938127d2b9e92d038e9c77977cc209003f61
author Maciej Żenczykowski <maze@google.com> Thu May 12 08:47:05 2022 +0000
committer Maciej Żenczykowski <maze@google.com> Thu May 12 08:47:55 2022 +0000
tree e03cf148be70f8fabbc36d24b5d5ff253384ed0f
parent 8849bb13b30f347ee770120e8dd35e514d77fd2b

bpfloader: add support for netd_shared and net_private subdirs

Bug: 218408035
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I613b84342fba7b425fb10af157fe0a6a731b71cb

bpfloader/BpfLoader.cpp

diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
index 8b49cec..739932d 100644
--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
@@ -74,11 +74,21 @@
                 .dir = "/apex/com.android.tethering/etc/bpf/",
                 .prefix = "tethering/",
         },
-        // Tethering mainline module: netd, clatd, ...etc
+        // Tethering mainline module (shared with netd & system server)
+        {
+                .dir = "/apex/com.android.tethering/etc/bpf/netd_shared/",
+                .prefix = "netd_shared/",
+        },
+        // Tethering mainline module (shared with system server)
         {
                 .dir = "/apex/com.android.tethering/etc/bpf/net_shared/",
                 .prefix = "net_shared/",
         },
+        // Tethering mainline module (not shared)
+        {
+                .dir = "/apex/com.android.tethering/etc/bpf/net_private/",
+                .prefix = "net_private/",
+        },
         // Core operating system
         {
                 .dir = "/system/etc/bpf/",

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index e181f71..b2f15cc 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -30,9 +30,9 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-// This is BpfLoader v0.12
+// This is BpfLoader v0.13
 #define BPFLOADER_VERSION_MAJOR 0u
-#define BPFLOADER_VERSION_MINOR 12u
+#define BPFLOADER_VERSION_MINOR 13u
 #define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
 
 #include "bpf/BpfUtils.h"