Bring back traffic indicators for legacy devices
Revert: "remove qtaguid parsing"
(commit 0b99c46bcde8e607d9233c474035da95ab68a6fe.)
and re-enable legacy qtguid parsing.
This fixes traffic indicator on BPF-less kernel.
Change-Id: I65c626c1c5832d81805c45c53b021236fe09030b
Signed-off-by: koron393 <koron393@gmail.com>
Signed-off-by: Dmitrii <bankersenator@gmail.com>
Signed-off-by: Jis G Jacob <studiokeys@blissroms.org>
diff --git a/service-t/jni/com_android_server_net_NetworkStatsService.cpp b/service-t/jni/com_android_server_net_NetworkStatsService.cpp
index bdbb655..2d8d673 100644
--- a/service-t/jni/com_android_server_net_NetworkStatsService.cpp
+++ b/service-t/jni/com_android_server_net_NetworkStatsService.cpp
@@ -39,6 +39,9 @@
namespace android {
+static const char* QTAGUID_IFACE_STATS = "/proc/net/xt_qtaguid/iface_stat_fmt";
+static const char* QTAGUID_UID_STATS = "/proc/net/xt_qtaguid/stats";
+
// NOTE: keep these in sync with TrafficStats.java
static const uint64_t UNKNOWN = -1;
@@ -64,13 +67,80 @@
}
}
+static int parseIfaceStats(const char* iface, StatsValue* stats) {
+ FILE *fp = fopen(QTAGUID_IFACE_STATS, "r");
+ if (fp == NULL) {
+ return -1;
+ }
+
+ char buffer[384];
+ char cur_iface[32];
+ uint64_t rxBytes, rxPackets, txBytes, txPackets, tcpRxPackets, tcpTxPackets;
+
+ while (fgets(buffer, sizeof(buffer), fp) != NULL) {
+ int matched = sscanf(buffer, "%31s %" SCNu64 " %" SCNu64 " %" SCNu64
+ " %" SCNu64 " " "%*u %" SCNu64 " %*u %*u %*u %*u "
+ "%*u %" SCNu64 " %*u %*u %*u %*u", cur_iface, &rxBytes,
+ &rxPackets, &txBytes, &txPackets, &tcpRxPackets, &tcpTxPackets);
+ if (matched >= 5) {
+ if (!iface || !strcmp(iface, cur_iface)) {
+ stats->rxBytes += rxBytes;
+ stats->rxPackets += rxPackets;
+ stats->txBytes += txBytes;
+ stats->txPackets += txPackets;
+ }
+ }
+ }
+
+ if (fclose(fp) != 0) {
+ return -1;
+ }
+ return 0;
+}
+
+static int parseUidStats(const uint32_t uid, StatsValue* stats) {
+ FILE *fp = fopen(QTAGUID_UID_STATS, "r");
+ if (fp == NULL) {
+ return -1;
+ }
+
+ char buffer[384];
+ char iface[32];
+ uint32_t idx, cur_uid, set;
+ uint64_t tag, rxBytes, rxPackets, txBytes, txPackets;
+
+ while (fgets(buffer, sizeof(buffer), fp) != NULL) {
+ if (sscanf(buffer,
+ "%" SCNu32 " %31s 0x%" SCNx64 " %u %u %" SCNu64 " %" SCNu64
+ " %" SCNu64 " %" SCNu64 "",
+ &idx, iface, &tag, &cur_uid, &set, &rxBytes, &rxPackets,
+ &txBytes, &txPackets) == 9) {
+ if (uid == cur_uid && tag == 0L) {
+ stats->rxBytes += rxBytes;
+ stats->rxPackets += rxPackets;
+ stats->txBytes += txBytes;
+ stats->txPackets += txPackets;
+ }
+ }
+ }
+
+ if (fclose(fp) != 0) {
+ return -1;
+ }
+ return 0;
+}
+
static jlong nativeGetTotalStat(JNIEnv* env, jclass clazz, jint type) {
StatsValue stats = {};
if (bpfGetIfaceStats(NULL, &stats) == 0) {
return getStatsType(&stats, (StatsType) type);
} else {
- return UNKNOWN;
+ if (parseIfaceStats(NULL, &stats) == 0) {
+ return getStatsType(&stats, (StatsType) type);
+ } else {
+ return UNKNOWN;
+ }
}
}
@@ -85,7 +155,11 @@
if (bpfGetIfaceStats(iface8.c_str(), &stats) == 0) {
return getStatsType(&stats, (StatsType) type);
} else {
- return UNKNOWN;
+ if (parseIfaceStats(iface8.c_str(), &stats) == 0) {
+ return getStatsType(&stats, (StatsType) type);
+ } else {
+ return UNKNOWN;
+ }
}
}
@@ -104,7 +178,11 @@
if (bpfGetUidStats(uid, &stats) == 0) {
return getStatsType(&stats, (StatsType) type);
} else {
- return UNKNOWN;
+ if (parseUidStats(uid, &stats) == 0) {
+ return getStatsType(&stats, (StatsType) type);
+ } else {
+ return UNKNOWN;
+ }
}
}