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

Allow bpfloader to handle 'net_shared' subdirectory am: 6d69784cdc

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1952237

Change-Id: I789dc82f4ab623d864e5433797665ca4ac3158b7
This commit is contained in:
Ken Chen 2022-01-19 05:40:41 +00:00 committed by Automerger Merge Worker
commit c9c3c7c994
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bpfloader/BpfLoader.cpp
View file

@ -55,11 +55,16 @@ struct {
const char* const dir; const char* const dir;
const char* const prefix; const char* const prefix;
} locations[] = { } locations[] = {
// Tethering mainline module // Tethering mainline module: tether offload
{ {
.dir = "/apex/com.android.tethering/etc/bpf/", .dir = "/apex/com.android.tethering/etc/bpf/",
.prefix = "tethering/", .prefix = "tethering/",
}, },
// Tethering mainline module: netd, clatd, ...etc
{
.dir = "/apex/com.android.tethering/etc/bpf/net_shared/",
.prefix = "",
},
// Core operating system // Core operating system
{ {
.dir = "/system/etc/bpf/", .dir = "/system/etc/bpf/",

4
libbpf_android/Loader.cpp
View file

@ -28,9 +28,9 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#include <unistd.h> #include <unistd.h>
// This is BpfLoader v0.8 // This is BpfLoader v0.9
#define BPFLOADER_VERSION_MAJOR 0u #define BPFLOADER_VERSION_MAJOR 0u
#define BPFLOADER_VERSION_MINOR 8u #define BPFLOADER_VERSION_MINOR 9u
#define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR) #define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
#include "bpf/BpfUtils.h" #include "bpf/BpfUtils.h"