Commit Graph

969 Commits

Author SHA1 Message Date
Treehugger Robot
02a5082250 Merge "[TestOnly]Remove RemoteResponder from TetheringTester" am: e236ea7c63 am: 5113e59c31
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2115077

Change-Id: Ia2b5b1d74dca100173f1ddd5f7523672e39d7032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 12:40:43 +00:00
Mark
01971ad969 [TestOnly]Create TetheringTester in initTetheringTester
If tethering's upstream have ipv6, the #initTetheringTester
would make sure ipv6 tethering connectivity is ready for testing.

Test: atest EthernentTetheringTest

Change-Id: Iade99eeb95fa94483248799eb852a81662bbb1e0
2022-06-13 09:01:53 +00:00
Mark
73284988cd [TestOnly] Move isExpectedUdpPacket into TetheringTester
isExpectedUdpPacket and isIcmpv6Type is similar util, put them in the
same place and have isExpectedIpPacket to share the ip/eth parsing code.

Test: atest EthernetTetheringTest
Change-Id: I3ede46f5ff1799f575fad7aca277f2bc0bf6c391
2022-06-13 09:01:42 +00:00
Mark Chien
03693623c1 [TestOnly]Remove RemoteResponder from TetheringTester
This is no-op change. Originally RemoteResponder design for providing a
base responder that user could extend it like DnsServerResponder,
TcpResponder, UdpResponder. But actually user could just simply extend
TetheringTester that make RemoteResponder useless. Thus, remove it to
simply the code.

Test: atest EthernetTetheringTest
Change-Id: I47b22a1460ca312c678778143033aadf5e3e0b82
2022-06-13 09:00:27 +00:00
Mark Chien
4b5dcd42ab Merge "[TestOnly] Replace isRouterAdvertisement with isIcmpv6Type" am: 4fcf168399 am: 1d5d7a3baf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116177

Change-Id: Id2285c2a50520f464911f3c5c7010e39781a77a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:46:16 +00:00
Mark Chien
4fcf168399 Merge "[TestOnly] Replace isRouterAdvertisement with isIcmpv6Type" 2022-06-08 02:15:53 +00:00
Mark
6078d6edd6 [TestOnly] Replace isRouterAdvertisement with isIcmpv6Type
Test: atest EthernetTetheringTest
Change-Id: I5dca7a05a982139d8fc6f8272c8b829b74a34722
2022-06-07 15:29:34 +00:00
Treehugger Robot
aa4879b4b3 Merge changes from topic "roll_forward_testtetherclatudp" am: 9b51a75d6e am: 6fb9ac709c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116174

Change-Id: I6ad9045aa021ae791fadd925c27734de8871677a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 08:00:20 +00:00
Remi NGUYEN VAN
9f4f196731 Merge "Revert "EthernetTetheringTest: add testTetherClatUdp"" am: a100d7c51e am: 8006de1eca
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2116153

Change-Id: I8e23bf28787176ef556db067245e0af0215a6b50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 03:49:14 +00:00
Remi NGUYEN VAN
8b56874caa Skip testTetherClatUdp before S
The test does not pass on R.

Bug: 234727688
Test: atest EthernetTetheringTest
Change-Id: I831859e521b026ed4acb84de5857a7d3ec318ba5
2022-06-03 12:04:23 +09:00
Remi NGUYEN VAN
e78cfa130b Revert "Revert "EthernetTetheringTest: add testTetherClatUdp""
This reverts commit 5bbd292bed.

Bug: 215655463
Change-Id: I06490001b06446b6a4ff3dc084ce11e8ebbe17f8
Test: atest ConnectivityCoverageTests
2022-06-03 02:55:26 +00:00
Remi NGUYEN VAN
5bbd292bed Revert "EthernetTetheringTest: add testTetherClatUdp"
This reverts commit b0274cf796.

Reason for revert: Breaks presubmit: b/234727688

Change-Id: I736752dca3707588a525f28d208bdb20f7280972
2022-06-03 02:32:48 +00:00
Treehugger Robot
d755b3e4d8 Merge "EthernetTetheringTest: add testTetherClatUdp" am: 8968739285 am: 8b3ac26c18
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2110088

