commit 73bb5b9fa64485d64ed790ae148ee7a217bf2570
author Maciej Żenczykowski <maze@google.com> Mon Jun 05 22:35:10 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 05 22:35:10 2023 +0000
tree b30670e7e389aeafd98847d21531d40ebe5d2b46
parent f1527de86f7921810bb70b530572bc3bfd6bb0c9
parent 9287d69620ef5b99fee5db8ce7e6d56a683807bf

Merge "Added additional logging to bpf handler" am: 9287d69620

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2612129

Change-Id: Ibd876532e862fb5025e2f70b5af64b763cee3263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

netd/BpfHandler.cpp

diff --git a/netd/BpfHandler.cpp b/netd/BpfHandler.cpp
index 6409374..3984249 100644
--- a/netd/BpfHandler.cpp
+++ b/netd/BpfHandler.cpp
@@ -19,6 +19,7 @@
 #include "BpfHandler.h"
 
 #include <linux/bpf.h>
+#include <inttypes.h>
 
 #include <android-base/unique_fd.h>
 #include <android-modules-utils/sdk_level.h>
@@ -246,6 +247,8 @@
               mCookieTagMap.getMap().get());
         return -res.error().code();
     }
+    ALOGD("Socket with cookie %" PRIu64 " tagged successfully with tag %" PRIu32 " uid %u "
+              "and real uid %u", sock_cookie, tag, chargeUid, realUid);
     return 0;
 }
 
@@ -259,6 +262,7 @@
         ALOGE("Failed to untag socket: %s", strerror(res.error().code()));
         return -res.error().code();
     }
+    ALOGD("Socket with cookie %" PRIu64 " untagged successfully.", sock_cookie);
     return 0;
 }