Commit Graph

1598 Commits

Author SHA1 Message Date
Lorenzo Colitti
18cdec34dd Merge "Immediately create native networks when NetworkAgents register." 2023-05-11 03:35:21 +00:00
Paul Hu
3e497c7b1e Merge "Use a single SharedLog for all mdns components" 2023-05-11 00:45:18 +00:00
Mark Fasheh
2d626e5632 Merge "Optionally have ConnectivityService kill sockets for frozen apps" 2023-05-10 23:08:00 +00:00
Mark Fasheh
7c999d8d4c Optionally have ConnectivityService kill sockets for frozen apps
To do this we register a UidFrozenStateChangedCallback with
ActivityManager. The callback then queues up work on the Handler thread
to consume the original callback args and kill appropriate sockets.

Test: atest ConnectivityServiceTests
Bug: 277100090
Change-Id: I93f174811aef726145a18ea90443ddfc1456478e
2023-05-10 21:04:54 +00:00
Lorenzo Colitti
4f87aa3f13 Immediately create native networks when NetworkAgents register.
Currently, native networks for non-VPN networks are created only
when the NetworkAgent goes into the CONNECTED state. This is not
ideal, because until the network is connected:

- Nothing routes to the network, so no IP packets can be sent on
  it (except via packet sockets).
- Many network configuration changes (e.g., routes and DNS
  servers) fail to apply because the network does not exist yet.
  These cause ENONET errors in the logs.

Fix this starting in U by creating the native network as soon as
the agent registers. This should not impact apps because
NetworkCallbacks are not sent until networks are connected.

Bug: 143158421
Test: new coverage in NetworkAgentTest
Change-Id: I26bfa8630c085422175558645c47a6c64be96ae6
2023-05-10 20:01:07 +09:00
Junyu Lai
598ca1e284 Merge "Fix template for test network needs fine location permission" 2023-05-10 02:22:18 +00:00
Paul Hu
14667deefa Use a single SharedLog for all mdns components
Use a single SharedLog in NsdService, and making subcomponents
for DiscoveryManager/Advertiser/SocketProvider. Because each
logger has 500 maxRecords, so 2000 records in total, which take
too much memory.

Also address leftover comments in previous logging changes.

Before:
  2023-04-17T15:05:27.409895 - [Client10082-1] Register a DiscoveryListener 3 for service type:_nmt274981618._tcp.local
  2023-04-17T15:05:26.408015 - [Client10082-1] New client. useJavaBackend=true

Advertiser:
  2023-04-17T15:05:27.213023 - [testtap0] Probing finished for service 2
  2023-04-17T15:05:26.409607 - Adding service name: ^Nsd.Test|Non-#AsCiI\Characters&\ufffe テスト 測試, type: _nmt274981618._tcp, hostAddresses: , port: 12345, network: null, txtRecord:  with ID 2

DiscoveryManager:
  2023-04-17T15:05:28.227786 - [_nmt274981618._tcp.local-102] onServiceNameDiscovered: ^Nsd.Test|Non-#AsCiI\Characters&\ufffe テスト 測試
  2023-04-17T15:05:27.409104 - createServiceTypeClient for serviceType:_nmt274981618._tcp.local network:102
  2023-04-17T15:05:27.398075 - Registering listener for serviceType: _nmt274981618._tcp.local

SocketProvider:
  2023-04-17T15:05:28.292106 - Remove socket on net:102
  2023-04-17T15:05:26.441517 - Create socket on net:NetworkAsKey{ network=102 }, ifName:testtap0
  2023-04-17T15:05:26.409005 - Start monitoring sockets.

