Commit Graph

6739 Commits

Author SHA1 Message Date
Junyu Lai
8bb3db8837 Merge changes Ibcb91105,I0218f367 am: c797cf56ca
am: 0d58710edf

Change-Id: Ia667386c1a8949839871a6949d79552d9c8b88f0
2019-05-10 02:13:34 -07:00
Junyu Lai
0d58710edf Merge changes Ibcb91105,I0218f367
am: c797cf56ca

Change-Id: I4972d42657aa118e17240546c223723ed7b546ec
2019-05-10 01:14:05 -07:00
Junyu Lai
4c266685b3 Merge changes Ibff278a6,If6d537a3 am: 6eaf680338
am: becb2a3e86

Change-Id: Ic51f3b32375378ff74bdd54d1f36569b277fc80f
2019-05-09 23:30:19 -07:00
Junyu Lai
c797cf56ca Merge changes Ibcb91105,I0218f367
* changes:
  Limit unprivileged keepalives per uid
  Support customization of supported keepalive count per transport
2019-05-10 05:47:23 +00:00
Junyu Lai
becb2a3e86 Merge changes Ibff278a6,If6d537a3
am: 6eaf680338

Change-Id: If1d215b0fae85bfeeb5b6190abf4e4dc841912e5
2019-05-09 21:32:10 -07:00
Treehugger Robot
6eaf680338 Merge changes Ibff278a6,If6d537a3
* changes:
  Revert "Add NATT keepalive resources and methods into IpSecService"
  Revert "[KA11] Verify fd ownership and allocate resource for NattKeepalive"
