diff options
| author | Patrick Rohr <prohr@google.com> | 2023-03-29 02:18:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-29 02:18:26 +0000 |
| commit | ddc96f1e49d1b4a9e7e9b6ce0b9479d67cb2b107 (patch) | |
| tree | 0d613fa7717b821b9dd3fafb71da29c5cbcfacc9 | |
| parent | bcc6ed4d1ed71bfa02be0abab0c15a7df74adef2 (diff) | |
| parent | a8e9cfa511aa830aa43d98b56cbad39b3b48a495 (diff) | |
| download | bpf-ddc96f1e49d1b4a9e7e9b6ce0b9479d67cb2b107.tar.gz | |
bpfloader: add support for connect4 / connect6 progs am: aa624f299b am: 3d15b5906e am: a8e9cfa511
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2512140
Change-Id: Ied917de8cbd3bd34cdef6adbceb14dc0e8b6a49d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libbpf_android/Loader.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp index 99c160a..b5474e9 100644 --- a/libbpf_android/Loader.cpp +++ b/libbpf_android/Loader.cpp @@ -30,13 +30,13 @@ #include <sys/wait.h> #include <unistd.h> -// This is BpfLoader v0.34 +// This is BpfLoader v0.35 // WARNING: If you ever hit cherrypick conflicts here you're doing it wrong: // You are NOT allowed to cherrypick bpfloader related patches out of order. // (indeed: cherrypicking is probably a bad idea and you should merge instead) // Mainline supports ONLY the published versions of the bpfloader for each Android release. #define BPFLOADER_VERSION_MAJOR 0u -#define BPFLOADER_VERSION_MINOR 34u +#define BPFLOADER_VERSION_MINOR 35u #define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR) #include "BpfSyscallWrappers.h" @@ -189,6 +189,8 @@ sectionType sectionNameTypes[] = { {"bind6/", BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_INET6_BIND}, {"cgroupskb/", BPF_PROG_TYPE_CGROUP_SKB, BPF_ATTACH_TYPE_UNSPEC}, {"cgroupsock/", BPF_PROG_TYPE_CGROUP_SOCK, BPF_ATTACH_TYPE_UNSPEC}, + {"connect4/", BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_INET4_CONNECT}, + {"connect6/", BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_INET6_CONNECT}, {"kprobe/", BPF_PROG_TYPE_KPROBE, BPF_ATTACH_TYPE_UNSPEC}, {"perf_event/", BPF_PROG_TYPE_PERF_EVENT, BPF_ATTACH_TYPE_UNSPEC}, {"schedact/", BPF_PROG_TYPE_SCHED_ACT, BPF_ATTACH_TYPE_UNSPEC}, |