Chiachang Wang
cd19a7ca0e
Merge "Separate test into reasonable multiple tests" am: 26a7e61417 am: 33076dddff am: 8ede56f676
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793478
Change-Id: I17df1eb88c6ee4637e016c915559fbc6518be4e6
2021-09-07 03:31:56 +00:00
Chiachang Wang
8ede56f676
Merge "Separate test into reasonable multiple tests" am: 26a7e61417 am: 33076dddff
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793478
Change-Id: Ib9b4b8fae53faccd88afa36977f398ce92d2be2a
2021-09-07 03:17:26 +00:00
Chiachang Wang
33076dddff
Merge "Separate test into reasonable multiple tests" am: 26a7e61417
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793478
Change-Id: I9193477c6744c6f9a1f7e7e14e0c98e4348b262d
2021-09-07 03:01:39 +00:00
Chiachang Wang
26a7e61417
Merge "Separate test into reasonable multiple tests"
2021-09-07 02:40:13 +00:00
Paul Hu
7b1782be5c
Merge "Correct uid to app id for netd traffic permission methods" am: 9fe8c8fc76 am: 2fe543353b am: 03cc875150
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1767733
Change-Id: I094d150efcd47050c68f24bafcff518c27a9fbed
2021-09-07 02:00:09 +00:00
Paul Hu
03cc875150
Merge "Correct uid to app id for netd traffic permission methods" am: 9fe8c8fc76 am: 2fe543353b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1767733
Change-Id: I7d10079993b2441219aa575127669299932a6738
2021-09-07 01:41:05 +00:00
Paul Hu
2fe543353b
Merge "Correct uid to app id for netd traffic permission methods" am: 9fe8c8fc76
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1767733
Change-Id: I11d1e21c7510c5f2d07198d8930134c6a9976708
2021-09-07 01:26:18 +00:00
Paul Hu
9fe8c8fc76
Merge "Correct uid to app id for netd traffic permission methods"
2021-09-07 01:13:56 +00:00
Paul Hu
abd3d302b6
Merge "Reduce duplicated code" am: 1d04d8362f am: f74a08823e am: a6eb8fbdf6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1767727
Change-Id: If7fac1fba946a32b8c3e94840fc51672ff1920e7
2021-09-06 16:58:21 +00:00
Paul Hu
a6eb8fbdf6
Merge "Reduce duplicated code" am: 1d04d8362f am: f74a08823e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1767727
Change-Id: I385c0143451c0cdc6f3c0e34843ae212f8661316
2021-09-06 16:43:31 +00:00
Paul Hu
f74a08823e
Merge "Reduce duplicated code" am: 1d04d8362f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1767727
Change-Id: I7612eb48c780c94b47f4741eb85b91b3cdf0a44f
2021-09-06 16:33:38 +00:00
Paul Hu
1d04d8362f
Merge "Reduce duplicated code"
2021-09-06 16:17:45 +00:00
paulhu
1d4ec79020
Correct uid to app id for netd traffic permission methods
...
Some uids should be app ids, correct them for avoiding confusion
and incorrect use.
Bug: 189705071
Test: atests FrameworksNetTests
Change-Id: I4a5930e5dc63b4d901e1567f8935ad7203866c89
2021-09-06 00:12:23 +08:00
paulhu
7a29739f2f
Reduce duplicated code
...
- This is a test only change.
- Some methods are very similar and duplicated. So merge them to
improve readability and reduce code complexity.
- Stop spying PermissionMonitor.
Bug: 189705071
Test: atests FrameworksNetTests
Change-Id: I8ec17bd2d396c4d49dd8b64be85d89d0145f4c3c
2021-09-03 15:58:15 +08:00
Christopher Ferris
d577354b20
Merge "Remove unused libbacktrace library." am: f7e6b7f424 am: 341de04dee am: 1b8a6843d6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1807719
Change-Id: I4cfa9cf423ea1eb41488985d84b28179c872e0e0
2021-09-02 22:18:03 +00:00
Christopher Ferris
1b8a6843d6
Merge "Remove unused libbacktrace library." am: f7e6b7f424 am: 341de04dee
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1807719
Change-Id: I6b90ac7bd2ac5dd23cf59b78d18a256b51530f20
2021-09-02 21:59:04 +00:00
Christopher Ferris
341de04dee
Merge "Remove unused libbacktrace library." am: f7e6b7f424
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1807719
Change-Id: I7781fb81bfe78760334c5cc9301da505b9202d8b
2021-09-02 21:38:38 +00:00
Christopher Ferris
f7e6b7f424
Merge "Remove unused libbacktrace library."
2021-09-02 21:25:02 +00:00
Treehugger Robot
5558bbdfe4
Merge "Replace inexact alarm setRepeasting with setExact alarm" am: 507de1cac6 am: 096498601e am: 5318aa5880
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793479
Change-Id: I1fe25dfe90b0d381c36561abe766cd89f09e9e3c
2021-08-30 14:41:26 +00:00
Treehugger Robot
5318aa5880
Merge "Replace inexact alarm setRepeasting with setExact alarm" am: 507de1cac6 am: 096498601e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793479
Change-Id: I65067dada2d8ffb3a634fa57a79811a9abdb9b7b
2021-08-30 14:23:27 +00:00
Treehugger Robot
096498601e
Merge "Replace inexact alarm setRepeasting with setExact alarm" am: 507de1cac6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793479
Change-Id: Ia989bed2395130329ce5946cb7ece91089fc8571
2021-08-30 14:01:49 +00:00
Treehugger Robot
507de1cac6
Merge "Replace inexact alarm setRepeasting with setExact alarm"
2021-08-30 13:42:25 +00:00
Hungming Chen
9a580968e6
Refactor the offload permission check and add tests am: b344870ea0 am: 5dbbd2f132 am: 10fa7b52df
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1803422
Change-Id: Ib40a62eaaf839c0ff1c499d5dbe6b8663241a4cf
2021-08-27 05:34:59 +00:00
Hungming Chen
10fa7b52df
Refactor the offload permission check and add tests am: b344870ea0 am: 5dbbd2f132
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1803422
Change-Id: I1ed3a0d92e1bbacc7a2b04498e58933f5c9c7d4d
2021-08-27 05:21:37 +00:00
Hungming Chen
5dbbd2f132
Refactor the offload permission check and add tests am: b344870ea0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1803422
Change-Id: I857de882e6f613d3bf57d271532f761be10bf988
2021-08-27 05:02:15 +00:00
Hungming Chen
b344870ea0
Refactor the offload permission check and add tests
...
- Rename the conntrack destination port check function
- Use CollectionUtils.contains to check the denied ports
- Add tests for the streams with ftp and pptp tcp port are
not able to be offloaded
Bug: 195914327
Test: atest TetheringCoverageTests
Change-Id: I7e2591bea1f6db46271efb0c30970fb8d4efe1e4
2021-08-26 21:21:05 +08:00
Orion Hodson
38eed1c5a9
Merge "Fix IpSecAlgorithmTest on S" am: 0084591e94 am: 89213602ee am: ea7317fe25
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1806806
Change-Id: I08d770d83fea758e40c35611beb0777bc221b150
2021-08-26 08:45:48 +00:00
Orion Hodson
ea7317fe25
Merge "Fix IpSecAlgorithmTest on S" am: 0084591e94 am: 89213602ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1806806
Change-Id: I857da7375c992928758670b9031cb884a5a0eda8
2021-08-26 08:31:57 +00:00
Orion Hodson
89213602ee
Merge "Fix IpSecAlgorithmTest on S" am: 0084591e94
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1806806
Change-Id: I152aaf741e474f9cf6d39a86be9ff4800a83b1b4
2021-08-26 07:59:21 +00:00
Orion Hodson
0084591e94
Merge "Fix IpSecAlgorithmTest on S"
2021-08-26 07:47:33 +00:00
Remi NGUYEN VAN
ae7508f9b5
Fix IpSecAlgorithmTest on S
...
The test may be run on S builds older than itself, in which case the
resource ID may not match. Query the resource ID dynamically instead of
using the constant.
IpSecAlgorithm is not updatable in S, which is why it can use
hidden/unstable platform resources, so the test could also be skipped
altogether on S. But considering that keeping it around is not very
costly yet, this change fixes it for running on S.
Bug: 197489543
Test: atest IpSecAlgorithmTest
Change-Id: I533eede3a360a8db9089e65e017b9d7453b35539
2021-08-25 18:10:22 +09:00
Maciej Żenczykowski
0014d2857b
Merge "Tethering/bpf_progs/offload - replace all TC_ACT_OK with TC_ACT_PIPE" am: dc8388ca08 am: e953144055 am: b43c235eeb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1807971
Change-Id: I82ac8045355c4953024529c9eeeb9a35f4e63e9e
2021-08-25 08:06:16 +00:00
Maciej Żenczykowski
b43c235eeb
Merge "Tethering/bpf_progs/offload - replace all TC_ACT_OK with TC_ACT_PIPE" am: dc8388ca08 am: e953144055
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1807971
Change-Id: I5bdd166ce5179e001c6ef77c6daa60001e67b6e9
2021-08-25 07:50:22 +00:00
Maciej Żenczykowski
e953144055
Merge "Tethering/bpf_progs/offload - replace all TC_ACT_OK with TC_ACT_PIPE" am: dc8388ca08
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1807971
Change-Id: Iad650917305d67b799d059e4b285af5fd3f54709
2021-08-25 07:37:55 +00:00
Maciej Żenczykowski
dc8388ca08
Merge "Tethering/bpf_progs/offload - replace all TC_ACT_OK with TC_ACT_PIPE"
2021-08-25 07:19:28 +00:00
Maciej Żenczykowski
6e66a36367
Tethering/bpf_progs/offload - replace all TC_ACT_OK with TC_ACT_PIPE
...
The correct return code to keep on processing any further TC
attached programs is 'TC_ACT_PIPE' and not 'TC_ACT_OK' (which
is terminal).
Without this the ipv6 tether offload program causes termination
of processing and the ipv6 clatd offload program never actually
handles any packets (while tethering is active).
This results in lack of bpf xlat64 offloading for tethered ipv4
traffic on an ipv6-only (cellular) network.
This in turn means incoming TCP packets get GRO'ed, do not get
bpf offloaded, and get delivered to the clat daemon, which
due to them being bigger than the mtu (due to gro) cannot
handle them and discards them.
This results in poor performance, since tcp falls back to 1 mss/mtu
sized packet per rtt.
Tested via tethering a linux laptop on an ipv6-only cellular connection
and downloading the linux kernel from kernel.org via 'wget -6' and 'wget -4'.
Before:
IPv6: over 2MB/s, observed:
5805 packets, including 4 sackOK
IPv4: under 1MB/s, observed:
9300 packets, including 8 sackOK, 387 sack 1, 501 sack 2, 2310 sack 3
After:
IPv6: over 7MB/s, observed:
16702 packets, including 4 sackOK
IPv4: over 9MB/s, observed:
32755 packets, including 2 sackOK
Test: builds, TreeHugger, see above
Bug: 195624908
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: I623dacb5a37dc689cea34499c3906c11fcaf946c
2021-08-24 23:24:19 +00:00
Christopher Ferris
2b63a2f92a
Remove unused libbacktrace library.
...
Bug: 120606663
Test: Builds.
Change-Id: I733defd03670b01a30c4be5742498d62db7a9b6b
2021-08-24 15:57:29 -07:00
Lorenzo Colitti
3f28719b10
Give EthernetTetheringTest the restricted networks permission. am: 8fbadf4ac5 am: c1256c4cf3 am: e7edc0d8e6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1807157
Change-Id: I03f3ed1e1467b4b38372cdb9b6e6bea3841ce8a4
2021-08-24 09:15:52 +00:00
Lorenzo Colitti
e7edc0d8e6
Give EthernetTetheringTest the restricted networks permission. am: 8fbadf4ac5 am: c1256c4cf3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1807157
Change-Id: I513d625b151068c33ac1e9e2b66db811b0f034b5
2021-08-24 09:03:50 +00:00
Lorenzo Colitti
c1256c4cf3
Give EthernetTetheringTest the restricted networks permission. am: 8fbadf4ac5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1807157
Change-Id: I13defb1e00586393e91ca19100cf437482a64090
2021-08-24 08:54:53 +00:00
Lorenzo Colitti
8fbadf4ac5
Give EthernetTetheringTest the restricted networks permission.
...
This test fails on devices where physical Ethernet interfaces are
available but marked restricted, like cuttlefish.
Bug: 197462993
Test: test-only change
Change-Id: I15c991b2e43e2d5e823dcdcfbd74adfd9b2f6f08
2021-08-24 15:18:54 +09:00
Chalard Jean
e2a153f0f5
Merge "Fix an infinite loop with network offers" am: 77992bbfbb am: 72ed43d6dc am: 45e1f3bbde
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1800007
Change-Id: I7b76b72370c55040c28b7b599adfacec3eec79c3
2021-08-20 07:01:08 +00:00
Chalard Jean
45e1f3bbde
Merge "Fix an infinite loop with network offers" am: 77992bbfbb am: 72ed43d6dc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1800007
Change-Id: I638dcb91d51989bc7cf0f4d01a4f013689db2b50
2021-08-20 06:49:50 +00:00
Chalard Jean
72ed43d6dc
Merge "Fix an infinite loop with network offers" am: 77992bbfbb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1800007
Change-Id: I1fe463232308fbc73753dc8d19f269142f6f8776
2021-08-20 06:39:30 +00:00
Chalard Jean
77992bbfbb
Merge "Fix an infinite loop with network offers"
2021-08-20 06:17:31 +00:00
Lorenzo Colitti
55910d25ab
Merge "bpf: don't offload IPv4 packets with TCP port 21 (ftp) and 1723 (pptp)" am: ad8fb7fce4 am: b6ea38e832 am: a5688238a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1802476
Change-Id: Ia021aac0d66a2fd450797bf296d9c6e282b7e91a
2021-08-20 04:15:47 +00:00
Lorenzo Colitti
a5688238a0
Merge "bpf: don't offload IPv4 packets with TCP port 21 (ftp) and 1723 (pptp)" am: ad8fb7fce4 am: b6ea38e832
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1802476
Change-Id: I3f16d6d1ccaac0ce0981ca56c638aab6a0c41103
2021-08-20 03:58:54 +00:00
Lorenzo Colitti
b6ea38e832
Merge "bpf: don't offload IPv4 packets with TCP port 21 (ftp) and 1723 (pptp)" am: ad8fb7fce4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1802476
Change-Id: I2ca694a0154b3043092890cfd272e7b86cca3fb5
2021-08-20 03:39:28 +00:00
Lorenzo Colitti
ad8fb7fce4
Merge "bpf: don't offload IPv4 packets with TCP port 21 (ftp) and 1723 (pptp)"
2021-08-20 03:24:09 +00:00
Hungming Chen
bc85178435
bpf: don't offload IPv4 packets with TCP port 21 (ftp) and 1723 (pptp)
...
Bypass the IPv4 TCP packets with port 21 (ftp) and 1723 (pptp) from
BPF offload because these packets need the netfilter conntrack helper.
Bug: 195914327
Test: manual test as the follows
1. Connect to ftp.slackware.com with port 21 in active mode.
2. Check the PORT command success.
Command: PORT 192,168,62,128,174,17
Response: 200 PORT command successful.
3. Download a file.
Change-Id: I8e3b8d9323eb0e572f20c74442b55d4ee95abc2f
2021-08-19 14:29:25 +00:00