LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "remove spurious #include and OVERFLOW_COUNTERSET"

Browse Source
This commit is contained in:
Maciej Żenczykowski
2022-12-20 12:13:43 +00:00
committed by Gerrit Code Review
parent e504cc8754 6776e3b02b
commit cc40e9c110
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
staticlibs/native/bpf_headers/BpfRingbufTest.cpp
View File

@@ -22,6 +22,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include "BpfSyscallWrappers.h"
#include "bpf/BpfUtils.h" #include "bpf/BpfUtils.h"
namespace android { namespace android {

2
staticlibs/native/bpf_headers/include/bpf/BpfMap.h
View File

@@ -22,6 +22,8 @@
#include <android-base/stringprintf.h> #include <android-base/stringprintf.h>
#include <android-base/unique_fd.h> #include <android-base/unique_fd.h>
#include <utils/Log.h> #include <utils/Log.h>
#include "BpfSyscallWrappers.h"
#include "bpf/BpfUtils.h" #include "bpf/BpfUtils.h"
namespace android { namespace android {

9
staticlibs/native/bpf_headers/include/bpf/BpfUtils.h
View File

@@ -25,21 +25,12 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include <string>
#include <android-base/unique_fd.h> #include <android-base/unique_fd.h>
#include <log/log.h> #include <log/log.h>
#include "BpfSyscallWrappers.h"
// The buffer size for the buffer that records program loading logs, needs to be large enough for
// the largest kernel program.
namespace android { namespace android {
namespace bpf { namespace bpf {
constexpr const int OVERFLOW_COUNTERSET = 2;
constexpr const uint64_t NONEXISTENT_COOKIE = 0; constexpr const uint64_t NONEXISTENT_COOKIE = 0;
static inline uint64_t getSocketCookie(int sockFd) { static inline uint64_t getSocketCookie(int sockFd) {