NetworkStatsFactory: Take VPNs into account for network/battery stats
This change fixes detailed UID stats to ensure network and battery stats both take VPNs into account. NetworkStatsFactory is being made aware of VPNs enabled, and the full set of underlying networks present. Since traffic can only be migrated over a NetworkStats delta, NSF maintains a NetworkStats snapshot across all UIDs/ifaces/tags. This snapshot gets updated whenever NSF records a new snapshot (based on various hooks such as VPN updating its underlying networks, network getting lost, etc.), or NetworkStatsService's getDetailedUidStats() method being called. This change widens the scope of the existing mPersistentSnapshot lock, renaming it to mPersistentDataLock, and ensures that TUN migrations are not done in parallel. Additionally, mVpnInfos is updated via pointer-swapping, to reduce the scope of the mPersistentDataLock. The safety of this change is predicated on: 1. NetworkStatsFactory lock not held, so services cannot deadlock through the cyclical lock. 2. The broadening of the scope of the lock in NetworkStatsFactory has no threading implications, as it is always the last (leaf node) lock held, and therefore is impossible to have lock inversion. Additionally, to ensure VPNs work with 464xlat, the VPN info passed to the NetworkStatsFactory includes all underlying interfaces, instead of only passing the first one. This (partially) re-applies changes from: aosp/972848: Add one more test for VPN usage stats. aosp/972847: Addressing comments for http://ag/7700679. aosp/885338: NetworkStatsService: Fix getDetailedUidStats to take VPNs into account. Co-developed with: Varun Anand <vaanand@google.com> Bug: 113122541 Bug: 120145746 Bug: 129264869 Bug: 134244752 Test: FrameworksNetTest passing Test: Manual tests show data usage fixes maintained. Change-Id: I6466ec1411fc5ed6954125d27d353b6cd1be719e
This commit is contained in:
Benedict Wong
@@ -192,6 +192,7 @@ import com.android.server.connectivity.Tethering;
|
||||
import com.android.server.connectivity.Vpn;
|
||||
import com.android.server.net.NetworkPinner;
|
||||
import com.android.server.net.NetworkPolicyManagerInternal;
|
||||
import com.android.server.net.NetworkStatsFactory;
|
||||
import com.android.testutils.HandlerUtilsKt;
|
||||
|
||||
import org.junit.After;
|
||||
@@ -4901,9 +4902,9 @@ public class ConnectivityServiceTest {
|
||||
verify(mStatsService, atLeastOnce())
|
||||
.forceUpdateIfaces(
|
||||
eq(onlyCell),
|
||||
eq(new VpnInfo[0]),
|
||||
any(NetworkState[].class),
|
||||
eq(MOBILE_IFNAME));
|
||||
assertEquals(new VpnInfo[0], NetworkStatsFactory.getVpnInfos());
|
||||
reset(mStatsService);
|
||||
|
||||
// Default network switch should update ifaces.
|
||||
@@ -4914,9 +4915,9 @@ public class ConnectivityServiceTest {
|
||||
verify(mStatsService, atLeastOnce())
|
||||
.forceUpdateIfaces(
|
||||
eq(onlyWifi),
|
||||
eq(new VpnInfo[0]),
|
||||
any(NetworkState[].class),
|
||||
eq(WIFI_IFNAME));
|
||||
assertEquals(new VpnInfo[0], NetworkStatsFactory.getVpnInfos());
|
||||
reset(mStatsService);
|
||||
|
||||
// Disconnect should update ifaces.
|
||||
@@ -4925,9 +4926,9 @@ public class ConnectivityServiceTest {
|
||||
verify(mStatsService, atLeastOnce())
|
||||
.forceUpdateIfaces(
|
||||
eq(onlyCell),
|
||||
eq(new VpnInfo[0]),
|
||||
any(NetworkState[].class),
|
||||
eq(MOBILE_IFNAME));
|
||||
assertEquals(new VpnInfo[0], NetworkStatsFactory.getVpnInfos());
|
||||
reset(mStatsService);
|
||||
|
||||
// Metered change should update ifaces
|
||||
@@ -4936,9 +4937,9 @@ public class ConnectivityServiceTest {
|
||||
verify(mStatsService, atLeastOnce())
|
||||
.forceUpdateIfaces(
|
||||
eq(onlyCell),
|
||||
eq(new VpnInfo[0]),
|
||||
any(NetworkState[].class),
|
||||
eq(MOBILE_IFNAME));
|
||||
assertEquals(new VpnInfo[0], NetworkStatsFactory.getVpnInfos());
|
||||
reset(mStatsService);
|
||||
|
||||
mCellNetworkAgent.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);
|
||||
@@ -4946,9 +4947,9 @@ public class ConnectivityServiceTest {
|
||||
verify(mStatsService, atLeastOnce())
|
||||
.forceUpdateIfaces(
|
||||
eq(onlyCell),
|
||||
eq(new VpnInfo[0]),
|
||||
any(NetworkState[].class),
|
||||
eq(MOBILE_IFNAME));
|
||||
assertEquals(new VpnInfo[0], NetworkStatsFactory.getVpnInfos());
|
||||
reset(mStatsService);
|
||||
|
||||
// Captive portal change shouldn't update ifaces
|
||||
@@ -4957,9 +4958,9 @@ public class ConnectivityServiceTest {
|
||||
verify(mStatsService, never())
|
||||
.forceUpdateIfaces(
|
||||
eq(onlyCell),
|
||||
eq(new VpnInfo[0]),
|
||||
any(NetworkState[].class),
|
||||
eq(MOBILE_IFNAME));
|
||||
assertEquals(new VpnInfo[0], NetworkStatsFactory.getVpnInfos());
|
||||
reset(mStatsService);
|
||||
|
||||
// Roaming change should update ifaces
|
||||
@@ -4968,9 +4969,9 @@ public class ConnectivityServiceTest {
|
||||
verify(mStatsService, atLeastOnce())
|
||||
.forceUpdateIfaces(
|
||||
eq(onlyCell),
|
||||
eq(new VpnInfo[0]),
|
||||
any(NetworkState[].class),
|
||||
eq(MOBILE_IFNAME));
|
||||
assertEquals(new VpnInfo[0], NetworkStatsFactory.getVpnInfos());
|
||||
reset(mStatsService);
|
||||
}
|
||||
|
||||
|
||||
117
tests/net/java/com/android/server/net/NetworkStatsBaseTest.java
Normal file
117
tests/net/java/com/android/server/net/NetworkStatsBaseTest.java
Normal file
@@ -0,0 +1,117 @@
|
||||
/*
|
||||
* Copyright (C) 2011 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.server.net;
|
||||
|
||||
import static android.net.NetworkStats.DEFAULT_NETWORK_ALL;
|
||||
import static android.net.NetworkStats.DEFAULT_NETWORK_NO;
|
||||
import static android.net.NetworkStats.DEFAULT_NETWORK_YES;
|
||||
import static android.net.NetworkStats.METERED_ALL;
|
||||
import static android.net.NetworkStats.METERED_NO;
|
||||
import static android.net.NetworkStats.METERED_YES;
|
||||
import static android.net.NetworkStats.ROAMING_ALL;
|
||||
import static android.net.NetworkStats.ROAMING_NO;
|
||||
import static android.net.NetworkStats.ROAMING_YES;
|
||||
import static android.net.NetworkStats.SET_ALL;
|
||||
import static android.net.NetworkStats.SET_DEFAULT;
|
||||
import static android.net.NetworkStats.SET_FOREGROUND;
|
||||
import static android.net.NetworkStats.TAG_NONE;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import android.net.NetworkStats;
|
||||
|
||||
import com.android.internal.net.VpnInfo;
|
||||
|
||||
/** Superclass with utilities for NetworkStats(Service|Factory)Test */
|
||||
abstract class NetworkStatsBaseTest {
|
||||
static final String TEST_IFACE = "test0";
|
||||
static final String TEST_IFACE2 = "test1";
|
||||
static final String TUN_IFACE = "test_nss_tun0";
|
||||
|
||||
static final int UID_RED = 1001;
|
||||
static final int UID_BLUE = 1002;
|
||||
static final int UID_GREEN = 1003;
|
||||
static final int UID_VPN = 1004;
|
||||
|
||||
void assertValues(NetworkStats stats, String iface, int uid, long rxBytes,
|
||||
long rxPackets, long txBytes, long txPackets) {
|
||||
assertValues(
|
||||
stats, iface, uid, SET_ALL, TAG_NONE, METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL,
|
||||
rxBytes, rxPackets, txBytes, txPackets, 0);
|
||||
}
|
||||
|
||||
void assertValues(NetworkStats stats, String iface, int uid, int set, int tag,
|
||||
int metered, int roaming, int defaultNetwork, long rxBytes, long rxPackets,
|
||||
long txBytes, long txPackets, long operations) {
|
||||
final NetworkStats.Entry entry = new NetworkStats.Entry();
|
||||
final int[] sets;
|
||||
if (set == SET_ALL) {
|
||||
sets = new int[] {SET_ALL, SET_DEFAULT, SET_FOREGROUND};
|
||||
} else {
|
||||
sets = new int[] {set};
|
||||
}
|
||||
|
||||
final int[] roamings;
|
||||
if (roaming == ROAMING_ALL) {
|
||||
roamings = new int[] {ROAMING_ALL, ROAMING_YES, ROAMING_NO};
|
||||
} else {
|
||||
roamings = new int[] {roaming};
|
||||
}
|
||||
|
||||
final int[] meterings;
|
||||
if (metered == METERED_ALL) {
|
||||
meterings = new int[] {METERED_ALL, METERED_YES, METERED_NO};
|
||||
} else {
|
||||
meterings = new int[] {metered};
|
||||
}
|
||||
|
||||
final int[] defaultNetworks;
|
||||
if (defaultNetwork == DEFAULT_NETWORK_ALL) {
|
||||
defaultNetworks =
|
||||
new int[] {DEFAULT_NETWORK_ALL, DEFAULT_NETWORK_YES, DEFAULT_NETWORK_NO};
|
||||
} else {
|
||||
defaultNetworks = new int[] {defaultNetwork};
|
||||
}
|
||||
|
||||
for (int s : sets) {
|
||||
for (int r : roamings) {
|
||||
for (int m : meterings) {
|
||||
for (int d : defaultNetworks) {
|
||||
final int i = stats.findIndex(iface, uid, s, tag, m, r, d);
|
||||
if (i != -1) {
|
||||
entry.add(stats.getValues(i, null));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
assertEquals("unexpected rxBytes", rxBytes, entry.rxBytes);
|
||||
assertEquals("unexpected rxPackets", rxPackets, entry.rxPackets);
|
||||
assertEquals("unexpected txBytes", txBytes, entry.txBytes);
|
||||
assertEquals("unexpected txPackets", txPackets, entry.txPackets);
|
||||
assertEquals("unexpected operations", operations, entry.operations);
|
||||
}
|
||||
|
||||
VpnInfo createVpnInfo(String[] underlyingIfaces) {
|
||||
VpnInfo info = new VpnInfo();
|
||||
info.ownerUid = UID_VPN;
|
||||
info.vpnIface = TUN_IFACE;
|
||||
info.underlyingIfaces = underlyingIfaces;
|
||||
return info;
|
||||
}
|
||||
}
|
||||
@@ -16,8 +16,11 @@
|
||||
|
||||
package com.android.server.net;
|
||||
|
||||
import static android.net.NetworkStats.DEFAULT_NETWORK_ALL;
|
||||
import static android.net.NetworkStats.DEFAULT_NETWORK_NO;
|
||||
import static android.net.NetworkStats.METERED_ALL;
|
||||
import static android.net.NetworkStats.METERED_NO;
|
||||
import static android.net.NetworkStats.ROAMING_ALL;
|
||||
import static android.net.NetworkStats.ROAMING_NO;
|
||||
import static android.net.NetworkStats.SET_ALL;
|
||||
import static android.net.NetworkStats.SET_DEFAULT;
|
||||
@@ -39,6 +42,7 @@ import androidx.test.filters.SmallTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import com.android.frameworks.tests.net.R;
|
||||
import com.android.internal.net.VpnInfo;
|
||||
|
||||
import libcore.io.IoUtils;
|
||||
import libcore.io.Streams;
|
||||
@@ -54,12 +58,12 @@ import java.io.FileWriter;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
|
||||
/**
|
||||
* Tests for {@link NetworkStatsFactory}.
|
||||
*/
|
||||
/** Tests for {@link NetworkStatsFactory}. */
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
@SmallTest
|
||||
public class NetworkStatsFactoryTest {
|
||||
public class NetworkStatsFactoryTest extends NetworkStatsBaseTest {
|
||||
private static final String CLAT_PREFIX = "v4-";
|
||||
|
||||
private File mTestProc;
|
||||
private NetworkStatsFactory mFactory;
|
||||
|
||||
@@ -75,6 +79,8 @@ public class NetworkStatsFactoryTest {
|
||||
// related to networkStatsFactory is compiled to a minimal native library and loaded here.
|
||||
System.loadLibrary("networkstatsfactorytestjni");
|
||||
mFactory = new NetworkStatsFactory(mTestProc, false);
|
||||
NetworkStatsFactory.updateVpnInfos(new VpnInfo[0]);
|
||||
NetworkStatsFactory.clearStackedIfaces();
|
||||
}
|
||||
|
||||
@After
|
||||
@@ -98,6 +104,236 @@ public class NetworkStatsFactoryTest {
|
||||
assertStatsEntry(stats, "rmnet2", 10001, SET_DEFAULT, 0x0, 1125899906842624L, 984L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void vpnRewriteTrafficThroughItself() throws Exception {
|
||||
VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
|
||||
NetworkStatsFactory.updateVpnInfos(vpnInfos);
|
||||
|
||||
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
|
||||
// overhead per packet):
|
||||
//
|
||||
// 1000 bytes (100 packets) were sent, and 2000 bytes (200 packets) were received by UID_RED
|
||||
// over VPN.
|
||||
// 500 bytes (50 packets) were sent, and 1000 bytes (100 packets) were received by UID_BLUE
|
||||
// over VPN.
|
||||
//
|
||||
// VPN UID rewrites packets read from TUN back to TUN, plus some of its own traffic
|
||||
|
||||
final NetworkStats tunStats = parseDetailedStats(R.raw.xt_qtaguid_vpn_rewrite_through_self);
|
||||
|
||||
assertValues(tunStats, TUN_IFACE, UID_RED, SET_ALL, TAG_NONE, METERED_ALL, ROAMING_ALL,
|
||||
DEFAULT_NETWORK_ALL, 2000L, 200L, 1000L, 100L, 0);
|
||||
assertValues(tunStats, TUN_IFACE, UID_BLUE, SET_ALL, TAG_NONE, METERED_ALL, ROAMING_ALL,
|
||||
DEFAULT_NETWORK_ALL, 1000L, 100L, 500L, 50L, 0);
|
||||
assertValues(tunStats, TUN_IFACE, UID_VPN, SET_ALL, TAG_NONE, METERED_ALL, ROAMING_ALL,
|
||||
DEFAULT_NETWORK_ALL, 0L, 0L, 1600L, 160L, 0);
|
||||
|
||||
assertValues(tunStats, TEST_IFACE, UID_RED, 2000L, 200L, 1000L, 100L);
|
||||
assertValues(tunStats, TEST_IFACE, UID_BLUE, 1000L, 100L, 500L, 50L);
|
||||
assertValues(tunStats, TEST_IFACE, UID_VPN, 300L, 0L, 260L, 26L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void vpnWithClat() throws Exception {
|
||||
VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {CLAT_PREFIX + TEST_IFACE})};
|
||||
NetworkStatsFactory.updateVpnInfos(vpnInfos);
|
||||
NetworkStatsFactory.noteStackedIface(CLAT_PREFIX + TEST_IFACE, TEST_IFACE);
|
||||
|
||||
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
|
||||
// overhead per packet):
|
||||
// 1000 bytes (100 packets) were sent, and 2000 bytes (200 packets) were received by UID_RED
|
||||
// over VPN.
|
||||
// 500 bytes (50 packets) were sent, and 1000 bytes (100 packets) were received by UID_BLUE
|
||||
// over VPN.
|
||||
// VPN sent 1650 bytes (150 packets), and received 3300 (300 packets) over v4-WiFi, and clat
|
||||
// added 20 bytes per packet of extra overhead
|
||||
//
|
||||
// For 1650 bytes sent over v4-WiFi, 4650 bytes were actually sent over WiFi, which is
|
||||
// expected to be split as follows:
|
||||
// UID_RED: 1000 bytes, 100 packets
|
||||
// UID_BLUE: 500 bytes, 50 packets
|
||||
// UID_VPN: 3150 bytes, 0 packets
|
||||
//
|
||||
// For 3300 bytes received over v4-WiFi, 9300 bytes were actually sent over WiFi, which is
|
||||
// expected to be split as follows:
|
||||
// UID_RED: 2000 bytes, 200 packets
|
||||
// UID_BLUE: 1000 bytes, 100 packets
|
||||
// UID_VPN: 6300 bytes, 0 packets
|
||||
final NetworkStats tunStats = parseDetailedStats(R.raw.xt_qtaguid_vpn_with_clat);
|
||||
|
||||
assertValues(tunStats, CLAT_PREFIX + TEST_IFACE, UID_RED, 2000L, 200L, 1000, 100L);
|
||||
assertValues(tunStats, CLAT_PREFIX + TEST_IFACE, UID_BLUE, 1000L, 100L, 500L, 50L);
|
||||
assertValues(tunStats, CLAT_PREFIX + TEST_IFACE, UID_VPN, 6300L, 0L, 3150L, 0L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void vpnWithOneUnderlyingIface() throws Exception {
|
||||
VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
|
||||
NetworkStatsFactory.updateVpnInfos(vpnInfos);
|
||||
|
||||
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
|
||||
// overhead per packet):
|
||||
// 1000 bytes (100 packets) were sent, and 2000 bytes (200 packets) were received by UID_RED
|
||||
// over VPN.
|
||||
// 500 bytes (50 packets) were sent, and 1000 bytes (100 packets) were received by UID_BLUE
|
||||
// over VPN.
|
||||
// VPN sent 1650 bytes (150 packets), and received 3300 (300 packets) over WiFi.
|
||||
// Of 1650 bytes sent over WiFi, expect 1000 bytes attributed to UID_RED, 500 bytes
|
||||
// attributed to UID_BLUE, and 150 bytes attributed to UID_VPN.
|
||||
// Of 3300 bytes received over WiFi, expect 2000 bytes attributed to UID_RED, 1000 bytes
|
||||
// attributed to UID_BLUE, and 300 bytes attributed to UID_VPN.
|
||||
final NetworkStats tunStats = parseDetailedStats(R.raw.xt_qtaguid_vpn_one_underlying);
|
||||
|
||||
assertValues(tunStats, TEST_IFACE, UID_RED, 2000L, 200L, 1000L, 100L);
|
||||
assertValues(tunStats, TEST_IFACE, UID_BLUE, 1000L, 100L, 500L, 50L);
|
||||
assertValues(tunStats, TEST_IFACE, UID_VPN, 300L, 0L, 150L, 0L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void vpnWithOneUnderlyingIfaceAndOwnTraffic() throws Exception {
|
||||
// WiFi network is connected and VPN is using WiFi (which has TEST_IFACE).
|
||||
VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
|
||||
NetworkStatsFactory.updateVpnInfos(vpnInfos);
|
||||
|
||||
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
|
||||
// overhead per packet):
|
||||
// 1000 bytes (100 packets) were sent, and 2000 bytes (200 packets) were received by UID_RED
|
||||
// over VPN.
|
||||
// 500 bytes (50 packets) were sent, and 1000 bytes (100 packets) were received by UID_BLUE
|
||||
// over VPN.
|
||||
// Additionally, the VPN sends 6000 bytes (600 packets) of its own traffic into the tun
|
||||
// interface (passing that traffic to the VPN endpoint), and receives 5000 bytes (500
|
||||
// packets) from it. Including overhead that is 6600/5500 bytes.
|
||||
// VPN sent 8250 bytes (750 packets), and received 8800 (800 packets) over WiFi.
|
||||
// Of 8250 bytes sent over WiFi, expect 1000 bytes attributed to UID_RED, 500 bytes
|
||||
// attributed to UID_BLUE, and 6750 bytes attributed to UID_VPN.
|
||||
// Of 8800 bytes received over WiFi, expect 2000 bytes attributed to UID_RED, 1000 bytes
|
||||
// attributed to UID_BLUE, and 5800 bytes attributed to UID_VPN.
|
||||
final NetworkStats tunStats =
|
||||
parseDetailedStats(R.raw.xt_qtaguid_vpn_one_underlying_own_traffic);
|
||||
|
||||
assertValues(tunStats, TEST_IFACE, UID_RED, 2000L, 200L, 1000L, 100L);
|
||||
assertValues(tunStats, TEST_IFACE, UID_BLUE, 1000L, 100L, 500L, 50L);
|
||||
assertValues(tunStats, TEST_IFACE, UID_VPN, 5800L, 500L, 6750L, 600L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void vpnWithOneUnderlyingIface_withCompression() throws Exception {
|
||||
// WiFi network is connected and VPN is using WiFi (which has TEST_IFACE).
|
||||
VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
|
||||
NetworkStatsFactory.updateVpnInfos(vpnInfos);
|
||||
|
||||
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
|
||||
// overhead per packet):
|
||||
// 1000 bytes (100 packets) were sent/received by UID_RED over VPN.
|
||||
// 3000 bytes (300 packets) were sent/received by UID_BLUE over VPN.
|
||||
// VPN sent/received 1000 bytes (100 packets) over WiFi.
|
||||
// Of 1000 bytes over WiFi, expect 250 bytes attributed UID_RED and 750 bytes to UID_BLUE,
|
||||
// with nothing attributed to UID_VPN for both rx/tx traffic.
|
||||
final NetworkStats tunStats =
|
||||
parseDetailedStats(R.raw.xt_qtaguid_vpn_one_underlying_compression);
|
||||
|
||||
assertValues(tunStats, TEST_IFACE, UID_RED, 250L, 25L, 250L, 25L);
|
||||
assertValues(tunStats, TEST_IFACE, UID_BLUE, 750L, 75L, 750L, 75L);
|
||||
assertValues(tunStats, TEST_IFACE, UID_VPN, 0L, 0L, 0L, 0L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void vpnWithTwoUnderlyingIfaces_packetDuplication() throws Exception {
|
||||
// WiFi and Cell networks are connected and VPN is using WiFi (which has TEST_IFACE) and
|
||||
// Cell (which has TEST_IFACE2) and has declared both of them in its underlying network set.
|
||||
// Additionally, VPN is duplicating traffic across both WiFi and Cell.
|
||||
VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE, TEST_IFACE2})};
|
||||
NetworkStatsFactory.updateVpnInfos(vpnInfos);
|
||||
|
||||
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
|
||||
// overhead per packet):
|
||||
// 1000 bytes (100 packets) were sent/received by UID_RED and UID_BLUE over VPN.
|
||||
// VPN sent/received 4400 bytes (400 packets) over both WiFi and Cell (8800 bytes in total).
|
||||
// Of 8800 bytes over WiFi/Cell, expect:
|
||||
// - 500 bytes rx/tx each over WiFi/Cell attributed to both UID_RED and UID_BLUE.
|
||||
// - 1200 bytes rx/tx each over WiFi/Cell for VPN_UID.
|
||||
final NetworkStats tunStats =
|
||||
parseDetailedStats(R.raw.xt_qtaguid_vpn_two_underlying_duplication);
|
||||
|
||||
assertValues(tunStats, TEST_IFACE, UID_RED, 500L, 50L, 500L, 50L);
|
||||
assertValues(tunStats, TEST_IFACE, UID_BLUE, 500L, 50L, 500L, 50L);
|
||||
assertValues(tunStats, TEST_IFACE, UID_VPN, 1200L, 100L, 1200L, 100L);
|
||||
assertValues(tunStats, TEST_IFACE2, UID_RED, 500L, 50L, 500L, 50L);
|
||||
assertValues(tunStats, TEST_IFACE2, UID_BLUE, 500L, 50L, 500L, 50L);
|
||||
assertValues(tunStats, TEST_IFACE2, UID_VPN, 1200L, 100L, 1200L, 100L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void vpnWithTwoUnderlyingIfaces_splitTraffic() throws Exception {
|
||||
// WiFi and Cell networks are connected and VPN is using WiFi (which has TEST_IFACE) and
|
||||
// Cell (which has TEST_IFACE2) and has declared both of them in its underlying network set.
|
||||
// Additionally, VPN is arbitrarily splitting traffic across WiFi and Cell.
|
||||
VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE, TEST_IFACE2})};
|
||||
NetworkStatsFactory.updateVpnInfos(vpnInfos);
|
||||
|
||||
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
|
||||
// overhead per packet):
|
||||
// 1000 bytes (100 packets) were sent, and 500 bytes (50 packets) received by UID_RED over
|
||||
// VPN.
|
||||
// VPN sent 660 bytes (60 packets) over WiFi and 440 bytes (40 packets) over Cell.
|
||||
// And, it received 330 bytes (30 packets) over WiFi and 220 bytes (20 packets) over Cell.
|
||||
// For UID_RED, expect 600 bytes attributed over WiFi and 400 bytes over Cell for sent (tx)
|
||||
// traffic. For received (rx) traffic, expect 300 bytes over WiFi and 200 bytes over Cell.
|
||||
//
|
||||
// For UID_VPN, expect 60 bytes attributed over WiFi and 40 bytes over Cell for tx traffic.
|
||||
// And, 30 bytes over WiFi and 20 bytes over Cell for rx traffic.
|
||||
final NetworkStats tunStats = parseDetailedStats(R.raw.xt_qtaguid_vpn_two_underlying_split);
|
||||
|
||||
assertValues(tunStats, TEST_IFACE, UID_RED, 300L, 30L, 600L, 60L);
|
||||
assertValues(tunStats, TEST_IFACE, UID_VPN, 30L, 0L, 60L, 0L);
|
||||
assertValues(tunStats, TEST_IFACE2, UID_RED, 200L, 20L, 400L, 40L);
|
||||
assertValues(tunStats, TEST_IFACE2, UID_VPN, 20L, 0L, 40L, 0L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void vpnWithTwoUnderlyingIfaces_splitTrafficWithCompression() throws Exception {
|
||||
// WiFi and Cell networks are connected and VPN is using WiFi (which has TEST_IFACE) and
|
||||
// Cell (which has TEST_IFACE2) and has declared both of them in its underlying network set.
|
||||
// Additionally, VPN is arbitrarily splitting compressed traffic across WiFi and Cell.
|
||||
VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE, TEST_IFACE2})};
|
||||
NetworkStatsFactory.updateVpnInfos(vpnInfos);
|
||||
|
||||
// create some traffic (assume 10 bytes of MTU for VPN interface:
|
||||
// 1000 bytes (100 packets) were sent/received by UID_RED over VPN.
|
||||
// VPN sent/received 600 bytes (60 packets) over WiFi and 200 bytes (20 packets) over Cell.
|
||||
// For UID_RED, expect 600 bytes attributed over WiFi and 200 bytes over Cell for both
|
||||
// rx/tx.
|
||||
// UID_VPN gets nothing attributed to it (avoiding negative stats).
|
||||
final NetworkStats tunStats =
|
||||
parseDetailedStats(R.raw.xt_qtaguid_vpn_two_underlying_split_compression);
|
||||
|
||||
assertValues(tunStats, TEST_IFACE, UID_RED, 600L, 60L, 600L, 60L);
|
||||
assertValues(tunStats, TEST_IFACE, UID_VPN, 0L, 0L, 0L, 0L);
|
||||
assertValues(tunStats, TEST_IFACE2, UID_RED, 200L, 20L, 200L, 20L);
|
||||
assertValues(tunStats, TEST_IFACE2, UID_VPN, 0L, 0L, 0L, 0L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void vpnWithIncorrectUnderlyingIface() throws Exception {
|
||||
// WiFi and Cell networks are connected and VPN is using Cell (which has TEST_IFACE2),
|
||||
// but has declared only WiFi (TEST_IFACE) in its underlying network set.
|
||||
VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
|
||||
NetworkStatsFactory.updateVpnInfos(vpnInfos);
|
||||
|
||||
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
|
||||
// overhead per packet):
|
||||
// 1000 bytes (100 packets) were sent/received by UID_RED over VPN.
|
||||
// VPN sent/received 1100 bytes (100 packets) over Cell.
|
||||
// Of 1100 bytes over Cell, expect all of it attributed to UID_VPN for both rx/tx traffic.
|
||||
final NetworkStats tunStats = parseDetailedStats(R.raw.xt_qtaguid_vpn_incorrect_iface);
|
||||
|
||||
assertValues(tunStats, TEST_IFACE, UID_RED, 0L, 0L, 0L, 0L);
|
||||
assertValues(tunStats, TEST_IFACE, UID_VPN, 0L, 0L, 0L, 0L);
|
||||
assertValues(tunStats, TEST_IFACE2, UID_RED, 0L, 0L, 0L, 0L);
|
||||
assertValues(tunStats, TEST_IFACE2, UID_VPN, 1100L, 100L, 1100L, 100L);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testKernelTags() throws Exception {
|
||||
assertEquals(0, kernelToTag("0x0000000000000000"));
|
||||
@@ -146,7 +382,7 @@ public class NetworkStatsFactoryTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDoubleClatAccounting() throws Exception {
|
||||
public void testDoubleClatAccountingSimple() throws Exception {
|
||||
NetworkStatsFactory.noteStackedIface("v4-wlan0", "wlan0");
|
||||
|
||||
// xt_qtaguid_with_clat_simple is a synthetic file that simulates
|
||||
@@ -158,8 +394,13 @@ public class NetworkStatsFactoryTest {
|
||||
|
||||
assertStatsEntry(stats, "v4-wlan0", 10060, SET_DEFAULT, 0x0, 46860L, 4920L);
|
||||
assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, 0L, 0L);
|
||||
}
|
||||
|
||||
stats = parseDetailedStats(R.raw.xt_qtaguid_with_clat);
|
||||
@Test
|
||||
public void testDoubleClatAccounting() throws Exception {
|
||||
NetworkStatsFactory.noteStackedIface("v4-wlan0", "wlan0");
|
||||
|
||||
NetworkStats stats = parseDetailedStats(R.raw.xt_qtaguid_with_clat);
|
||||
assertEquals(42, stats.size());
|
||||
|
||||
assertStatsEntry(stats, "v4-wlan0", 0, SET_DEFAULT, 0x0, 356L, 276L);
|
||||
@@ -272,11 +513,19 @@ public class NetworkStatsFactoryTest {
|
||||
|
||||
private static void assertStatsEntry(NetworkStats stats, String iface, int uid, int set,
|
||||
int tag, long rxBytes, long rxPackets, long txBytes, long txPackets) {
|
||||
final int i = stats.findIndex(iface, uid, set, tag, METERED_NO, ROAMING_NO,
|
||||
DEFAULT_NETWORK_NO);
|
||||
assertStatsEntry(stats, iface, uid, set, tag, METERED_NO, ROAMING_NO, DEFAULT_NETWORK_NO,
|
||||
rxBytes, rxPackets, txBytes, txPackets);
|
||||
}
|
||||
|
||||
private static void assertStatsEntry(NetworkStats stats, String iface, int uid, int set,
|
||||
int tag, int metered, int roaming, int defaultNetwork, long rxBytes, long rxPackets,
|
||||
long txBytes, long txPackets) {
|
||||
final int i = stats.findIndex(iface, uid, set, tag, metered, roaming, defaultNetwork);
|
||||
|
||||
if (i < 0) {
|
||||
fail(String.format("no NetworkStats for (iface: %s, uid: %d, set: %d, tag: %d)",
|
||||
iface, uid, set, tag));
|
||||
fail(String.format("no NetworkStats for (iface: %s, uid: %d, set: %d, tag: %d, metered:"
|
||||
+ " %d, roaming: %d, defaultNetwork: %d)",
|
||||
iface, uid, set, tag, metered, roaming, defaultNetwork));
|
||||
}
|
||||
final NetworkStats.Entry entry = stats.getValues(i, null);
|
||||
assertEquals("unexpected rxBytes", rxBytes, entry.rxBytes);
|
||||
|
||||
@@ -23,7 +23,6 @@ import static android.net.ConnectivityManager.TYPE_VPN;
|
||||
import static android.net.ConnectivityManager.TYPE_WIFI;
|
||||
import static android.net.ConnectivityManager.TYPE_WIMAX;
|
||||
import static android.net.NetworkStats.DEFAULT_NETWORK_ALL;
|
||||
import static android.net.NetworkStats.DEFAULT_NETWORK_NO;
|
||||
import static android.net.NetworkStats.DEFAULT_NETWORK_YES;
|
||||
import static android.net.NetworkStats.IFACE_ALL;
|
||||
import static android.net.NetworkStats.INTERFACES_ALL;
|
||||
@@ -42,7 +41,6 @@ import static android.net.NetworkStats.TAG_NONE;
|
||||
import static android.net.NetworkStats.UID_ALL;
|
||||
import static android.net.NetworkStatsHistory.FIELD_ALL;
|
||||
import static android.net.NetworkTemplate.buildTemplateMobileAll;
|
||||
import static android.net.NetworkTemplate.buildTemplateMobileWildcard;
|
||||
import static android.net.NetworkTemplate.buildTemplateWifiWildcard;
|
||||
import static android.net.TrafficStats.MB_IN_BYTES;
|
||||
import static android.net.TrafficStats.UID_REMOVED;
|
||||
@@ -60,7 +58,6 @@ import static org.junit.Assert.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
import static org.mockito.ArgumentMatchers.argThat;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
@@ -98,7 +95,6 @@ import androidx.test.InstrumentationRegistry;
|
||||
import androidx.test.filters.SmallTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import com.android.internal.net.VpnInfo;
|
||||
import com.android.internal.util.ArrayUtils;
|
||||
import com.android.internal.util.test.BroadcastInterceptingContext;
|
||||
import com.android.server.net.NetworkStatsService.NetworkStatsSettings;
|
||||
@@ -129,13 +125,9 @@ import java.util.Objects;
|
||||
*/
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
@SmallTest
|
||||
public class NetworkStatsServiceTest {
|
||||
public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
|
||||
private static final String TAG = "NetworkStatsServiceTest";
|
||||
|
||||
private static final String TEST_IFACE = "test0";
|
||||
private static final String TEST_IFACE2 = "test1";
|
||||
private static final String TUN_IFACE = "test_nss_tun0";
|
||||
|
||||
private static final long TEST_START = 1194220800000L;
|
||||
|
||||
private static final String IMSI_1 = "310004";
|
||||
@@ -146,11 +138,6 @@ public class NetworkStatsServiceTest {
|
||||
private static NetworkTemplate sTemplateImsi1 = buildTemplateMobileAll(IMSI_1);
|
||||
private static NetworkTemplate sTemplateImsi2 = buildTemplateMobileAll(IMSI_2);
|
||||
|
||||
private static final int UID_RED = 1001;
|
||||
private static final int UID_BLUE = 1002;
|
||||
private static final int UID_GREEN = 1003;
|
||||
private static final int UID_VPN = 1004;
|
||||
|
||||
private static final Network WIFI_NETWORK = new Network(100);
|
||||
private static final Network MOBILE_NETWORK = new Network(101);
|
||||
private static final Network VPN_NETWORK = new Network(102);
|
||||
@@ -217,10 +204,12 @@ public class NetworkStatsServiceTest {
|
||||
expectSystemReady();
|
||||
|
||||
mService.systemReady();
|
||||
// Verify that system ready fetches realtime stats
|
||||
verify(mNetManager).getNetworkStatsUidDetail(UID_ALL, INTERFACES_ALL);
|
||||
|
||||
mSession = mService.openSession();
|
||||
assertNotNull("openSession() failed", mSession);
|
||||
|
||||
|
||||
// catch INetworkManagementEventObserver during systemReady()
|
||||
ArgumentCaptor<INetworkManagementEventObserver> networkObserver =
|
||||
ArgumentCaptor.forClass(INetworkManagementEventObserver.class);
|
||||
@@ -252,7 +241,7 @@ public class NetworkStatsServiceTest {
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, new VpnInfo[0], states, getActiveIface(states));
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states));
|
||||
|
||||
// verify service has empty history for wifi
|
||||
assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0);
|
||||
@@ -296,7 +285,7 @@ public class NetworkStatsServiceTest {
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, new VpnInfo[0], states, getActiveIface(states));
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states));
|
||||
|
||||
// verify service has empty history for wifi
|
||||
assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0);
|
||||
@@ -370,8 +359,7 @@ public class NetworkStatsServiceTest {
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, new VpnInfo[0], states, getActiveIface(states));
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states));
|
||||
|
||||
// modify some number on wifi, and trigger poll event
|
||||
incrementCurrentTime(2 * HOUR_IN_MILLIS);
|
||||
@@ -412,8 +400,7 @@ public class NetworkStatsServiceTest {
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_MOBILE, new VpnInfo[0], states, getActiveIface(states));
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_MOBILE, states, getActiveIface(states));
|
||||
|
||||
// create some traffic on first network
|
||||
incrementCurrentTime(HOUR_IN_MILLIS);
|
||||
@@ -448,7 +435,7 @@ public class NetworkStatsServiceTest {
|
||||
.addValues(TEST_IFACE, UID_BLUE, SET_DEFAULT, TAG_NONE, 512L, 4L, 0L, 0L, 0L));
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_MOBILE, new VpnInfo[0], states, getActiveIface(states));
|
||||
mService.forceUpdateIfaces(NETWORKS_MOBILE, states, getActiveIface(states));
|
||||
forcePollAndWaitForIdle();
|
||||
|
||||
|
||||
@@ -488,8 +475,7 @@ public class NetworkStatsServiceTest {
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, new VpnInfo[0], states, getActiveIface(states));
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states));
|
||||
|
||||
// create some traffic
|
||||
incrementCurrentTime(HOUR_IN_MILLIS);
|
||||
@@ -547,8 +533,7 @@ public class NetworkStatsServiceTest {
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_MOBILE, new VpnInfo[0], states, getActiveIface(states));
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_MOBILE, states, getActiveIface(states));
|
||||
|
||||
// create some traffic
|
||||
incrementCurrentTime(HOUR_IN_MILLIS);
|
||||
@@ -575,7 +560,7 @@ public class NetworkStatsServiceTest {
|
||||
.addValues(TEST_IFACE, UID_RED, SET_DEFAULT, 0xF00D, 512L, 4L, 512L, 4L, 0L));
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_MOBILE, new VpnInfo[0], states, getActiveIface(states));
|
||||
mService.forceUpdateIfaces(NETWORKS_MOBILE, states, getActiveIface(states));
|
||||
forcePollAndWaitForIdle();
|
||||
|
||||
|
||||
@@ -605,8 +590,7 @@ public class NetworkStatsServiceTest {
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, new VpnInfo[0], states, getActiveIface(states));
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states));
|
||||
|
||||
// create some traffic for two apps
|
||||
incrementCurrentTime(HOUR_IN_MILLIS);
|
||||
@@ -664,7 +648,7 @@ public class NetworkStatsServiceTest {
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, new VpnInfo[0], states, getActiveIface(states));
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states));
|
||||
|
||||
NetworkStats.Entry entry1 = new NetworkStats.Entry(
|
||||
TEST_IFACE, UID_RED, SET_DEFAULT, TAG_NONE, 50L, 5L, 50L, 5L, 0L);
|
||||
@@ -708,7 +692,7 @@ public class NetworkStatsServiceTest {
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, new VpnInfo[0], states, getActiveIface(states));
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states));
|
||||
|
||||
NetworkStats.Entry uidStats = new NetworkStats.Entry(
|
||||
TEST_IFACE, UID_BLUE, SET_DEFAULT, 0xF00D, 1024L, 8L, 512L, 4L, 0L);
|
||||
@@ -733,11 +717,17 @@ public class NetworkStatsServiceTest {
|
||||
|
||||
NetworkStats stats = mService.getDetailedUidStats(ifaceFilter);
|
||||
|
||||
verify(mNetManager, times(1)).getNetworkStatsUidDetail(eq(UID_ALL), argThat(ifaces ->
|
||||
ifaces != null && ifaces.length == 2
|
||||
&& ArrayUtils.contains(ifaces, TEST_IFACE)
|
||||
&& ArrayUtils.contains(ifaces, stackedIface)));
|
||||
|
||||
// mNetManager#getNetworkStatsUidDetail(UID_ALL, INTERFACES_ALL) has following invocations:
|
||||
// 1) NetworkStatsService#systemReady from #setUp.
|
||||
// 2) mService#forceUpdateIfaces in the test above.
|
||||
//
|
||||
// Additionally, we should have one call from the above call to mService#getDetailedUidStats
|
||||
// with the augmented ifaceFilter
|
||||
verify(mNetManager, times(2)).getNetworkStatsUidDetail(UID_ALL, INTERFACES_ALL);
|
||||
verify(mNetManager, times(1)).getNetworkStatsUidDetail(
|
||||
eq(UID_ALL), eq(NetworkStatsFactory.augmentWithStackedInterfaces(ifaceFilter)));
|
||||
assertTrue(ArrayUtils.contains(stats.getUniqueIfaces(), TEST_IFACE));
|
||||
assertTrue(ArrayUtils.contains(stats.getUniqueIfaces(), stackedIface));
|
||||
assertEquals(2, stats.size());
|
||||
assertEquals(uidStats, stats.getValues(0, null));
|
||||
assertEquals(tetheredStats1, stats.getValues(1, null));
|
||||
@@ -752,8 +742,7 @@ public class NetworkStatsServiceTest {
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, new VpnInfo[0], states, getActiveIface(states));
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states));
|
||||
|
||||
// create some initial traffic
|
||||
incrementCurrentTime(HOUR_IN_MILLIS);
|
||||
@@ -810,8 +799,7 @@ public class NetworkStatsServiceTest {
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, new VpnInfo[0], states, getActiveIface(states));
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states));
|
||||
|
||||
// create some initial traffic
|
||||
incrementCurrentTime(HOUR_IN_MILLIS);
|
||||
@@ -851,8 +839,7 @@ public class NetworkStatsServiceTest {
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_MOBILE, new VpnInfo[0], states, getActiveIface(states));
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_MOBILE, states, getActiveIface(states));
|
||||
|
||||
// Create some traffic
|
||||
incrementCurrentTime(HOUR_IN_MILLIS);
|
||||
@@ -890,8 +877,7 @@ public class NetworkStatsServiceTest {
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_MOBILE, new VpnInfo[0], states, getActiveIface(states));
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_MOBILE, states, getActiveIface(states));
|
||||
|
||||
// create some tethering traffic
|
||||
incrementCurrentTime(HOUR_IN_MILLIS);
|
||||
@@ -922,241 +908,6 @@ public class NetworkStatsServiceTest {
|
||||
assertUidTotal(sTemplateImsi1, UID_TETHERING, 1920L, 14L, 384L, 2L, 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void vpnWithOneUnderlyingIface() throws Exception {
|
||||
// WiFi network is connected and VPN is using WiFi (which has TEST_IFACE).
|
||||
expectDefaultSettings();
|
||||
NetworkState[] networkStates = new NetworkState[] {buildWifiState(), buildVpnState()};
|
||||
VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(
|
||||
new Network[] {WIFI_NETWORK, VPN_NETWORK},
|
||||
vpnInfos,
|
||||
networkStates,
|
||||
getActiveIface(networkStates));
|
||||
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
|
||||
// overhead per packet):
|
||||
// 1000 bytes (100 packets) were sent/received by UID_RED over VPN.
|
||||
// 500 bytes (50 packets) were sent/received by UID_BLUE over VPN.
|
||||
// VPN sent/received 1650 bytes (150 packets) over WiFi.
|
||||
// Of 1650 bytes over WiFi, expect 1000 bytes attributed to UID_RED, 500 bytes attributed to
|
||||
// UID_BLUE, and 150 bytes attributed to UID_VPN for both rx/tx traffic.
|
||||
incrementCurrentTime(HOUR_IN_MILLIS);
|
||||
expectNetworkStatsUidDetail(new NetworkStats(getElapsedRealtime(), 3)
|
||||
.addValues(TUN_IFACE, UID_RED, SET_DEFAULT, TAG_NONE, 1000L, 100L, 1000L, 100L, 1L)
|
||||
.addValues(TUN_IFACE, UID_BLUE, SET_DEFAULT, TAG_NONE, 500L, 50L, 500L, 50L, 1L)
|
||||
// VPN received 1650 bytes over WiFi in background (SET_DEFAULT).
|
||||
.addValues(TEST_IFACE, UID_VPN, SET_DEFAULT, TAG_NONE, 1650L, 150L, 0L, 0L, 1L)
|
||||
// VPN sent 1650 bytes over WiFi in foreground (SET_FOREGROUND).
|
||||
.addValues(TEST_IFACE, UID_VPN, SET_FOREGROUND, TAG_NONE, 0L, 0L, 1650L, 150L, 1L));
|
||||
|
||||
forcePollAndWaitForIdle();
|
||||
|
||||
assertUidTotal(sTemplateWifi, UID_RED, 1000L, 100L, 1000L, 100L, 1);
|
||||
assertUidTotal(sTemplateWifi, UID_BLUE, 500L, 50L, 500L, 50L, 1);
|
||||
assertUidTotal(sTemplateWifi, UID_VPN, 150L, 0L, 150L, 0L, 2);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void vpnWithOneUnderlyingIface_withCompression() throws Exception {
|
||||
// WiFi network is connected and VPN is using WiFi (which has TEST_IFACE).
|
||||
expectDefaultSettings();
|
||||
NetworkState[] networkStates = new NetworkState[] {buildWifiState(), buildVpnState()};
|
||||
VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(
|
||||
new Network[] {WIFI_NETWORK, VPN_NETWORK},
|
||||
vpnInfos,
|
||||
networkStates,
|
||||
getActiveIface(networkStates));
|
||||
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
|
||||
// overhead per packet):
|
||||
// 1000 bytes (100 packets) were sent/received by UID_RED over VPN.
|
||||
// 3000 bytes (300 packets) were sent/received by UID_BLUE over VPN.
|
||||
// VPN sent/received 1000 bytes (100 packets) over WiFi.
|
||||
// Of 1000 bytes over WiFi, expect 250 bytes attributed UID_RED and 750 bytes to UID_BLUE,
|
||||
// with nothing attributed to UID_VPN for both rx/tx traffic.
|
||||
incrementCurrentTime(HOUR_IN_MILLIS);
|
||||
expectNetworkStatsUidDetail(new NetworkStats(getElapsedRealtime(), 3)
|
||||
.addValues(TUN_IFACE, UID_RED, SET_DEFAULT, TAG_NONE, 1000L, 100L, 1000L, 100L, 1L)
|
||||
.addValues(TUN_IFACE, UID_BLUE, SET_DEFAULT, TAG_NONE, 3000L, 300L, 3000L, 300L, 1L)
|
||||
.addValues(
|
||||
TEST_IFACE, UID_VPN, SET_DEFAULT, TAG_NONE, 1000L, 100L, 1000L, 100L, 0L));
|
||||
|
||||
forcePollAndWaitForIdle();
|
||||
|
||||
assertUidTotal(sTemplateWifi, UID_RED, 250L, 25L, 250L, 25L, 0);
|
||||
assertUidTotal(sTemplateWifi, UID_BLUE, 750L, 75L, 750L, 75L, 0);
|
||||
assertUidTotal(sTemplateWifi, UID_VPN, 0L, 0L, 0L, 0L, 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void vpnWithTwoUnderlyingIfaces_packetDuplication() throws Exception {
|
||||
// WiFi and Cell networks are connected and VPN is using WiFi (which has TEST_IFACE) and
|
||||
// Cell (which has TEST_IFACE2) and has declared both of them in its underlying network set.
|
||||
// Additionally, VPN is duplicating traffic across both WiFi and Cell.
|
||||
expectDefaultSettings();
|
||||
NetworkState[] networkStates =
|
||||
new NetworkState[] {
|
||||
buildWifiState(), buildMobile4gState(TEST_IFACE2), buildVpnState()
|
||||
};
|
||||
VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE, TEST_IFACE2})};
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(
|
||||
new Network[] {WIFI_NETWORK, VPN_NETWORK},
|
||||
vpnInfos,
|
||||
networkStates,
|
||||
getActiveIface(networkStates));
|
||||
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
|
||||
// overhead per packet):
|
||||
// 1000 bytes (100 packets) were sent/received by UID_RED and UID_BLUE over VPN.
|
||||
// VPN sent/received 4400 bytes (400 packets) over both WiFi and Cell (8800 bytes in total).
|
||||
// Of 8800 bytes over WiFi/Cell, expect:
|
||||
// - 500 bytes rx/tx each over WiFi/Cell attributed to both UID_RED and UID_BLUE.
|
||||
// - 1200 bytes rx/tx each over WiFi/Cell for VPN_UID.
|
||||
incrementCurrentTime(HOUR_IN_MILLIS);
|
||||
expectNetworkStatsUidDetail(new NetworkStats(getElapsedRealtime(), 4)
|
||||
.addValues(TUN_IFACE, UID_RED, SET_DEFAULT, TAG_NONE, 1000L, 100L, 1000L, 100L, 2L)
|
||||
.addValues(TUN_IFACE, UID_BLUE, SET_DEFAULT, TAG_NONE, 1000L, 100L, 1000L, 100L, 2L)
|
||||
.addValues(TEST_IFACE, UID_VPN, SET_DEFAULT, TAG_NONE, 2200L, 200L, 2200L, 200L, 2L)
|
||||
.addValues(
|
||||
TEST_IFACE2, UID_VPN, SET_DEFAULT, TAG_NONE, 2200L, 200L, 2200L, 200L, 2L));
|
||||
|
||||
forcePollAndWaitForIdle();
|
||||
|
||||
assertUidTotal(sTemplateWifi, UID_RED, 500L, 50L, 500L, 50L, 1);
|
||||
assertUidTotal(sTemplateWifi, UID_BLUE, 500L, 50L, 500L, 50L, 1);
|
||||
assertUidTotal(sTemplateWifi, UID_VPN, 1200L, 100L, 1200L, 100L, 2);
|
||||
|
||||
assertUidTotal(buildTemplateMobileWildcard(), UID_RED, 500L, 50L, 500L, 50L, 1);
|
||||
assertUidTotal(buildTemplateMobileWildcard(), UID_BLUE, 500L, 50L, 500L, 50L, 1);
|
||||
assertUidTotal(buildTemplateMobileWildcard(), UID_VPN, 1200L, 100L, 1200L, 100L, 2);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void vpnWithTwoUnderlyingIfaces_splitTraffic() throws Exception {
|
||||
// WiFi and Cell networks are connected and VPN is using WiFi (which has TEST_IFACE) and
|
||||
// Cell (which has TEST_IFACE2) and has declared both of them in its underlying network set.
|
||||
// Additionally, VPN is arbitrarily splitting traffic across WiFi and Cell.
|
||||
expectDefaultSettings();
|
||||
NetworkState[] networkStates =
|
||||
new NetworkState[] {
|
||||
buildWifiState(), buildMobile4gState(TEST_IFACE2), buildVpnState()
|
||||
};
|
||||
VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE, TEST_IFACE2})};
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(
|
||||
new Network[] {WIFI_NETWORK, VPN_NETWORK},
|
||||
vpnInfos,
|
||||
networkStates,
|
||||
getActiveIface(networkStates));
|
||||
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
|
||||
// overhead per packet):
|
||||
// 1000 bytes (100 packets) were sent/received by UID_RED over VPN.
|
||||
// VPN sent/received 660 bytes (60 packets) over WiFi and 440 bytes (40 packets) over Cell.
|
||||
// For UID_RED, expect 600 bytes attributed over WiFi and 400 bytes over Cell for both
|
||||
// rx/tx.
|
||||
// For UID_VPN, expect 60 bytes attributed over WiFi and 40 bytes over Cell for both rx/tx.
|
||||
incrementCurrentTime(HOUR_IN_MILLIS);
|
||||
expectNetworkStatsUidDetail(new NetworkStats(getElapsedRealtime(), 3)
|
||||
.addValues(TUN_IFACE, UID_RED, SET_DEFAULT, TAG_NONE, 1000L, 100L, 1000L, 100L, 2L)
|
||||
.addValues(TEST_IFACE, UID_VPN, SET_DEFAULT, TAG_NONE, 660L, 60L, 660L, 60L, 1L)
|
||||
.addValues(TEST_IFACE2, UID_VPN, SET_DEFAULT, TAG_NONE, 440L, 40L, 440L, 40L, 1L));
|
||||
|
||||
forcePollAndWaitForIdle();
|
||||
|
||||
assertUidTotal(sTemplateWifi, UID_RED, 600L, 60L, 600L, 60L, 1);
|
||||
assertUidTotal(sTemplateWifi, UID_VPN, 60L, 0L, 60L, 0L, 1);
|
||||
|
||||
assertUidTotal(buildTemplateMobileWildcard(), UID_RED, 400L, 40L, 400L, 40L, 1);
|
||||
assertUidTotal(buildTemplateMobileWildcard(), UID_VPN, 40L, 0L, 40L, 0L, 1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void vpnWithTwoUnderlyingIfaces_splitTrafficWithCompression() throws Exception {
|
||||
// WiFi and Cell networks are connected and VPN is using WiFi (which has TEST_IFACE) and
|
||||
// Cell (which has TEST_IFACE2) and has declared both of them in its underlying network set.
|
||||
// Additionally, VPN is arbitrarily splitting compressed traffic across WiFi and Cell.
|
||||
expectDefaultSettings();
|
||||
NetworkState[] networkStates =
|
||||
new NetworkState[] {
|
||||
buildWifiState(), buildMobile4gState(TEST_IFACE2), buildVpnState()
|
||||
};
|
||||
VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE, TEST_IFACE2})};
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(
|
||||
new Network[] {WIFI_NETWORK, VPN_NETWORK},
|
||||
vpnInfos,
|
||||
networkStates,
|
||||
getActiveIface(networkStates));
|
||||
// create some traffic (assume 10 bytes of MTU for VPN interface:
|
||||
// 1000 bytes (100 packets) were sent/received by UID_RED over VPN.
|
||||
// VPN sent/received 600 bytes (60 packets) over WiFi and 200 bytes (20 packets) over Cell.
|
||||
// For UID_RED, expect 600 bytes attributed over WiFi and 200 bytes over Cell for both
|
||||
// rx/tx.
|
||||
// UID_VPN gets nothing attributed to it (avoiding negative stats).
|
||||
incrementCurrentTime(HOUR_IN_MILLIS);
|
||||
expectNetworkStatsUidDetail(new NetworkStats(getElapsedRealtime(), 4)
|
||||
.addValues(TUN_IFACE, UID_RED, SET_DEFAULT, TAG_NONE, 1000L, 100L, 1000L, 100L, 1L)
|
||||
.addValues(TEST_IFACE, UID_VPN, SET_DEFAULT, TAG_NONE, 600L, 60L, 600L, 60L, 0L)
|
||||
.addValues(TEST_IFACE2, UID_VPN, SET_DEFAULT, TAG_NONE, 200L, 20L, 200L, 20L, 0L));
|
||||
|
||||
forcePollAndWaitForIdle();
|
||||
|
||||
assertUidTotal(sTemplateWifi, UID_RED, 600L, 60L, 600L, 60L, 0);
|
||||
assertUidTotal(sTemplateWifi, UID_VPN, 0L, 0L, 0L, 0L, 0);
|
||||
|
||||
assertUidTotal(buildTemplateMobileWildcard(), UID_RED, 200L, 20L, 200L, 20L, 0);
|
||||
assertUidTotal(buildTemplateMobileWildcard(), UID_VPN, 0L, 0L, 0L, 0L, 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void vpnWithIncorrectUnderlyingIface() throws Exception {
|
||||
// WiFi and Cell networks are connected and VPN is using Cell (which has TEST_IFACE2),
|
||||
// but has declared only WiFi (TEST_IFACE) in its underlying network set.
|
||||
expectDefaultSettings();
|
||||
NetworkState[] networkStates =
|
||||
new NetworkState[] {
|
||||
buildWifiState(), buildMobile4gState(TEST_IFACE2), buildVpnState()
|
||||
};
|
||||
VpnInfo[] vpnInfos = new VpnInfo[] {createVpnInfo(new String[] {TEST_IFACE})};
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(
|
||||
new Network[] {WIFI_NETWORK, VPN_NETWORK},
|
||||
vpnInfos,
|
||||
networkStates,
|
||||
getActiveIface(networkStates));
|
||||
// create some traffic (assume 10 bytes of MTU for VPN interface and 1 byte encryption
|
||||
// overhead per packet):
|
||||
// 1000 bytes (100 packets) were sent/received by UID_RED over VPN.
|
||||
// VPN sent/received 1100 bytes (100 packets) over Cell.
|
||||
// Of 1100 bytes over Cell, expect all of it attributed to UID_VPN for both rx/tx traffic.
|
||||
incrementCurrentTime(HOUR_IN_MILLIS);
|
||||
expectNetworkStatsUidDetail(new NetworkStats(getElapsedRealtime(), 2)
|
||||
.addValues(TUN_IFACE, UID_RED, SET_DEFAULT, TAG_NONE, 1000L, 100L, 1000L, 100L, 1L)
|
||||
.addValues(
|
||||
TEST_IFACE2, UID_VPN, SET_DEFAULT, TAG_NONE, 1100L, 100L, 1100L, 100L, 1L));
|
||||
|
||||
forcePollAndWaitForIdle();
|
||||
|
||||
assertUidTotal(sTemplateWifi, UID_RED, 0L, 0L, 0L, 0L, 0);
|
||||
assertUidTotal(sTemplateWifi, UID_VPN, 0L, 0L, 0L, 0L, 0);
|
||||
assertUidTotal(buildTemplateMobileWildcard(), UID_RED, 0L, 0L, 0L, 0L, 0);
|
||||
assertUidTotal(buildTemplateMobileWildcard(), UID_VPN, 1100L, 100L, 1100L, 100L, 1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRegisterUsageCallback() throws Exception {
|
||||
// pretend that wifi network comes online; service should ask about full
|
||||
@@ -1167,7 +918,7 @@ public class NetworkStatsServiceTest {
|
||||
expectNetworkStatsUidDetail(buildEmptyStats());
|
||||
expectBandwidthControlCheck();
|
||||
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, new VpnInfo[0], states, getActiveIface(states));
|
||||
mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states));
|
||||
|
||||
// verify service has empty history for wifi
|
||||
assertNetworkTotal(sTemplateWifi, 0L, 0L, 0L, 0L, 0);
|
||||
@@ -1387,59 +1138,6 @@ public class NetworkStatsServiceTest {
|
||||
}
|
||||
}
|
||||
|
||||
private static void assertValues(NetworkStats stats, String iface, int uid, int set,
|
||||
int tag, int metered, int roaming, int defaultNetwork, long rxBytes, long rxPackets,
|
||||
long txBytes, long txPackets, int operations) {
|
||||
final NetworkStats.Entry entry = new NetworkStats.Entry();
|
||||
final int[] sets;
|
||||
if (set == SET_ALL) {
|
||||
sets = new int[] { SET_ALL, SET_DEFAULT, SET_FOREGROUND };
|
||||
} else {
|
||||
sets = new int[] { set };
|
||||
}
|
||||
|
||||
final int[] roamings;
|
||||
if (roaming == ROAMING_ALL) {
|
||||
roamings = new int[] { ROAMING_ALL, ROAMING_YES, ROAMING_NO };
|
||||
} else {
|
||||
roamings = new int[] { roaming };
|
||||
}
|
||||
|
||||
final int[] meterings;
|
||||
if (metered == METERED_ALL) {
|
||||
meterings = new int[] { METERED_ALL, METERED_YES, METERED_NO };
|
||||
} else {
|
||||
meterings = new int[] { metered };
|
||||
}
|
||||
|
||||
final int[] defaultNetworks;
|
||||
if (defaultNetwork == DEFAULT_NETWORK_ALL) {
|
||||
defaultNetworks = new int[] { DEFAULT_NETWORK_ALL, DEFAULT_NETWORK_YES,
|
||||
DEFAULT_NETWORK_NO };
|
||||
} else {
|
||||
defaultNetworks = new int[] { defaultNetwork };
|
||||
}
|
||||
|
||||
for (int s : sets) {
|
||||
for (int r : roamings) {
|
||||
for (int m : meterings) {
|
||||
for (int d : defaultNetworks) {
|
||||
final int i = stats.findIndex(iface, uid, s, tag, m, r, d);
|
||||
if (i != -1) {
|
||||
entry.add(stats.getValues(i, null));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
assertEquals("unexpected rxBytes", rxBytes, entry.rxBytes);
|
||||
assertEquals("unexpected rxPackets", rxPackets, entry.rxPackets);
|
||||
assertEquals("unexpected txBytes", txBytes, entry.txBytes);
|
||||
assertEquals("unexpected txPackets", txPackets, entry.txPackets);
|
||||
assertEquals("unexpected operations", operations, entry.operations);
|
||||
}
|
||||
|
||||
private static void assertValues(NetworkStatsHistory stats, long start, long end, long rxBytes,
|
||||
long rxPackets, long txBytes, long txPackets, int operations) {
|
||||
final NetworkStatsHistory.Entry entry = stats.getValues(start, end, null);
|
||||
@@ -1505,14 +1203,6 @@ public class NetworkStatsServiceTest {
|
||||
return new NetworkState(info, prop, new NetworkCapabilities(), VPN_NETWORK, null, null);
|
||||
}
|
||||
|
||||
private static VpnInfo createVpnInfo(String[] underlyingIfaces) {
|
||||
VpnInfo info = new VpnInfo();
|
||||
info.ownerUid = UID_VPN;
|
||||
info.vpnIface = TUN_IFACE;
|
||||
info.underlyingIfaces = underlyingIfaces;
|
||||
return info;
|
||||
}
|
||||
|
||||
private long getElapsedRealtime() {
|
||||
return mElapsedRealtime;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user