Change-Id: I35f183f4d94d36a0bece972b80b9e80e42b266cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 06:27:51 +00:00
Hungming Chen
b0274cf796 EthernetTetheringTest: add testTetherClatUdp
Bug: 215655463
Test: atest ConnectivityCoverageTests
Change-Id: Id5d237b96b1d171c1e353cfd0aeba5aa4606fcc7
2022-06-02 12:07:13 +08:00
Mark Chien
be6a57ba53 Merge "Add tethering icmpv6 forwarding test" am: 86a800f911 am: 2afb2c4c35
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1817920

Change-Id: I70ee7712a2d8394153df23feeab982dde6e1202d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 16:10:05 +00:00
Mark Chien
86a800f911 Merge "Add tethering icmpv6 forwarding test" 2022-06-01 15:15:37 +00:00
Treehugger Robot
7e2353413f Merge "Bump tethering target sdk to 33" am: d10244feb8 am: 7462a6ce66
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2100995

Change-Id: I23e72a0ad93e21dcbcbd059fecc09334a24a1a11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01 09:09:31 +00:00
Treehugger Robot
d10244feb8 Merge "Bump tethering target sdk to 33" 2022-06-01 08:57:46 +00:00
markchien
a40f2fe746 Add tethering icmpv6 forwarding test
Bug: 183166581
Test: atest EthernetTetheringTest

Change-Id: I77ad4a468530f3ef834cd7b72e585798a23f64c3
2022-05-31 23:53:47 +08:00
Mark Chien
d25a1e05ae Bump tethering target sdk to 33
Note: to avoid missing some dependeices change only happen in T+, below
testing verification is perform by internal branch.

Test: atest TetheringTests
      atest TetheringIntegrationTests
      atest CtsTetheringTest
      atest MtsTetheringLatestSdk
      manually change entitlement check recheck period to 1 min and
      monitor schedule alarm works.
      Dogfood this change personally 7 days, major use hotspot sharing network to notebook to work.
Bug: 232193147
Change-Id: I3cba98f42ac1a9c0c1db4b2ad036aff714a428f3
2022-05-31 03:31:18 +00:00
Treehugger Robot
dbdb3adc2e Merge "Test testTetherUdpV4AfterR only verify bpf in precise kernel range" am: 875daa69eb am: e714310a20
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2108068

Change-Id: I7098539cba5880b984a9569c54e6e4d5adb85f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 19:39:17 +00:00
Treehugger Robot
875daa69eb Merge "Test testTetherUdpV4AfterR only verify bpf in precise kernel range" 2022-05-27 19:03:58 +00:00
Hungming Chen
d7e713283d Test testTetherUdpV4AfterR only verify bpf in precise kernel range
Use three-part kernel version numbers to check which device
needs to verify BPF offload. Only check major and minor number
is not enough. Ex: mixed build T + R may have an unsupported kernel
version 4.19.160 (require 4.19.176+). Now check the subminor
number as well.

For UDPv4 support, kernel require 4.14.222+ 4.19.176+ 5.4.98+, 5.8.0+

Test: atest EthernetTetheringTest (raven @ internal master build)
Test: cts test (bramble @ T + R mixed build)
> run cts-on-gsi -m CtsTetheringTest -t android.net.EthernetTetheringTest#testTetherUdpV4AfterR

Bug: 232332847
Change-Id: I466df73b0fa35b086a2c5e11f8624c84eb79c8fd
2022-05-27 22:15:24 +08:00
Frank
36987d5012 Fix incorrect sdk version check in SCV2 device test am: a632356e05 am: 6bfe9da357
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2103110

Change-Id: Ia7135ca84674e165d0aebd7775342762c7c89cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 11:20:28 +00:00
Frank
a632356e05 Fix incorrect sdk version check in SCV2 device test
Test: atest ConnectivityCoverageTests:com.android.networkstack.tethering.OffloadControllerTest
Bug: 229190480
Change-Id: I4e37a9d6634daac14ef41ab30ab986b2e96dacd4
2022-05-24 13:55:03 +08:00
Maciej Żenczykowski
dfd4f7e995 Merge "fix BpfMapTest" am: e273ba1e21 am: defa8c5779
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2097896

Change-Id: I52525ae5be08ffe8333efe97a85cc639fbaef4e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:16:34 +00:00
Maciej Żenczykowski
e273ba1e21 Merge "fix BpfMapTest" 2022-05-20 07:44:13 +00:00
Mark Chien
c488884b22 Merge "Fix testUpdateConnectedClientsForLocalOnlyHotspot" am: ee0cc41eaa am: 27ab38119f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2098557

