joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

NetBpfLoad: print 'ok' instead of 'no error'

Browse source 
Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia49fe3124e3110fd8d8cb88e827553db65729830
This commit is contained in:
Maciej Żenczykowski 2025-02-13 16:00:26 -08:00
commit 37ba939f17
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bpf/loader/NetBpfLoad.cpp
View file

@ -1006,7 +1006,7 @@ static int loadCodeSections(const char* elfPath, vector<codeSection>& cs, const
if (access(progPinLoc.c_str(), F_OK) == 0) {
fd.reset(retrieveProgram(progPinLoc.c_str()));
ALOGD("New bpf prog load reusing prog %s, ret: %d (%s)", progPinLoc.c_str(), fd.get(),
(!fd.ok() ? std::strerror(errno) : "no error"));
!fd.ok() ? std::strerror(errno) : "ok");
reuse = true;
} else {
static char log_buf[1 << 20]; // 1 MiB logging buffer
@ -1037,7 +1037,7 @@ static int loadCodeSections(const char* elfPath, vector<codeSection>& cs, const
ALOGD("BPF_PROG_LOAD call for %s (%s) returned '%s' fd: %d (%s)", elfPath,
cs[i].name.c_str(), log_oneline ? log_buf : "{multiline}",
fd.get(), (!fd.ok() ? std::strerror(errno) : "ok"));
fd.get(), !fd.ok() ? std::strerror(errno) : "ok");
if (!fd.ok()) {
// kernel NULL terminates log_buf, so this checks for non-empty string