After:
Logs:
  2023-04-17T20:51:42.931769 - [MdnsDiscoveryManager._nmt682015268._tcp.local-101] onServiceNameDiscovered: Name: ^Nsd.Test|Non-#AsCiI\Characters&\ufffe テスト 測試, type: _nmt682015268._tcp.local, subtypes: , ip: [100.70.162.138], ipv6: [fe80::9c0e:d0ff:fe7d:e5aa, 2a00:79e1:abc:6f04:9c0e:d0ff:fe7d:e5aa, 2a00:79e1:abc:6f04:eb56:8e39:5e1f:1102], port: 12345, interfaceIndex: 47, network: 101, textStrings: [], textEntries: []
  2023-04-17T20:51:42.032465 - [NsdService.Client10082-1] Register a DiscoveryListener 3 for service type:_nmt682015268._tcp.local
  2023-04-17T20:51:42.026645 - [MdnsDiscoveryManager] createServiceTypeClient for type:_nmt682015268._tcp.local, net:101
  2023-04-17T20:51:41.091555 - [MdnsAdvertiser] Adding service name: ^Nsd.Test|Non-#AsCiI\Characters&\ufffe テスト 測試, type: _nmt682015268._tcp, hostAddresses: , port: 12345, network: null, txtRecord:  with ID 2
  2023-04-17T20:51:41.091037 - [MdnsSocketProvider] Start monitoring sockets.
  2023-04-17T20:51:41.089951 - [NsdService.Client10082-1] New client. useJavaBackend=true

Bug: 275004614
Test: atest FrameworksNetTests android.net.cts.NsdManagerTest
Change-Id: I1c9b7697cc95748f7fe4e6beecea217d39c56fb1
2023-05-10 02:18:43 +00:00
Paul Hu
49078d7b0f Merge "Process all responses if the network is null in MdnsServiceTypeClient" 2023-05-09 10:23:24 +00:00
Paul Hu
bdf82a2aa0 Process all responses if the network is null in MdnsServiceTypeClient
If the network is null in MdnsServiceTypeClient, it should use
MdnsSocketClient for single socket only. So it's expected to
process any response from only the socket (network).

Move the stopDiscovery outside the listener check loop.
Because the stop should only be called once.

Add a test to verify the response processing with a non-null
network MdnsServiceTypeClient

Bug: 265787401
Test: atest FrameworksNetTests
Change-Id: I76965302037f050e0ac3b2cfdbaa5a855e2283c7
2023-05-09 15:19:29 +08:00
Treehugger Robot
ab809e5ce0 Merge "Fix isFeatureEnabled namespace and overload usage" 2023-05-08 03:19:27 +00:00
Yuyang Huang
de802c8dc4 Avoid going over max service name length when renaming NSD services
As per  RFC 1034/1035, the max size of the label is 63 bytes. It should
also be guaranteed when the serviceName is renamed due to the conflict.

Bug: 265865456
Test: atest FrameworksNetTests
Change-Id: I077d8abdb91071db62b9618d9918e3a12682aaf4
2023-05-04 13:24:23 +09:00
Junyu Lai
a58914b548 Fix template for test network needs fine location permission
For a template with MATCH_TEST, since the wifi network key is
just a placeholder to identify a specific test network, it is
not related to track user location. Hence the check is not
really needed.

Test: 1. atest NetworkStatsIntegrationTest with use location turned off
      2. atest FrameworksNetTests:android.net.connectivity.com.android.server.net.NetworkStatsServiceTest
Fix: 280686048
Change-Id: Ic128cfbbb2d03c427c9030c99bf205eb65a33e58
2023-05-04 11:01:33 +08:00
Motomu Utsumi
278db58bf5 Fix isFeatureEnabled namespace and overload usage
From service-connectivity, NAMESPACE_TETHERING must be used, as
NAMESPACE_CONNECTIVITY is used for the NetworkStack module. Also the
isFeatureEnabled with module name must be used, otherwise the "android"
package version is queried instead of the tethering module version.

BpfNetMaps is using flag value 1 to workaround this issue.
flags in NsdService, AutomaticOnOffKeepaliveTracker, and ConnectivityFlags
were not pushed currently.
So, this change has no effect to devices.

Bug: 279108992
Test: TH
Change-Id: I2b4b6a13c048c20beef52b1f43b9e21aca0c637a
2023-04-28 19:18:43 +09:00
Remi NGUYEN VAN
bee2ee14f3 Move ConnectivityResources to service-connectivity
The ConnectivityResources class is only usable with QUERY_ALL_PACKAGES
permission, so it is not generally usable in framework-connectivity. It
is also backed by the ServiceConnectivityResources APK, which is
intended as resources for service-connectivity.

Move the class to service-connectivity and update callers. CTS needs a
way to determine the supported keepalive count as it used the
resources from KeepaliveUtils as @hide API, so provide a
ConnectivityManager @hide API for testing.