2019-05-10 01:42:26 +00:00
Xin Li
4c3aa0b676 [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: eee52ba403 -s ours
am: 85b76641ff -s ours
am skip reason: subject contains skip directive

Change-Id: I27cf7d7b751417bac1087a3778e012076c0e66c6
2019-05-09 17:57:48 -07:00
Xin Li
26c902b13a [automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 2a49c8de07 -s ours
am: ca23b01714 -s ours
am skip reason: subject contains skip directive

Change-Id: I862d40111b2e525e5838bf09e169c8c3f416633b
2019-05-09 17:16:31 -07:00
Xin Li
85b76641ff [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
am: eee52ba403 -s ours
am skip reason: subject contains skip directive

Change-Id: Id9cffb46751533cdd19a71577bf4dddea6219ddb
2019-05-09 16:46:13 -07:00
Xin Li
ca23b01714 [automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.
am: 2a49c8de07 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib109cf35cae4b70ac762f9f3d4951968cfa91e9e
2019-05-09 15:56:19 -07:00
Xin Li
eee52ba403 Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." 2019-05-09 22:05:45 +00:00
Junyu Lai
9bb90ad13e Merge "Clean up the keepalive slots when network disconnect" am: d3f8253db4
am: 015f800edf

Change-Id: Id3e4e159713c0ed7e03f45169e87b73ae6408e4f
2019-05-09 13:24:32 -07:00
Junyu Lai
015f800edf Merge "Clean up the keepalive slots when network disconnect"
am: d3f8253db4

Change-Id: I2cedf5752d37f96337ab69d94534cb7745e8efa3
2019-05-09 12:29:16 -07:00
Junyu Lai
d3f8253db4 Merge "Clean up the keepalive slots when network disconnect" 2019-05-09 18:53:03 +00:00
junyulai
a83c9f38a6 Clean up the keepalive slots when network disconnect
In general, keepalive slots are released after result of
stopping has returned. However, for network disconnect case,
the service side cannot communicate with network agent since
the async channel is broken.

Clean up keepalive slots right after stop in this case.

Bug: 132341736
Test: 1. atest com.android.server.ConnectivityServiceTest \
         #testNattSocketKeepalives --generate-new-metrics 100
      2. atest FrameworksNetTests --generate-new-metrics 10

Change-Id: Ia30741f71fa72fc117e071976fd73991fa3c9535
2019-05-09 17:16:17 +00:00
Junyu Lai
23409e34b4 Revert "Add NATT keepalive resources and methods into IpSecService"
This reverts commit cece56e3ce.

Reason for revert: Adds dependency between IpSecService and
                   ConnectivityService may lead to future deadlock
		   problems. Uses a simpler approach instead,
		   hence the solution is not needed.
		   See aosp/954040.

Change-Id: Ibff278a6eee666cd85dba81c2bed94d568679b02
2019-05-10 00:58:18 +08:00
junyulai
1f8bf657bb Limit unprivileged keepalives per uid
Public APIs for creating unprivileged NATT socket keepalive
might allow users to exhaust resource if malicious apps try
to create keepalives with fd which is not created by
IpSecService through binder call. Thus, this change add
customizable limitation per uid to prevent resource exhaustion
attack.

Bug: 129371366
Bug: 132307230
Test: atest FrameworksNetTests
Change-Id: Ibcb91105e46f7e898b8aa7c2babc3344ef2c6257
2019-05-10 00:36:58 +08:00
junyulai
15e26fb485 Support customization of supported keepalive count per transport
This change specifies the required minimum supported keepalives
in SDK, and allows OEMs to customize supported keepalive count
per network through resource overlay.

Bug: 129371366
Test: 1. m -j doc-comment-check-docs
      2. atest FrameworksNetTests

Change-Id: I0218f3674628c13ead63fc9a873895ba7f113033
2019-05-10 00:36:58 +08:00
Xin Li
2a49c8de07 DO NOT MERGE - Merge Pie Bonito/Sargo into master.
Bug: 131756210
Change-Id: I77a701deda4935526ad452564f9bda77af345f46
2019-05-09 09:27:04 -07:00
Xiao Ma
fe5a12d94e Merge "adopt non-blocking method to obtain the IpMemoryStore service." am: 6c6c6272dd
am: bec60862c4

Change-Id: If0d43f21710ca31149610d3e6a5f0d7e4acc11a2
2019-05-09 04:55:13 -07:00
Xiao Ma
bec60862c4 Merge "adopt non-blocking method to obtain the IpMemoryStore service."
am: 6c6c6272dd

Change-Id: Idd6110141795f86dcf28eafab87683eda4c70b93
2019-05-09 04:43:33 -07:00
Xiao Ma
6c6c6272dd Merge "adopt non-blocking method to obtain the IpMemoryStore service." 2019-05-09 11:30:56 +00:00
Lorenzo Colitti
3320e8aa51 [automerger skipped] Merge "[CS] Unregister callback as part of onUnavailable dispatch" into qt-dev
am: d9b68e236b -s ours
am skip reason: change_id I4c54b003a733eb0b1e4fd8674ed13081b1bef8e3 with SHA1 e0e2ca979c is in history

Change-Id: I3a61f64da1fc5d376da06a81ce8a35bac09d4481
2019-05-09 02:57:25 -07:00
Lorenzo Colitti
d9b68e236b Merge "[CS] Unregister callback as part of onUnavailable dispatch" into qt-dev 2019-05-09 09:42:38 +00:00
Etan Cohen
095e5675df Merge "[CS] Unregister callback as part of onUnavailable dispatch" am: 3b9087c59f
am: b0e0a62bf6

Change-Id: Ida684c441e7aaedce9a29da071ef5a68403d08b3
2019-05-08 22:42:55 -07:00
Etan Cohen
b0e0a62bf6 Merge "[CS] Unregister callback as part of onUnavailable dispatch"
am: 3b9087c59f

Change-Id: I14d3c0f6c606020bd1d1e756174a66ee933cb15f
2019-05-08 22:13:00 -07:00
Lorenzo Colitti
3722a21b31 Merge "Add IPsec checks for IPSEC_TUNNEL feature" into qt-dev
am: 44d474d7c7

Change-Id: I9bd0fa3958c63a148af98abfe7cc6e4301cf01c2
2019-05-08 21:20:19 -07:00
Etan Cohen
83ab6999c8 [CS] Unregister callback as part of onUnavailable dispatch
The onUnavailable semantics promise that it is equivalent to calling
the unregister callback method. But - it doesn't unregister the callback
allowing it to be reused. Fixed.

Additionally, modified the unregisterNetworkCallback method to not fail
on duplicate unregistration (since a callback could now self
unregister). Instead simply print a log.

Bug: 130651445
Test: atest ConnectivityServiceTest
Merged-In: I4c54b003a733eb0b1e4fd8674ed13081b1bef8e3
Change-Id: I4c54b003a733eb0b1e4fd8674ed13081b1bef8e3
2019-05-09 03:57:54 +00:00
Etan Cohen
3b9087c59f Merge "[CS] Unregister callback as part of onUnavailable dispatch" 2019-05-09 03:57:29 +00:00
Etan Cohen
e0e2ca979c [CS] Unregister callback as part of onUnavailable dispatch
The onUnavailable semantics promise that it is equivalent to calling
the unregister callback method. But - it doesn't unregister the callback
allowing it to be reused. Fixed.

Additionally, modified the unregisterNetworkCallback method to not fail
on duplicate unregistration (since a callback could now self
unregister). Instead simply print a log.

Bug: 130651445
Test: atest ConnectivityServiceTest
Change-Id: I4c54b003a733eb0b1e4fd8674ed13081b1bef8e3
2019-05-09 02:41:40 +00:00
Xiao Ma
24f9431d23 adopt non-blocking method to obtain the IpMemoryStore service.
Test: atest FrameworksNetTests
Change-Id: I7de4f23370bdf9c9df5e74ed074c794080d93d95
2019-05-09 10:39:50 +09:00
Junyu Lai
5218015ed8 Revert "[KA11] Verify fd ownership and allocate resource for NattKeepalive"
This reverts commit 8368fe9fe0.

Reason for revert: Adds dependency between IpSecService and
                   ConnectivityService may lead to future deadlock
                   problems. Uses a simpler approach instead,
                   hence the solution is not needed.
                   See aosp/954040.

Change-Id: If6d537a39595cf132d3ed81d4eaac6700f5f0ab3
2019-05-08 11:44:20 +08:00
Benedict Wong
5ade2467f4 Add IPsec checks for IPSEC_TUNNEL feature
This patch adds checks to ensure that the IPSEC_TUNNEL feature flag is
enabled.

Bug: 117183273
Test: Compiles & tests passing
Change-Id: I2699dda29e1eed139bc6fd1b70071e5ab33cad88
2019-05-08 00:11:28 +00:00
Android Build Merger (Role)
3f2f143aa5 Merge changes into qt-dev-plus-aosp 2019-05-07 22:19:43 +00:00
Luke Huang
f058212be7 Merge "Correct buffer size limitation for DnsResolver API" into qt-dev
am: 87d2f6c929

Change-Id: I4be2688872c9cc3e2e136144ecd45db7ec2e54bf
2019-05-06 22:39:37 -07:00
Luke Huang
1d3e7b19b8 Correct buffer size limitation for DnsResolver API
Bug: 131055651
Test: atest DnsResolverTest
(cherry picked from commit f6726c2c5456887aaebe3f821a86a83bbed92f3d)

Change-Id: I69ad9428ddfb70437e47ef4740930a97aece69d9
2019-05-02 09:37:13 +00:00
Luke Huang
08835ef728 Merge "Correct buffer size limitation for DnsResolver API" am: 0e1b6c1cda
am: 988a45767e

Change-Id: If779ada4dbc1e67b28067235f5055d7f94692c69
2019-05-01 23:39:32 -07:00
Luke Huang
988a45767e Merge "Correct buffer size limitation for DnsResolver API"
am: 0e1b6c1cda

Change-Id: Ia9febf5f707c182d465e79ed8f4d80a4853c868f
2019-05-01 23:28:06 -07:00
Luke Huang
0e1b6c1cda Merge "Correct buffer size limitation for DnsResolver API" 2019-05-02 05:59:33 +00:00
Paul Hu
c92f4f1edf Merge "Add CTS API coverage for APIs which are used by NetworkStack" am: 4e78fd70d0
am: bf8d634d57

Change-Id: Id3f0d1c19a76c7987b69e449203fc50423f5e531
2019-05-01 21:52:29 -07:00
Paul Hu
bf8d634d57 Merge "Add CTS API coverage for APIs which are used by NetworkStack"
am: 4e78fd70d0

Change-Id: I33b58b69e906e5b90dfc7f0b512c81edd51b1684
2019-05-01 21:12:55 -07:00
Luke Huang
abf0cd31c8 Correct buffer size limitation for DnsResolver API
Bug: 131055651
Test: atest DnsResolverTest
Change-Id: I29decd480172eacb452ccb0da524ef1bf2ffadcf
2019-05-02 11:48:54 +08:00
Paul Hu
4e78fd70d0 Merge "Add CTS API coverage for APIs which are used by NetworkStack" 2019-05-02 01:37:26 +00:00
Paul Hu
1290c5a815 [automerger skipped] Merge "Add tests for DhcpErrorEvent" into qt-dev
am: 816b29a1bd -s ours
am skip reason: change_id I9b65a2eef94567d2b79a9955619938e64906080d with SHA1 b547b7b4df is in history

Change-Id: I05a3e1b581d287022f9843a07f2ba76609fd663c
2019-04-30 18:39:18 -07:00
Paul Hu
3bae1ce249 [automerger skipped] Merge "Add Network, NetworkCapabilities, StaticIpConfiguration common test cases" into qt-dev
am: c3216377b5 -s ours
am skip reason: change_id I49c35541eb21e91f8c36215456df703d2fe70d2c with SHA1 d82b2c24b3 is in history

Change-Id: Id22f11ec1e377c801ea5b7dd9692c6243907fa9e
2019-04-30 18:35:32 -07:00
Mark Chien
0b7d0e010f [automerger skipped] Merge "Support adding NATT keepalive packet filter" into qt-dev
am: 78bc2fb752 -s ours
am skip reason: change_id Idaa7238a5c9acdae9f6cff13095ee9436c7c92c8 with SHA1 3d6d36ebb7 is in history

Change-Id: I0db6221a54e4aba83fc792561e48c9d448163239
2019-04-30 18:32:05 -07:00
Aaron Huang
3d96a613c8 [automerger skipped] Merge changes from topic "natt-aidl+aidl-freeze" into qt-dev
am: d665afbc4b -s ours
am skip reason: change_id I9b9a51dc5dc06c90229fb36c34c24258991c4146 with SHA1 15400f216d is in history

Change-Id: Ie1cdb9a928f97681ab4083b68db3fd453b0399e5
2019-04-30 11:24:17 -07:00
Paul Hu
552b73c0f1 [automerger skipped] Merge "Move more network unit tests to common tests" into qt-dev
am: 254c92d0f7 -s ours
am skip reason: change_id I9f708a252ab606b782f5f828dce8c1690c3703bf with SHA1 42272ed304 is in history

Change-Id: Ia333cf3cbe2368146ac701bb83e52e131291503c
2019-04-30 09:41:40 -07:00
Lorenzo Colitti
e74fcd73fb Merge "Make DNS cache lifecycle management explicit" into qt-dev
am: 54429c1b80

Change-Id: I6908953327577c7e79e4bbc8459ca8937b6b5425
2019-04-30 06:55:14 -07:00
TreeHugger Robot
816b29a1bd Merge "Add tests for DhcpErrorEvent" into qt-dev 2019-04-30 11:57:59 +00:00