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

Merge changes Ida29dcbb,Icc1f255a

Browse Source 
* changes:
  Remove unuseful program status dump in TrafficController
  Revert bpf map status dump in TrafficController
This commit is contained in:
Maciej Żenczykowski
2022-08-12 15:36:03 +00:00
committed by Gerrit Code Review
parent 7f15ce1d9c 1e4d24993e
commit c9b6d8766b
1 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
service/native/TrafficController.cpp
View File

@@ -572,17 +572,6 @@ void TrafficController::setPermissionForUids(int permission, const std::vector<u
}
}
std::string getProgramStatus(const char *path) {
int ret = access(path, R_OK);
if (ret == 0) {
return StringPrintf("OK");
}
if (ret != 0 && errno == ENOENT) {
return StringPrintf("program is missing at: %s", path);
}
return StringPrintf("check Program %s error: %s", path, strerror(errno));
}
std::string getMapStatus(const base::unique_fd& map_fd, const char* path) {
if (map_fd.get() < 0) {
return StringPrintf("map fd lost");
@@ -614,6 +603,10 @@ void TrafficController::dump(int fd, bool verbose) {
dw.blankline();
dw.println("mCookieTagMap status: %s",
getMapStatus(mCookieTagMap.getMap(), COOKIE_TAG_MAP_PATH).c_str());
dw.println("mUidCounterSetMap status: %s",
getMapStatus(mUidCounterSetMap.getMap(), UID_COUNTERSET_MAP_PATH).c_str());
dw.println("mAppUidStatsMap status: %s",
getMapStatus(mAppUidStatsMap.getMap(), APP_UID_STATS_MAP_PATH).c_str());
dw.println("mStatsMapA status: %s",
getMapStatus(mStatsMapA.getMap(), STATS_MAP_A_PATH).c_str());
dw.println("mStatsMapB status: %s",
@@ -627,19 +620,6 @@ void TrafficController::dump(int fd, bool verbose) {
dw.println("mUidOwnerMap status: %s",
getMapStatus(mUidOwnerMap.getMap(), UID_OWNER_MAP_PATH).c_str());
dw.blankline();
dw.println("Cgroup ingress program status: %s",
getProgramStatus(BPF_INGRESS_PROG_PATH).c_str());
dw.println("Cgroup egress program status: %s", getProgramStatus(BPF_EGRESS_PROG_PATH).c_str());
dw.println("xt_bpf ingress program status: %s",
getProgramStatus(XT_BPF_INGRESS_PROG_PATH).c_str());
dw.println("xt_bpf egress program status: %s",
getProgramStatus(XT_BPF_EGRESS_PROG_PATH).c_str());
dw.println("xt_bpf bandwidth allowlist program status: %s",
getProgramStatus(XT_BPF_ALLOWLIST_PROG_PATH).c_str());
dw.println("xt_bpf bandwidth denylist program status: %s",
getProgramStatus(XT_BPF_DENYLIST_PROG_PATH).c_str());
if (!verbose) {
return;
}