Change-Id: I121f58482b6d96f33abea3260b8da27d587fb29f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 15:58:04 +00:00
Mark Chien
7e4eab5153 Fix testUpdateConnectedClientsForLocalOnlyHotspot
testUpdateConnectedClientsForLocalOnlyHotspot should not run before T,
but it don't be ignored correctly because missing DevSdkIgnoreRule
setup.

Bug: 233077722
Test: TH
Change-Id: Ib2d241f927ccdc5d2bc392962481ecb86a223e09
2022-05-19 21:14:21 +08:00
Mark Chien
ebc8f4385f Merge "Register localOnly softapCallback for local only hotspot" am: 46c86bbf82 am: de9fcec3fb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930828

Change-Id: Idefc21b22f818ba14020b7278c1d40fe7813ee5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-17 23:10:47 +00:00
Mark Chien
46c86bbf82 Merge "Register localOnly softapCallback for local only hotspot" 2022-05-17 09:07:38 +00:00
Mark Chien
320fa0cf23 Merge "Prepare for refactoring wifi ipserver start/stop" am: bf9d2fc1fe am: 29b83cb26e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2073647

Change-Id: I9eb34fc7833e5c6329d325c1eb7848dd1ab02cf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-17 03:51:02 +00:00
markchien
f2e9409f55 Prepare for refactoring wifi ipserver start/stop
This is a preparing change.
1) In enableWifiIpServing, replace
   ensureIpServerStarted(ifname) +
   changeInterfaceState(ifname, ipServingMode)
   with enableIpServing(TETHERING_WIFI, ifname, ipServingMode).

   And checking whether corresponding wifi or p2p feature is
   avaialble before enableWifiIpServing. Note: If the wifi or p2p
   feature wasn't supported before, it would still call
   changeInterfaceState without ipServer created but
   changeInterfaceState would be no-op because there is no
   corresponding ipServer for changing state.

2) Splitting enableWifiIpServing into enableWifiIpServing and
   enableWifiP2pIpServing.

3) No longer guess the interface name after T. WIFI_AP_STATE_CHANGED
   intent should always include ifname and it should be tracked by
   mTetherStates. If OEM have modification in wifi framework to send
   empty ifname, tethering no longer support this after T.

4) After T, tethering always trust the ifname which pass by wifi or p2p
   intent broadcast and treat it as TETHERING_WIFI or
   TETHERING_WIFI_P2P. This allow tethering to deprecate wifi/p2p regexs
   after T.

Bug: 189410000
Bug: 178116595
Bug: 185451791
Bug: 190145323
Bug: 176048959

Test: atest TetheringTests

Change-Id: Ia5f69ddf2d842536ce0df75eeae57866f56df571
2022-05-16 21:17:40 +08:00
markchien
4ccb419602 Register localOnly softapCallback for local only hotspot
Before T, wifi local only mode won't update onConnectedClientsChanged.
To support updating tethered client information for localOnly hotspot,
register localOnly softap callback to get connected wifi client update.

Bug: 171928468
Test: atest TetheringTests

Change-Id: I0e974feea9497809ea02a4138c7b9c2c584a8a45
2022-05-16 15:09:10 +08:00
Treehugger Robot
f75d94f614 Merge changes from topic "tethering_metrics" am: 42f38d0bdf am: 329aa8c631
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2024490

Change-Id: Ic241379fb7bf873798fcfdbd31981cbe8c63d950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 06:12:52 +00:00
Treehugger Robot
42f38d0bdf Merge changes from topic "tethering_metrics"
* changes:
  Add tethering stats into statsd
  Injecting tethering stats into statsd
2022-05-16 05:06:01 +00:00
Maciej Żenczykowski
4426a84111 fix BpfMapTest
to account for close() becoming a no-op

Bug: 230880517
Test: TreeHugger, atest com.android.networkstack.tethering.BpfMapTest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I69f25ff168c1cf0f13434dd1d842ed81a6a03f2f
2022-05-13 14:59:13 +00:00
Nucca Chen
e760bebc22 Merge changes from topic "wrap_fd_to_parcelfiledescriptor" am: f889ed7a30 am: bd75774f51
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2095630

