Commit Graph

92711 Commits

Author SHA1 Message Date
Maciej Żenczykowski
2c337c22b6 Merge "Add java class for Ingress discard bpf map key value" into main am: 8bc6ee5b7a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2795708

Change-Id: Ife0df1d8a10d760dfab8989c7eb69ab3203307a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 19:47:18 +00:00
Maciej Żenczykowski
8bc6ee5b7a Merge "Add java class for Ingress discard bpf map key value" into main 2023-10-27 19:13:52 +00:00
Jean Chalard
440061a46b [automerger skipped] Merge "Cleanup modifyRoutes" into main am: 9fea45db05 -s ours
am skip reason: Merged-In Ief0a79883bcc2c5493807c548cb71ef655abed23 with SHA-1 6473aede2e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2786323

Change-Id: I36c310f68bf508ff6538fbe0ace563b0a82fe72c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 13:29:54 +00:00
Chalard Jean
794114748d [automerger skipped] Cleanup modifyRoutes am: ac5e4cf025 -s ours
am skip reason: Merged-In Ief0a79883bcc2c5493807c548cb71ef655abed23 with SHA-1 6473aede2e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2786323

Change-Id: I6ee4dc699e3526b950bbebe25178602db3206e12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 13:29:51 +00:00
Jean Chalard
9fea45db05 Merge "Cleanup modifyRoutes" into main 2023-10-27 13:11:29 +00:00
Mark Chien
b0f248de62 Merge changes Ibe22b300,I0b0f0bf1 into main am: 2c7e2b8448
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2752266

Change-Id: Ie9d1c973962baaec61d918364afb8facb7064983
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 09:05:03 +00:00
Mark Chien
2c7e2b8448 Merge changes Ibe22b300,I0b0f0bf1 into main
* changes:
  SyncSM08: handle IpServer requestEnableTethering callback in mainSM
  SyncSM07.1: Add a test that shows tethering restarts when disabling
2023-10-27 08:50:04 +00:00
KH Shi
00567ba114 Merge "Pass upstream prefixes to bpf tethering offload" into main am: f92d211c71
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2600306

Change-Id: I5ebfdfed61680b44ee63c96eb445ae6bc81a1a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 07:38:30 +00:00
KH Shi
f92d211c71 Merge "Pass upstream prefixes to bpf tethering offload" into main 2023-10-27 07:23:52 +00:00
Chalard Jean
ac5e4cf025 Cleanup modifyRoutes
This is no longer used out of this file, and should not be.

Test: Build
Change-Id: I531191b4afbda39a5fbaf1f483d13068f86d17f1
Merged-In: Ief0a79883bcc2c5493807c548cb71ef655abed23
2023-10-27 06:53:36 +00:00
Jean Chalard
8b7208a8a5 Merge "Add forwarding methods to RoutingCoordinator" into main am: 23376e6fe7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2777668

Change-Id: Ib89b987a8d9a5e9b133bbff7333f8296af3e477f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 05:42:04 +00:00
Jean Chalard
23376e6fe7 Merge "Add forwarding methods to RoutingCoordinator" into main 2023-10-27 05:12:07 +00:00
Patrick Rohr
b6f136c461 Merge "Add public getter for IpPrefix" into main am: 149868f1b1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2802926

Change-Id: Ib61c3a25ae25c83707ef7126d1907c5931a7d762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 18:39:47 +00:00
Patrick Rohr
149868f1b1 Merge "Add public getter for IpPrefix" into main 2023-10-26 18:21:07 +00:00
Mark Chien
38a3026a73 Merge changes I34903b57,Ic818aa55 into main am: a055890412
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2356843

Change-Id: I0bd19c8e025bd30cdb7d518dda689b40bf0550f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 17:16:39 +00:00
Mark Chien
a055890412 Merge changes I34903b57,Ic818aa55 into main
* changes:
  SyncSM07: Replace IpServer's state machine with StateMachineShim
  SyncSM06: Add StateMachineShim
2023-10-26 16:44:44 +00:00
Treehugger Robot
d3403657df Merge "Support NetworkStatsEventLogger" into main am: aacd7d8d8c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2764848

Change-Id: I3cea9eb3db6244494b79b7eb8adbcba0e77a0208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:33:52 +00:00
Treehugger Robot
aacd7d8d8c Merge "Support NetworkStatsEventLogger" into main 2023-10-26 14:17:21 +00:00
KH Shi
3f738fcd3d Pass upstream prefixes to bpf tethering offload
BPF needs upstream prefixes information to filter spoofing IPv6 source
addresses carried in downstream traffic.

We retrieve prefixes from upstream interface's LinkProperties and pass
it to the BpfCoordinator. Forwarding rules will also be updated when
upstream interface's IPv6 link addresses change.

Test: atest TetheringTests
Bug: 261923493
Change-Id: If8cfc3b191e520ca838654d1b5211ab9e9ec021d
2023-10-26 13:13:38 +00:00
Chalard Jean
55ccfe19e2 Add forwarding methods to RoutingCoordinator
Test: RoutingCoordinatorServiceTest
      TetheringTest