Bug: 279108992
Test: atest
Change-Id: I3c9a77c580b5ab87c922c32778bce15dc33b4d1d
2023-04-28 19:18:39 +09:00
Jean Chalard
e50f1464bb Merge "Test the encap/timeout for the VCN" 2023-04-28 05:18:59 +00:00
Treehugger Robot
915b32ea23 Merge "Add some tests for packet wakeup logging changes" 2023-04-28 05:14:46 +00:00
Suprabh Shukla
53e1639b7d Add some tests for packet wakeup logging changes
Cellular networks are now supported for marking wakeup packets. As a
result onWakeupEvent now also reports data relevant to the cell
transport.

These unit tests should add coverage for these new behaviors.

Test: atest FrameworksNetTests

Bug: 276498460
Change-Id: I0b8a03fff6255e067b736f3dbfb53de56420f90b
2023-04-27 19:29:38 -07:00
Yuyang Huang
f410cca0e3 Merge "Refactor the ISocketNetLinkMonitor to AbstractSocketNetlink" 2023-04-28 02:02:12 +00:00
Lorenzo Colitti
0c11c6d29d Merge "Make the MTU tests more realistic." 2023-04-27 06:02:08 +00:00
Yuyang Huang
508e508ca6 Refactor the ISocketNetLinkMonitor to AbstractSocketNetlink
Test: atest CtsNetTestCases FrameworksNetTests
Bug: 279692201
Change-Id: Ie07603ea51dda1ffdeb15f753bda7892d9137766
2023-04-27 12:40:03 +09:00
Maciej Żenczykowski
a3c51eab56 Merge "remove needless arguments to stopClatd" 2023-04-26 19:15:50 +00:00
Paul Hu
336121d021 Merge "Add MdnsServiceCache" 2023-04-26 14:00:28 +00:00
Paul Hu
ade3f45956 Add MdnsServiceCache
Currently, the mDns discovery services will clear if no listener
registers to that MdnsServiceTypeClient. If an app does discover,
stop discover, resolve, at this point the listener was
unregistered, so the MdnsServiceTypeClient was deleted, and the
service is gone from cache. So this will actually restart
discovery without returning previous results from cache. Thus,
add MdnsServiceCache to store all services and reduce the
duplicated queries.

Bug: 265787401
Test: atest FrameworksNetTests
Change-Id: If3d4eb4e3dc5455f6f97cb782aa1b99b2a00f6e0
2023-04-26 07:37:51 +00:00
Treehugger Robot
f3c1ef5408 Merge "Use InetDiagMessage.destroyLiveTcpSocket instead of netd.socketDestroy" 2023-04-26 04:49:20 +00:00
Maciej Żenczykowski
93b7631b31 remove needless arguments to stopClatd
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia786a198be336f48327b5e1b568b3e7c24d0dc59
2023-04-25 14:56:41 -07:00
Treehugger Robot
47b95be1c9 Merge "Make lingering delay 2000ms in testMultipleLingering" 2023-04-25 09:11:42 +00:00
Lorenzo Colitti
b95ca556db Make the MTU tests more realistic.
Currently, the MTU tests work on networks that have not yet been
connected. This is not very realistic because most MTU changes
(like most LinkProperties changes in general) happen after the
network has connected. Change these tests to use connected
networks instead.

To avoid losing coverage for setting the MTU before the network
is connected, add a test just for that.

Bug: 143158421
Test: test-only change
Change-Id: I7f808249722924a0b1253e402c5580bb104afd8e
2023-04-25 17:15:26 +09:00
Chalard Jean
aeadd47abc Make lingering delay 2000ms in testMultipleLingering
Phenotype is updating the flags while this test is running
and this DoS'es the device to such an extent that the test
process doesn't get the CPU for more that 300ms. That lets
the lingering timeout run its course and fails the test.

This won't necessarily fix all flakes (after all, if
Phenotype hogs the CPU for 2 seconds the same issue will
continue to happen), but it should help.

Bug: 277555492
Test: FrameworksNetTests
Change-Id: I78ab1573974427b10dd557c011fbbf64942fd09f
2023-04-25 16:16:48 +09:00
Hansen Kurli
22a0120260 Merge changes I727849fa,If31ccbc7
* changes:
  Refactor buildKeepaliveMetrics to return DailyKeepaliveInfoReported
  Create KeepaliveStatsTracker for Duration metrics.
