joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Explicitly initialize Stats fields

Browse source 
This change adds InitStats for explictly zero-initializing rx/tx
bytes/packets, and -1-initializing rx/tx tcp packets.

Test: Build, existing unit tests.
Bug: 241098920
Change-Id: Ib9598dab924b48240461b31906a4b5698db255d8
This commit is contained in:
Kevin Jeon 2023-08-04 16:06:54 -04:00
commit b2455c626e
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp
View file

@ -40,8 +40,19 @@ namespace bpf {
using base::Result;
// This explicitly zero-initializes the relevant Stats fields.
void InitStats(Stats* stats) {
stats->rxBytes = 0;
stats->rxPackets = 0;
stats->txBytes = 0;
stats->txPackets = 0;
stats->tcpRxPackets = -1;
stats->tcpTxPackets = -1;
}
int bpfGetUidStatsInternal(uid_t uid, Stats* stats,
const BpfMap<uint32_t, StatsValue>& appUidStatsMap) {
InitStats(stats);
auto statsEntry = appUidStatsMap.readValue(uid);
if (statsEntry.ok()) {
stats->rxPackets = statsEntry.value().rxPackets;
@ -61,9 +72,8 @@ int bpfGetUidStats(uid_t uid, Stats* stats) {
int bpfGetIfaceStatsInternal(const char* iface, Stats* stats,
const BpfMap<uint32_t, StatsValue>& ifaceStatsMap,
const BpfMap<uint32_t, IfaceValue>& ifaceNameMap) {
InitStats(stats);
int64_t unknownIfaceBytesTotal = 0;
stats->tcpRxPackets = -1;
stats->tcpTxPackets = -1;
const auto processIfaceStats =
[iface, stats, &ifaceNameMap, &unknownIfaceBytesTotal](
const uint32_t& key,