diff --git a/netd/BpfHandler.cpp b/netd/BpfHandler.cpp index d23927726eccc6a37d1dd3949e6a22e738f5b1a0..73feee41d14354447a1441a3695e773d166534a8 100644 --- a/netd/BpfHandler.cpp +++ b/netd/BpfHandler.cpp @@ -210,8 +210,8 @@ int BpfHandler::tagSocket(int sockFd, uint32_t tag, uid_t chargeUid, uid_t realU }; auto configuration = mConfigurationMap.readValue(CURRENT_STATS_MAP_CONFIGURATION_KEY); if (!configuration.ok()) { - ALOGE("Failed to get current configuration: %s, fd: %d", - strerror(configuration.error().code()), mConfigurationMap.getMap().get()); + ALOGE("Failed to get current configuration: %s", + strerror(configuration.error().code())); return -configuration.error().code(); } if (configuration.value() != SELECT_MAP_A && configuration.value() != SELECT_MAP_B) { @@ -224,7 +224,7 @@ int BpfHandler::tagSocket(int sockFd, uint32_t tag, uid_t chargeUid, uid_t realU // HACK: mStatsMapB becomes RW BpfMap here, but countUidStatsEntries doesn't modify so it works base::Result<void> res = currentMap.iterate(countUidStatsEntries); if (!res.ok()) { - ALOGE("Failed to count the stats entry in map %d: %s", currentMap.getMap().get(), + ALOGE("Failed to count the stats entry in map: %s", strerror(res.error().code())); return -res.error().code(); } @@ -243,8 +243,7 @@ int BpfHandler::tagSocket(int sockFd, uint32_t tag, uid_t chargeUid, uid_t realU // should be fine to concurrently update the map while eBPF program is running. res = mCookieTagMap.writeValue(sock_cookie, newKey, BPF_ANY); if (!res.ok()) { - ALOGE("Failed to tag the socket: %s, fd: %d", strerror(res.error().code()), - mCookieTagMap.getMap().get()); + ALOGE("Failed to tag the socket: %s", strerror(res.error().code())); return -res.error().code(); } ALOGD("Socket with cookie %" PRIu64 " tagged successfully with tag %" PRIu32 " uid %u "