2023-04-24 04:03:09 +00:00
Chalard Jean
12740c9ff0 Test the encap/timeout for the VCN
Bug: 269715746
Test: VpnTest
Change-Id: I8e5e7a7eb09ee4d2e0a88193c5a6b1f0580d5eb8
2023-04-24 12:10:58 +09:00
Paul Hu
700de306ef Merge changes from topic "revert-2542434-revert-2535219-TAMNEZLAHT-VPTOBCYDEB"
* changes:
  Revert^2 "Put client logs into SharedLog and dump more logs"
  Revert^2 "Record Advertiser history logs for better debugging"
  Revert "Revert "Record SocketProvider history logs for better de..."
  Revert "Revert "Record DiscoveryManager history logs for better ..."
2023-04-21 14:35:45 +00:00
chiachangwang
3dcfdd0642 Remove unnecessary mocking in tearDown
The setup for the mocking object will be reset when each test
finishs the test. Reset the mocking value is actually no-op
but cause possible threading issue in Mokito.

Bug: 278979735
Test: atest com.android.server.connectivity.VpnTest \
      --rerun-until-failure 100
Change-Id: Ib8c3813e5dbcc9b7432a5548766d63e400b4ed0e
2023-04-20 09:43:40 +00:00
Motomu Utsumi
93a2218e41 Use InetDiagMessage.destroyLiveTcpSocket instead of netd.socketDestroy
Netd is not updatable since it's not mainlined.
To make socket destroy code updatable, the code was re-implemented in
java and moved to Connectivity.

Bug: 270298713
Test: atest FrameworksNetTests
Change-Id: I5439c0c76c42a9f738a1b25a1f62e701755cbd05
2023-04-19 11:59:18 +09:00
Paul Hu
51ff70d98e Revert^2 "Record Advertiser history logs for better debugging"
5f558683b3

Change-Id: I4292f3b8ecdfbcf90978cb2d27392802701c36c1
2023-04-18 14:52:19 +08:00
Paul Hu
24913d0e80 Revert "Revert "Record DiscoveryManager history logs for better ..."
Revert submission 2542434-revert-2535219-TAMNEZLAHT

Reason for revert: Prepare a fix for the original topic

Reverted changes: /q/submissionid:2542434-revert-2535219-TAMNEZLAHT

Change-Id: I718418e4499784255b177622e3c08a82d0b24640
2023-04-18 14:50:31 +08:00
Paul Hu
f0f83b6fc3 Merge changes from topic "revert-2535219-TAMNEZLAHT"
* changes:
  Revert "Record DiscoveryManager history logs for better debugging"
  Revert "Record SocketProvider history logs for better debugging"
  Revert "Record Advertiser history logs for better debugging"
  Revert "Put client logs into SharedLog and dump more logs"
2023-04-18 02:53:21 +00:00
Paul Hu
2f0e914375 Revert "Record DiscoveryManager history logs for better debugging"
Revert submission 2535219

Reason for revert: Build break

Reverted changes: /q/submissionid:2535219

Change-Id: I9c8486e95e0b28ec4206d1e69858ab401888895a
2023-04-18 02:45:34 +00:00
Paul Hu
5f558683b3 Revert "Record Advertiser history logs for better debugging"
Revert submission 2535219

Reason for revert: Build break

Reverted changes: /q/submissionid:2535219

Change-Id: I19496223d6f54120c17d690fd760e6743e3877b8
2023-04-18 02:45:34 +00:00
Paul Hu
0b39135e3e Merge changes I41743f47,I22577615,I46f806a8,Icaa1df2e
* changes:
  Put client logs into SharedLog and dump more logs
  Record Advertiser history logs for better debugging
  Record SocketProvider history logs for better debugging
  Record DiscoveryManager history logs for better debugging
2023-04-18 01:14:39 +00:00
Treehugger Robot
8a54f204d6 Merge "Only send resolve callbacks for subscribed service" 2023-04-17 13:16:15 +00:00
Jean Chalard
52c215bbc7 Merge "Cleanup : don't mix seconds and milliseconds in retry delays" 2023-04-17 10:01:56 +00:00
Remi NGUYEN VAN
8a41185ce6 Only send resolve callbacks for subscribed service
Resolve callbacks should only be sent for the service name that was
requested.

