Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID

Browse Source 
This should no longer be needed after all the cleanups.

Test: atest NetworkStatsTest NetworkStatsFactoryTest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I289d935f84b616ed857ef4c5a7427d57c282d00c
This commit is contained in:
Maciej Żenczykowski
2020-05-28 01:33:52 -07:00
parent e6f6699ef9
commit 8de903184a
3 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/net/NetworkStats.java
View File

@@ -16,8 +16,6 @@
package android.net;
import static android.os.Process.CLAT_UID;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -1095,12 +1093,6 @@ public final class NetworkStats implements Parcelable {
entry.txBytes += entry.txPackets * IPV4V6_HEADER_DELTA;
stackedTraffic.setValues(i, entry);
}
// Theoretically there should be no traffic accounted to the clat daemon's uid:
// see ebpf program 'netd.c's early returns
// and iptables '-m owner --uid-owner clat -j RETURN' rules prior to accounting
// TODO: remove this - should definitely be safe once ebpf only.
baseTraffic.removeUids(new int[] {CLAT_UID});
}
/**

2
tests/net/res/raw/xt_qtaguid_with_clat
View File

@@ -41,5 +41,3 @@ idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packe
41 dummy0 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
42 lo 0x0 0 0 1288 16 1288 16 0 0 532 8 756 8 0 0 532 8 756 8
43 lo 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
44 wlan0 0x0 1029 0 0 0 312046 5113 0 0 0 0 0 0 306544 5046 3230 38 2272 29
45 wlan0 0x0 1029 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

1
tests/net/res/raw/xt_qtaguid_with_clat_simple
View File

@@ -2,4 +2,3 @@ idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packe
2 v4-wlan0 0x0 10060 0 42600 213 4100 41 42600 213 0 0 0 0 4100 41 0 0 0 0
3 v4-wlan0 0x0 10060 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4 wlan0 0x0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5 wlan0 0x0 1029 0 0 0 4920 41 0 0 0 0 0 0 4920 41 0 0 0 0