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

Remove unuseful program status dump in TrafficController

Browse Source 
netd makes sure netd can open all bpf programs at startup and exit if it
fails.
So, program status is always OK if netd starts successflly.

Bug: 241787285
Bug: 217624062
Test: atest TrafficControllerTest, dumpsys connectivityservice
trafficcontroller

Change-Id: Ida29dcbb2612e84f7030389050e2a3d2830c73ff
This commit is contained in:
Motomu Utsumi
2022-08-12 05:43:53 +00:00
parent f3e5a28485
commit 1e4d24993e
1 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
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) { std::string getMapStatus(const base::unique_fd& map_fd, const char* path) {
if (map_fd.get() < 0) { if (map_fd.get() < 0) {
return StringPrintf("map fd lost"); return StringPrintf("map fd lost");
@@ -631,19 +620,6 @@ void TrafficController::dump(int fd, bool verbose) {
dw.println("mUidOwnerMap status: %s", dw.println("mUidOwnerMap status: %s",
getMapStatus(mUidOwnerMap.getMap(), UID_OWNER_MAP_PATH).c_str()); 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) { if (!verbose) {
return; return;
} }