Bug: 267570781
Test: atest MdnsServiceTypeClientTests
Change-Id: I3d8eb5c06bcf54312e20a39b8575555d40528bca
2023-04-17 18:55:36 +09:00
Hansen Kurli
c25133a38b Refactor buildKeepaliveMetrics to return DailyKeepaliveInfoReported
This also updates the tests and prepares them to assert the other fields
of DailyKeepaliveInfoReported. Currently, only DurationPerNumOfKeepalive
is asserted.

Bug: 273451360
Test: atest FrameworksNetTests
Change-Id: I727849fa8a08d66fe276909b353a75861c23d775
2023-04-17 08:15:28 +00:00
Hansen Kurli
a27bc2c913 Create KeepaliveStatsTracker for Duration metrics.
Create a new class to store duration metrics of AutomaticOnOffKeepalives
for the DurationPerNumOfKeepalive proto.
This tracks the duration of time that the AutomaticOnOffKeepaliveTracker
contains a given number of concurrent keepalives and the duration of
time that it contains a given number of active concurrent keepalives.

Bug: 273451360
Test: atest FrameworksNetTests
Change-Id: If31ccbc7b02e6ad3ff1646e92e55ca7c8662e47c
2023-04-17 08:14:29 +00:00
Paul Hu
1571df639a Record Advertiser history logs for better debugging
Log:
  2023-04-12T20:00:18.100961 - Removing service with ID 2
  2023-04-12T20:00:17.173904 - [wlan0] Probing finished for service 2
  2023-04-12T20:00:17.147089 - [testtap1] Probing finished for service 2
  2023-04-12T20:00:17.074575 - [testtap0] Probing finished for service 2
  2023-04-12T20:00:16.249636 - Adding service name: ^Nsd.Test|Non-#AsCiI\Characters&\ufffe テスト 測試, type: _nmt950580894._tcp, hostAddresses: , port: 12345, network: null, txtRecord:  with ID 2

Test: atest FrameworksNetTests android.net.cts.NsdManagerTest
Bug: 275004614
Change-Id: I22577615b0b2c212c0a4349a06ef3c75239a5651
2023-04-17 15:38:28 +08:00
Paul Hu
d74697aa96 Record DiscoveryManager history logs for better debugging
Log:
  2023-04-17T15:05:28.428369 - Unregistering listener for serviceType:_nmt274981618._tcp.local
  2023-04-17T15:05:28.228777 - [_nmt274981618._tcp.local-102] onServiceFound: ^Nsd.Test|Non-#AsCiI\Characters&\ufffe テスト 測試
  2023-04-17T15:05:28.227786 - [_nmt274981618._tcp.local-102] onServiceNameDiscovered: ^Nsd.Test|Non-#AsCiI\Characters&\ufffe テスト 測試
  2023-04-17T15:05:27.409364 - createServiceTypeClient for serviceType:_nmt274981618._tcp.local network:103
  2023-04-17T15:05:27.409104 - createServiceTypeClient for serviceType:_nmt274981618._tcp.local network:102
  2023-04-17T15:05:27.407701 - createServiceTypeClient for serviceType:_nmt274981618._tcp.local network:101
  2023-04-17T15:05:27.398075 - Registering listener for serviceType: _nmt274981618._tcp.local

Test: atest FrameworksNetTests android.net.cts.NsdManagerTest
Bug: 275004614
Change-Id: Icaa1df2e7019e5cce1b4eca7edcb4a761b7b20cf
2023-04-17 15:30:42 +08:00
Jean Chalard
2c930437e9 Merge "Test that VPN lockdown restarts the VPN agent." 2023-04-17 05:38:54 +00:00
Jean Chalard
ca35653803 Merge "Add test for updating IKE about IP address changes" 2023-04-17 05:36:35 +00:00
Jean Chalard
6213d571a8 Merge "Adjust tests for delay in restarting/migrating IKE" 2023-04-17 05:35:21 +00:00
Chiachang Wang
2cf6b2c4fd Merge "Separate events usage for starting socket keepalives" 2023-04-17 02:32:00 +00:00