Treehugger Robot
55e1cc23c6
Merge "fix TetheringCoverageTests" am: 6fc8229f16 am: 31ce8ad94d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1584755
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If61cbbe8729451b53aea976540d388868cdde01a
2021-02-12 05:48:49 +00:00
Lorenzo Colitti
c2717c6242
Merge changes I71a37663,Ib2010b38 am: fd710547b2 am: c241c0f4f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1583023
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idfc4f1cc18e5e535c35e6738e6a4322866c03a17
2021-02-12 05:47:56 +00:00
Treehugger Robot
31ce8ad94d
Merge "fix TetheringCoverageTests" am: 6fc8229f16
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1584755
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I89847f05774cb37ec76fd57938d8bcf1e3a4f397
2021-02-12 05:24:52 +00:00
Lorenzo Colitti
c241c0f4f3
Merge changes I71a37663,Ib2010b38 am: fd710547b2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1583023
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iefd7946816067ed9279f26e48d86934db54056ce
2021-02-12 05:17:01 +00:00
Treehugger Robot
6fc8229f16
Merge "fix TetheringCoverageTests"
2021-02-12 03:17:51 +00:00
Lorenzo Colitti
fd710547b2
Merge changes I71a37663,Ib2010b38
...
* changes:
Improve testing of registerSystemDefaultNetworkCallback.
Remove buggy ConnectivityManagerTest#ensureWifiConnected.
2021-02-12 02:45:02 +00:00
Maciej Żenczykowski
c92e8ce636
fix TetheringCoverageTests
...
Test: atest TetheringCoverageTests now passes, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: I0d83de14784f323400a83ce282cae1a3e7b4b396
2021-02-11 16:06:46 -08:00
Daulet Zhanguzin
66d9e9aa2c
Merge "Run Connectivity cts tests against unbundled version of BouncyCastle" am: e1f96f3c35 am: c9bee74abd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580048
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ida4fef6fdc927a2b9a7547bd1eaf509fa725b0aa
2021-02-11 15:53:23 +00:00
Daulet Zhanguzin
c9bee74abd
Merge "Run Connectivity cts tests against unbundled version of BouncyCastle" am: e1f96f3c35
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580048
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibbd2aad92bb7fe3fd09de99d82dbb1178daef43c
2021-02-11 15:05:16 +00:00
Daulet Zhanguzin
e1f96f3c35
Merge "Run Connectivity cts tests against unbundled version of BouncyCastle"
2021-02-11 14:44:06 +00:00
Sudheer Shanka
809cbfe9ff
Update the way we change meteredness of cellular networks in tests. am: 37c10a2252 am: 4fbac43be8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1582844
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3e97dc0ccf37c39df9fee74bee8d04f5d226af24
2021-02-10 17:04:26 +00:00
Sudheer Shanka
4fbac43be8
Update the way we change meteredness of cellular networks in tests. am: 37c10a2252
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1582844
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id7eb095710da17da8a6e7785051029d81a64ac7d
2021-02-10 16:42:32 +00:00
Sudheer Shanka
37c10a2252
Update the way we change meteredness of cellular networks in tests.
...
SubscriptionManager.setSubscriptionOverrideUnmetered() has been updated
to add NET_CAPABILITY_TEMPORARILY_NOT_METERED instead of
NET_CAPABILITY_NOT_METERED. So, we can't rely on that for changing the
meteredness.
Bug: 179664982
Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java
Change-Id: I4163b2f9c6f80b4e639d9977ef7e2b444ab12e81
Merged-In: I4163b2f9c6f80b4e639d9977ef7e2b444ab12e81
2021-02-10 14:05:09 +00:00
Lorenzo Colitti
baea700554
Improve testing of registerSystemDefaultNetworkCallback.
...
Addresses comments on aosp/1570840.
Bug: 179774433
Test: test-only change
Change-Id: I71a376631503e5b50ada3f7bb3dca6dbae9ebc27
2021-02-10 22:41:48 +09:00
Lorenzo Colitti
f5d2df925e
Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo" am: 43b96c711b am: 2d109b3909
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1574260
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id8822fe3e2e2e2a0c3a290a61df28cb92a63f029
2021-02-10 07:20:31 +00:00
Lorenzo Colitti
eb54554df9
Add CTS coverage for VpnTransportInfo. am: e9aeb3c1c5 am: fc5b95502b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1570841
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I46ac659c13f40d59a304bfd2931e0306d5704c2c
2021-02-10 07:20:30 +00:00
Lorenzo Colitti
c49cba3526
Add test coverage for registerSystemDefaultNetworkCallback. am: 1e5cdd3187 am: 1f40096f3e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1570840
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3ece3d8ce25be1d024376539ba4c9c17e9d15d7b
2021-02-10 07:20:26 +00:00
Lorenzo Colitti
bf5c2979dd
Remove buggy ConnectivityManagerTest#ensureWifiConnected.
...
This method does not behave correctly when wifi is connected but
the last CONNECTIVITY_ACTION broadcast was not for wifi. This
could happen due to another network connecting or disconnecting,
such as VPN.
Bug: 179774433
Test: test-only change
Change-Id: Ib2010b3871133c38b6d508bf508134dd9b814ce2
2021-02-10 15:58:18 +09:00
Lorenzo Colitti
2d109b3909
Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo" am: 43b96c711b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1574260
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibe397a58700e8ad1077a011a9a98f7478f0dc60e
2021-02-10 06:55:58 +00:00
Lorenzo Colitti
fc5b95502b
Add CTS coverage for VpnTransportInfo. am: e9aeb3c1c5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1570841
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0674d6c5730ad30624d58d3fad0fa6b22c2ce7b0
2021-02-10 06:55:57 +00:00
Lorenzo Colitti
1f40096f3e
Add test coverage for registerSystemDefaultNetworkCallback. am: 1e5cdd3187
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1570840
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If5381eec59318dd01b6c19b13165dbacb6c86af2
2021-02-10 06:55:56 +00:00
Lorenzo Colitti
17b18ca6c2
Add IPv4 counters. am: d561b7f67c am: d2956a1964
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580287
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic66884108ae7fde4c1688847f7b2092c8d6e941d
2021-02-10 06:54:53 +00:00
Lorenzo Colitti
43b96c711b
Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo"
...
* changes:
Accept both pre-S and post-S errors in getConnectionOwnerUid.
Add CTS coverage for VpnTransportInfo.
Add test coverage for registerSystemDefaultNetworkCallback.
2021-02-10 06:38:41 +00:00
Lorenzo Colitti
d2956a1964
Add IPv4 counters. am: d561b7f67c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580287
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4c2c1c0e7dd032a148f798030f668767bfd2a029
2021-02-10 06:30:21 +00:00
Lorenzo Colitti
98d23e7d02
Accept both pre-S and post-S errors in getConnectionOwnerUid.
...
On R and below, when an app that is not the active VPN app calls
getConnectionOwnerUid, a SecurityException is thrown. On S and
above, the method just returns INVALID_UID, which is what would
happen if the app was the active VPN app but was not authorized
to find that particular socket.
Accept both behaviours.
Bug: 173331190
Test: atest HostsideVpnTests#testGetConnectionOwnerUidSecurity passes on R and S
Change-Id: Ie6de2ef505b0d7bc253c55215a698aeaa210785c
2021-02-10 15:14:31 +09:00
Lorenzo Colitti
e9aeb3c1c5
Add CTS coverage for VpnTransportInfo.
...
Bug: 173331190
Test: FrameworksNetTests HostsideVpnTests CtsNetTestCases
Change-Id: I77d866270c63f1078a2a01941b2271d4338aa178
2021-02-10 15:14:26 +09:00
Lorenzo Colitti
7081e9f184
Dump counters in "dumpsys tethering bpf". am: 4e92da06fa am: e033a1e543
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1575051
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib449565583901259f0c21764d566637eace5f5f8
2021-02-10 05:31:03 +00:00
Lorenzo Colitti
e033a1e543
Dump counters in "dumpsys tethering bpf". am: 4e92da06fa
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1575051
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic0891b0982780186054e468541259f10c2b5ccf5
2021-02-10 05:05:29 +00:00
Lorenzo Colitti
d561b7f67c
Add IPv4 counters.
...
Test: dumpsys tethering bpf
Change-Id: Ie21fee8ad12430ecd21c3903587d25b8dd2a96c4
2021-02-10 04:44:35 +00:00
Lorenzo Colitti
4e92da06fa
Dump counters in "dumpsys tethering bpf".
...
This CL adds the counters collected by the tethering programs to
the output of "dumpsys tethering bpf". The counter names are
fetched by JNI code at startup and then read by the debugging
code on demand.
Example from my device:
Forwarding errors:
TCP_CONTROL_PACKET: 67
NON_GLOBAL_SRC: 13
NON_GLOBAL_DST: 17
LOCAL_SRC_DST: 7
Test: manual (debug-only code)
Change-Id: I7ec7992612556a4bca5f1b6bb52c655d6d870201
2021-02-10 04:43:03 +00:00
Lorenzo Colitti
a47891732f
Don't leak map fds in BpfCoordinator#dump. am: 555472a186 am: a6c9626b5d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1581523
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id5a3c980a0f9409b9342672935b9567c89422305
2021-02-09 22:50:01 +00:00
Lorenzo Colitti
a6c9626b5d
Don't leak map fds in BpfCoordinator#dump. am: 555472a186
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1581523
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6f674f644b3afbc762423c903a1460a215be712d
2021-02-09 22:22:55 +00:00
Lorenzo Colitti
555472a186
Don't leak map fds in BpfCoordinator#dump.
...
Currently, the dump methods open BpfMap objects and never close
them. This leaks filedescriptors, and if dump is called often
enough, will crash the networkstack process.
Fix this by using try-with-resources statements that
automatically close the map when exiting the try block.
Change the signature of BpfMap#close from "throws Exception" to
"throws ErrnoException" since it does not throw any other type
of checked exceptions.
Test: "lsof | grep network_st" while running "dumpsys tethering bpf" in a loop
Change-Id: I66c407454c2715bf41bf3a2e81bd582f9ea5a905
2021-02-09 23:30:25 +09:00
Daulet Zhanguzin
8b4a865266
Run Connectivity cts tests against unbundled version of BouncyCastle
...
Bug: 154796679
Test: Treehugger
Change-Id: I594c3ce3808735427aed2899f3805dfacb117516
2021-02-09 14:03:01 +00:00
Lorenzo Colitti
29f8e3550b
Merge "offload - finish ipv4 tethering" am: 4431655a4d am: 76a663683c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1562765
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I386c9e5230fb978856437a9afc0b3920edfcf051
2021-02-09 13:00:08 +00:00
Lorenzo Colitti
76a663683c
Merge "offload - finish ipv4 tethering" am: 4431655a4d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1562765
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifcf60768a4c5c88657f7a3f6896e14082353735a
2021-02-09 12:33:26 +00:00
Lorenzo Colitti
1e5cdd3187
Add test coverage for registerSystemDefaultNetworkCallback.
...
Bug: 173331190
Test: atest CtsNetTestCases:NetworkAgentTest
Change-Id: I3ce51ca253a8bd06408137f6f9ed4056a832cb43
2021-02-09 20:10:36 +09:00
Lorenzo Colitti
4431655a4d
Merge "offload - finish ipv4 tethering"
2021-02-09 11:08:06 +00:00
Lorenzo Colitti
b9b629f273
Improve BPF tethering counters. am: 72ec3ba88a am: 66609d3f3e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580284
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I19117620a162ecf6a3c14118cebf3413ffbe667b
2021-02-09 07:06:44 +00:00
Lorenzo Colitti
66609d3f3e
Improve BPF tethering counters. am: 72ec3ba88a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580284
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I43e2306bf134e2219b9f0a5bb59ad9c03f3aaa70
2021-02-09 06:27:17 +00:00
Maciej Żenczykowski
79079db8af
Merge changes I3fcd7eb8,I4bf2c762 am: d46b3d8ef8 am: 0681ae3e9a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1575050
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I187698dad1d3bf8641e7b9987be3e6e4aeba55b5
2021-02-09 04:25:48 +00:00
Maciej Żenczykowski
0681ae3e9a
Merge changes I3fcd7eb8,I4bf2c762 am: d46b3d8ef8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1575050
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I828f5f2200becadfd0429dce83dc9e4c0bc5d224
2021-02-09 03:43:01 +00:00
Lorenzo Colitti
72ec3ba88a
Improve BPF tethering counters.
...
Test: m
Change-Id: I53961e1e16bf90d76f16b9416c55b65e8374373d
2021-02-09 03:36:40 +00:00
Maciej Żenczykowski
d46b3d8ef8
Merge changes I3fcd7eb8,I4bf2c762
...
* changes:
Add error counters for various failures.
Add a bpf_tethering_headers lib used by the programs and JNI.
2021-02-09 02:57:24 +00:00
Lorenzo Colitti
b81584dbe5
Add error counters for various failures.
...
Currently, debugging the tethering programs is not easy because
in case of any failure they simply return TC_ACT_OK. This CL adds
a number of counters that the program can increment in the case
of interesting events such as malformed packets.
At the moment the counters are stored in a global tethering error
map, which is an ARRAY map of 32-bit counters. This should not
take up much space because there are only a dozen of these.
We might not need all of these counters. In future CLs we can
reduce the number of counters, or perhaps move them to a map of
maps so as to have separate counters on a per-interface basis.
Test: manual
Change-Id: I3fcd7eb8d318700092949ff2f39987bf4ba3656c
2021-02-09 02:56:52 +00:00
Treehugger Robot
189842e956
Merge "Temporarily disable flaky testRequestBackgroundNetwork CTS test" am: 1259762383 am: 81d26e80ed
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579874
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I90d63b555e28dd8d6f5c1f61add882e4016610c9
2021-02-09 02:16:30 +00:00
Lorenzo Colitti
734b14e07d
Add a bpf_tethering_headers lib used by the programs and JNI.
...
This provides a place to store common definitions that can be
used by both the programs and by JNI code in the tethering
module.
Over time much of the tethering-specific code in bpf_shared.h
could move here.
Test: m
Bug: 177884581
Change-Id: I4bf2c762d61cd5db003d59880e6bf7d107ff1a07
2021-02-09 01:54:52 +00:00
Treehugger Robot
81d26e80ed
Merge "Temporarily disable flaky testRequestBackgroundNetwork CTS test" am: 1259762383
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579874
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I41cb852c962e219c0e546040af29e13c535909b3
2021-02-09 01:21:39 +00:00
Treehugger Robot
1259762383
Merge "Temporarily disable flaky testRequestBackgroundNetwork CTS test"
2021-02-09 00:13:46 +00:00
Junyu Lai
8d02b4ad8c
Merge changes from topic "vcn07" am: 438f787ca3 am: dfb0a4ffc0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579872
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ide6e0198012615169f3343d409e2a02fa39f1569
2021-02-08 22:23:17 +00:00