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

Merge changes I289d935f,I0121a4ac

Browse Source 
* changes:
  NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID
  NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter.
This commit is contained in:
Treehugger Robot
2020-05-28 10:34:01 +00:00
committed by Gerrit Code Review
parent 9fb791c62d bcd2b09b35
commit 84af34369d
3 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/net/java/android/net/NetworkStatsTest.java
View File

@@ -926,21 +926,14 @@ public class NetworkStatsTest {
3 /* txPackets */, 3 /* txPackets */,
0 /* operations */); 0 /* operations */);
final NetworkStats statsXt = new NetworkStats(TEST_START, 3) final NetworkStats stats = new NetworkStats(TEST_START, 3)
.insertEntry(appEntry) .insertEntry(appEntry)
.insertEntry(rootUidEntry) .insertEntry(rootUidEntry)
.insertEntry(otherEntry); .insertEntry(otherEntry);
final NetworkStats statsEbpf = new NetworkStats(TEST_START, 3) stats.apply464xlatAdjustments(stackedIface);
.insertEntry(appEntry)
.insertEntry(rootUidEntry)
.insertEntry(otherEntry);
statsXt.apply464xlatAdjustments(stackedIface, false); assertEquals(3, stats.size());
statsEbpf.apply464xlatAdjustments(stackedIface, true);
assertEquals(3, statsXt.size());
assertEquals(3, statsEbpf.size());
final NetworkStats.Entry expectedAppUid = new NetworkStats.Entry( final NetworkStats.Entry expectedAppUid = new NetworkStats.Entry(
v4Iface, appUid, SET_DEFAULT, TAG_NONE, v4Iface, appUid, SET_DEFAULT, TAG_NONE,
30949510, 30949510,
@@ -955,12 +948,9 @@ public class NetworkStatsTest {
17607, 17607,
97, 97,
0); 0);
assertEquals(expectedAppUid, statsXt.getValues(0, null)); assertEquals(expectedAppUid, stats.getValues(0, null));
assertEquals(expectedRootUid, statsXt.getValues(1, null)); assertEquals(expectedRootUid, stats.getValues(1, null));
assertEquals(otherEntry, statsXt.getValues(2, null)); assertEquals(otherEntry, stats.getValues(2, null));
assertEquals(expectedAppUid, statsEbpf.getValues(0, null));
assertEquals(expectedRootUid, statsEbpf.getValues(1, null));
assertEquals(otherEntry, statsEbpf.getValues(2, null));
} }
@Test @Test
@@ -985,7 +975,7 @@ public class NetworkStatsTest {
.insertEntry(secondEntry); .insertEntry(secondEntry);
// Empty map: no adjustment // Empty map: no adjustment
stats.apply464xlatAdjustments(new ArrayMap<>(), false); stats.apply464xlatAdjustments(new ArrayMap<>());
assertEquals(2, stats.size()); assertEquals(2, stats.size());
assertEquals(firstEntry, stats.getValues(0, null)); assertEquals(firstEntry, stats.getValues(0, null));

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 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 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 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 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 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 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