Change-Id: I6cbc0cf83766a0ba42db6119200197b5b9caf809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 14:28:44 +00:00
Wayne Ma
6cd440fedd Add tethering stats into statsd
Bug: 153942334
Test: atest TetheringTest IpServerTest
Test: Manual test with statsd_testdrive
Change-Id: I7205bb24dd30ba78b79bc352034da299d452750f
2022-05-12 17:21:11 +08:00
Hungming Chen
374107963a Catch new exceptions from BpfMap
Bug: 230880517
Test: atest FrameworksNetTests
Change-Id: I9eff2589f83ac109fb6e8b9906da05890daa9bd9
2022-05-12 14:13:01 +08:00
Wayne Ma
7ecded8248 Injecting tethering stats into statsd
Fill in downstream type, upstream type, error code and user type to NetworkTetheringReported.

Bug: 153942334
Test: m, flash and boot
Test: atest TetheringMetricsTest
Change-Id: I6ba7d9e512b1ada519f44f9f3a95667e4b0f03c0
2022-05-09 19:35:53 +08:00
Hungming Chen
816166a4b0 Ignore UDP offload test on kernel which is older than 4.14 am: 08c48a3dff am: c2eee9d522
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2077738

Change-Id: I1ef6c904768c3b44e80a39a6ad0dc4fd76c4b74e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 13:10:49 +00:00
Hungming Chen
08c48a3dff Ignore UDP offload test on kernel which is older than 4.14
Kernel version which is older than 4.14 doesn't support UDP offload
absolutely. Kernel version which is between 4.14 and 5.8 support UDP
offload probably. Simply set kernel 4.14 to be threshold first and
monitor on what devices tests fail for improving the offload support
checking.

Also fix a minor bug which UDP tethering without offload is not tested
on R.

Bug: 230359047
Test: atest EthernetTetheringTest
Change-Id: Ieb181d1b5ed67b922e18ce77a9c96208b2984d10
2022-05-05 09:35:00 +00:00
Tom Hsu
c83fee7adb Merge "[Tetheirng] Refactor carrier config to EntitlementManager" am: 1135676150 am: 4ba3a8a6fb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2033668

Change-Id: I3b84544de9942b14bc2e2eb6d80c7eddc7edb916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 14:27:04 +00:00
Tom Hsu
1135676150 Merge "[Tetheirng] Refactor carrier config to EntitlementManager" 2022-04-21 13:43:14 +00:00
tom hsu
f0d60e9902 [Tetheirng] Refactor carrier config to EntitlementManager
- To reduce CarrierConfigManager access times, move CarrierManager
  to TetheringConfiguration.

Bug: 225900149
Test: atest EntitlementManagerTest pass
Test: atest TetheringConfigurationTest pass
Change-Id: I5b206e2bc012cbbca26fb1e5c72558383981f183
2022-04-21 12:44:26 +08:00
Treehugger Robot
d045068993 Merge "Add bpf forwording packet count test" am: faaaffc8a0 am: fecd68796d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2055845

Change-Id: Icac6c356ac0b9adf95bd2aae12a49cfe4dd67832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 12:33:28 +00:00
Hungming Chen
ca3911831b BpfCoordinator: Add an option to choose which raw bpf map to dump am: e4a6b28938 am: 9f5ffc3304
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2054365

Change-Id: I721cefd5e275b39f34e0e20d9f979647140af8f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 11:27:31 +00:00
Hungming Chen
e32dbded7c Add bpf forwording packet count test
- Add dumpsys option to dump stats map in BpfCoordinator
- Add stats test to check bpf forwording packet count in
  EthernetTetheringTest

Bug: 227159997
Test: atest TetheringCoverageTests
Change-Id: I177787ed0c28ebe137ff1431f40a23b1e4b22a19
2022-04-20 08:54:08 +00:00
Hungming Chen
e4a6b28938 BpfCoordinator: Add an option to choose which raw bpf map to dump
Make that tethering dumpsys can choose which map to dump.
The related functions in BpfCoordinator and its test are refactored
into template functions. This is used in the following commits which
will dump stats map for testing.

Bug: 227159997
Test: atest TetheringCoverageTests

Change-Id: I23d747543d16a971773c132b60227eb3f42efe25
2022-04-20 15:58:47 +08:00