Change-Id: Ic3b36ddc236e8615e7d931b6e526556bbd2dac17
2023-10-26 20:18:48 +09:00
Mark
5cc386bdef SyncSM08: handle IpServer requestEnableTethering callback in mainSM
This can make it easier to adopt SM shim replacement in follow up change,
as both SyncSM and AsyncSM will process the same message without any
difference.

This change also fix a problem that bring up downstream before it's
IpServer completely disabled.

Previous:
CMD_NOTIFY_PREFIX_CONFLICT -> requestEnableTethering(false) ->
requestEnableTethering(true) -> IpServer stopped ->
reportTetherStateChanged(downstream inactive) -> IpServer started
-> reportTetherStateChanged(downstream active)
New:
CMD_NOTIFY_PREFIX_CONFLICT -> requestEnableTethering(false) ->
IpServer stopped -> reportTetherStateChanged(downstream inactive)
-> requestEnableTethering(true) -> IpServer started
-> reportTetherStateChanged(downstream active)

Test: atest MtsTetheringTestLatestSdk
Change-Id: Ibe22b300c56125359f4fa452bd01a0a2381fda23
2023-10-26 09:28:22 +00:00
Mark
d81f6ef4db SyncSM07.1: Add a test that shows tethering restarts when disabling
When tethering restarts due to an IP conflict, it starts to
bring up downstream before its IpServer is completely disabled.

Test: atest TetheringTests
Change-Id: I0b0f0bf1bb9ac8421c05fe512d5082d095fa7180
2023-10-26 09:26:37 +00:00
Mark
2150296476 SyncSM07: Replace IpServer's state machine with StateMachineShim
A simple replacement without changing any behavior.

Test: atest TetheringTests
Change-Id: I34903b57df68081e974163edec82a851ee4ccc98
2023-10-26 09:26:15 +00:00
Mark
2ec1595d0b SyncSM06: Add StateMachineShim
Test: atest StateMachineShimTest

Change-Id: Ic818aa55e7e0fd7a62dfce50a6ad719e6e1c44ec
2023-10-26 09:24:55 +00:00
Krzysztof Kosiński
c3dd51a4a3 Merge "Clean up obsolete aliases for Truth." into main am: 93196302b1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2804893

Change-Id: I47c52234a2c1aa4d50f9610015f375c7759df99c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 09:09:58 +00:00
Kangping Dong
dbe776d5e4 Merge "[Thread] graduate CtsThreadNetworkTestCases from postsubmit" into main am: 24ae5c2d06
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2804113

Change-Id: I99c9ad911c0cc2a4e7ca8f658fca19a7ea9ed3b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 09:09:46 +00:00
Krzysztof Kosiński
93196302b1 Merge "Clean up obsolete aliases for Truth." into main 2023-10-26 09:07:59 +00:00
Kangping Dong
24ae5c2d06 Merge "[Thread] graduate CtsThreadNetworkTestCases from postsubmit" into main 2023-10-26 08:48:27 +00:00
Kangping Dong
d2844e61de Merge "[Thread] make the Manager and Controller class 'final'" into main am: 077e444720
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2793232

Change-Id: Idd17d19d7cdf5f38d77d2df8c0cd26fb20c53d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 07:48:37 +00:00
Kangping Dong
077e444720 Merge "[Thread] make the Manager and Controller class 'final'" into main 2023-10-26 07:18:06 +00:00
Krzysztof Kosiński
4656f54cdd Clean up obsolete aliases for Truth.
Bug: 255714762
Test: presubmit
Change-Id: I1a6394f6ff1cd56fac0f7a340857fdaee92fcbab
2023-10-26 07:13:22 +00:00
Motomu Utsumi
d4fe2c3a50 Add java class for Ingress discard bpf map key value
Bug: 295800201
Test: TH
Change-Id: Ic9ac423aee2a8fb9709b0acf012ec57cdfa019f9
2023-10-26 15:48:22 +09:00
Maciej Żenczykowski
99421e4327 Merge "move convenience methods from BpfMap to IBpfMap" into main am: ad3badf7a8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2802923

Change-Id: I06c7dba084c725edbe6b40d49cd22ee58234cc3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 23:21:34 +00:00
Maciej Żenczykowski
dbf8d3025e Merge "remove dead portions of BpfUtils.java" into main am: bee431759a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2803204

