tequilaOS/platform_system_bpf
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bpfloader: add support for netd_shared and net_private subdirs

Browse source 
Bug: 218408035
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I613b84342fba7b425fb10af157fe0a6a731b71cb
(cherry picked from commit 7acf938127)
Merged-In: I613b84342fba7b425fb10af157fe0a6a731b71cb
This commit is contained in:
Maciej Żenczykowski 2022-05-12 08:47:05 +00:00 committed by Cherrypicker Worker
parent da4f92c3be
commit 4dfce18208
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bpfloader/BpfLoader.cpp
View file

@ -74,11 +74,21 @@ const Location locations[] = {
.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/",

4
libbpf_android/Loader.cpp
View file

@ -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"