Change-Id: Ib920e77884fb0d1d88d45c93a84cbd19b7244484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 23:21:24 +00:00
Maciej Żenczykowski
ad3badf7a8 Merge "move convenience methods from BpfMap to IBpfMap" into main 2023-10-25 22:54:04 +00:00
Maciej Żenczykowski
bee431759a Merge "remove dead portions of BpfUtils.java" into main 2023-10-25 22:53:49 +00:00
Xinyi Zhou
ec96e74b3d Merge "[nearby] Enable BLE when init" into udc-mainline-prod 2023-10-25 22:47:53 +00:00
Patrick Rohr
6f0dc0dc95 Add public getter for IpPrefix
Test: TH
Change-Id: I8d2c8e1a6b76f04257f2137c1ce893b59e52e420
2023-10-25 15:32:06 -07:00
Maciej Żenczykowski
17e132dd71 Merge "netbpfload: prep work to support <U" into main am: 906cac004f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2803009

Change-Id: I771c53099f9845104073efa5503a437225c98f78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 21:33:32 +00:00
Maciej Żenczykowski
906cac004f Merge "netbpfload: prep work to support <U" into main 2023-10-25 21:14:08 +00:00
Maciej Żenczykowski
74641d82c4 move convenience methods from BpfMap to IBpfMap
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I5f4ee8bdc3aaff1f306a36126e6e812b486e312b
2023-10-25 11:51:40 -07:00
Maciej Żenczykowski
f33f12876f netbpfload: prep work to support <U
proc file writes were only moved from .rc into bpfloader binary in U.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I20eda71d4f4e16130401d1cfff239c7cd8ea9bf6
2023-10-25 18:40:53 +00:00
Maciej Żenczykowski
de9d367ab2 remove dead portions of BpfUtils.java
(mostly to improve code coverage)

We can always revert if it ever turns out this is useful,
but I'd prefer for cgroup attach to be a once-at-boot
thing and handled either from bpfloader or the netd updatable
which are both directly C++ code.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I79b5ca8a47388cb6b9189234942e74ab6056aab9
2023-10-25 17:40:35 +00:00
Kangping Dong
706c234aeb [Thread] graduate CtsThreadNetworkTestCases from postsubmit
Bug: 297729075
Test; build and pass the presubmit

Change-Id: Ie90fd5dfd1d77ed45b39c527d37954f5ff6facd8
2023-10-25 22:38:00 +08:00
Kangping Dong
5e1d430d33 [Thread] make the Manager and Controller class 'final'
Per the API review council, the classes should be "final" by default

Bug: 301076593
Test: build && atest CtsThreadNetworkTestCases
Change-Id: I85f0b4fabe5b1bcec2be052620b38a07c58181d7
2023-10-25 22:03:11 +08:00
Kangping Dong
f96201be45 Merge "[Thread] add Thread Operational Dataset API" into main am: 898ed69359
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2733453

Change-Id: I1dceffe4b1bc0339ee2f6c2b348a740c1813d447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 12:48:29 +00:00
Kangping Dong
898ed69359 Merge "[Thread] add Thread Operational Dataset API" into main 2023-10-25 12:24:16 +00:00
Junyu Lai
41b37349f3 Support NetworkStatsEventLogger
The performPoll method in the NetworkStatsService can be called
for many reasons, such as RAT changed events, LinkProperties
changed events, open session method calls, forceUpdate method
calls, etc.
However, the current logging is not sufficient to trace down
the caller of performPoll. This makes it difficult to debug
frequent poll issues or performance problems.

Adding debug log to logcat is not an option, given that
performPoll might run several times per second by system server
callers.

This change adds a reason code to the performPoll method and
a helper class to log performPoll events. This will allow us
to track down the caller of performPoll and better understand
why it is being called frequently or causing performance
problems.

This change also introduces a PollEvent object, which can be
used to put related information in subsequent changes when
logging.

Sample output:
Poll counts per reason:
  DUMPSYS: 0
  FORCE_UPDATE: 6
  GLOBAL_ALERT: 0
  NETWORK_STATUS_CHANGED: 3
  OPEN_SESSION: 0
  PERIODIC: 1
  RAT_CHANGED: 1
  REG_CALLBACK: 3
  REMOVE_UIDS: 0
  UPSTREAM_CHANGED: 1

Recent poll events:
  2023-10-04T02:47:12.937370 - Poll(flags=3, PollEvent{reason=REG_CALLBACK})
  2023-10-04T02:47:13.178559 - Poll(flags=3, PollEvent{reason=FORCE_UPDATE})

Test: manual
Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.net.NetworkStatsEventLoggerTest
Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.net.NetworkStatsServiceTest
Bug: 301141955
Change-Id: Ic6d0543ccdef12493385f45200199854b841a26b
2023-10-25 19:23:35 +08:00
Kangping Dong
7fea5fa6a2 [Thread] add Thread Operational Dataset API
Design doc: go/thread-android-api
Android FR: b/235016403

Bug: 262683651
Change-Id: Icbd4ee4150e3fd78df627c2e726c259e7ee50871
2023-10-25 18:13:07 +08:00
Jean Chalard
5b0ebeabeb Merge "Add a routing coordinator class" into main am: 4e47533688
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2729133

Change-Id: Ibadbe0c4cf62a148d7051a162bfd86a3b047252e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 09:46:03 +00:00