Commit Graph

10289 Commits

Author SHA1 Message Date
Benedict Wong
05f92d182c [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3 -s ours am: 184aea7f61 -s ours am: c76feb19fe -s ours
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 23bd36bc04 is in history

Change-Id: I523373d277d6ef886b81a6defe62350b2b52da34
2020-05-27 18:09:48 +00:00
Benedict Wong
8132cb6a9e [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3 am: 1e6a741859 -s ours am: cd52a41670 -s ours
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 23bd36bc04 is in history

Change-Id: Ie89bead3c4b40df52984269444953922dde2d342
2020-05-27 18:07:42 +00:00
Benedict Wong
703d5c03d8 [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3 am: 1e6a741859 am: af8eb7c2ad -s ours
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 cb09f72f47 is in history

Change-Id: Ibd430bdd090b893299bafc00d32c6d5f6b78cf92
2020-05-27 18:06:30 +00:00
Benedict Wong
c76feb19fe [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3 -s ours am: 184aea7f61 -s ours
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 23bd36bc04 is in history

Change-Id: I8addd4263844d33ae759bd5d76949bddf37bce57
2020-05-27 17:57:33 +00:00
Benedict Wong
cd52a41670 [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3 am: 1e6a741859 -s ours
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 cb09f72f47 is in history

Change-Id: Icdd3089924d465a8d8dd5cd999bd292d4072f963
2020-05-27 17:56:07 +00:00
Benedict Wong
1e6a741859 Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3
Change-Id: I38f112fbf1d0d0e8c1cf86068573d4fb94cecaa8
2020-05-27 17:33:41 +00:00
Benedict Wong
184aea7f61 [automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 4d887857e3 -s ours
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 cb09f72f47 is in history

Change-Id: I07603bd3f06b5e8b84d778ec5a72f373cbbd2c2f
2020-05-27 17:32:47 +00:00
Benedict Wong
4d887857e3 Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev 2020-05-27 17:31:00 +00:00
Cody Kesting
66931d35c8 [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 70708c54d0 -s ours am: 5db393eea6 -s ours am: d7e56132d0 -s ours
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 e7d4aa8d99 is in history

Change-Id: Iaa10b9474dde08e59e67a0e59f30eb7e92e988a6
2020-05-27 16:44:50 +00:00
Cody Kesting
bfefe7c18f [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 70708c54d0 am: 8e1ed8867d -s ours am: d18d2f82ab -s ours
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 e7d4aa8d99 is in history

Change-Id: I450571c1dedacab23837308e7cc4f940cf33aa80
2020-05-27 16:44:41 +00:00
Cody Kesting
95b5422b9f [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 70708c54d0 am: 8e1ed8867d am: 046c7b6755 -s ours
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 43a47efd1c is in history

Change-Id: I8aa8c3e0d51fb2a3218162c757d164fd1b6c7922
2020-05-27 16:43:31 +00:00
Cody Kesting
d7e56132d0 [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 70708c54d0 -s ours am: 5db393eea6 -s ours
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 e7d4aa8d99 is in history

Change-Id: I966964ae60576c7fc71974435dca3a9abd5691a8
2020-05-27 16:30:16 +00:00
Cody Kesting
d18d2f82ab [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 70708c54d0 am: 8e1ed8867d -s ours
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 43a47efd1c is in history

Change-Id: I418d72c5419e7bc85bbaf741291940010f82bfdb
2020-05-27 16:29:50 +00:00
Cody Kesting
8e1ed8867d Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 70708c54d0
Change-Id: I09582c2cac562751e3e33357a5f43083eb4c6d1a
2020-05-27 16:18:30 +00:00
Cody Kesting
5db393eea6 [automerger skipped] Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev am: 70708c54d0 -s ours
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 43a47efd1c is in history

Change-Id: Ie80d01ef3c50a85b55d54161c98126c49d46c4af
2020-05-27 16:17:36 +00:00
Cody Kesting
70708c54d0 Merge "Forward unknown Data Stall types to Connectivity Diagnostics." into rvc-dev 2020-05-27 16:03:38 +00:00
Automerger Merge Worker
79fccf8d33 Merge "[automerger skipped] Inform the DNS resolver when it needs to do DNS64 synthesis. am: 119ecc6867 -s ours am: e7f7d91dc8 -s ours" into rvc-d1-dev-plus-aosp am: dadab63a42 -s ours
am skip reason: Change-Id If8ad2d30712a6df3e207c8d3e8a129705242191e with SHA-1 119ecc6867 is in history

Change-Id: I01ad9fba695fe8fb1d3fc6ff047edaf68dcc10a1
2020-05-26 15:00:10 +00:00
Lorenzo Colitti
f7b0cd8c6b [automerger skipped] Inform the DNS resolver when it needs to do DNS64 synthesis. am: 119ecc6867 am: f726d7ab2e -s ours am: 27d61c3e2f -s ours
am skip reason: Change-Id If8ad2d30712a6df3e207c8d3e8a129705242191e with SHA-1 f28b6b705c is in history

Change-Id: I3bd93690434a286a776199d7c3e7faf52e9f97b7
2020-05-26 14:59:41 +00:00
Lorenzo Colitti
31aa659741 [automerger skipped] Inform the DNS resolver when it needs to do DNS64 synthesis. am: 119ecc6867 -s ours am: e7f7d91dc8 -s ours
am skip reason: Change-Id If8ad2d30712a6df3e207c8d3e8a129705242191e with SHA-1 f28b6b705c is in history

Change-Id: I555fef9a552f36a1f7570ee8819d8aa2620c52d7
2020-05-26 14:44:22 +00:00
Lorenzo Colitti
27d61c3e2f [automerger skipped] Inform the DNS resolver when it needs to do DNS64 synthesis. am: 119ecc6867 am: f726d7ab2e -s ours
am skip reason: Change-Id If8ad2d30712a6df3e207c8d3e8a129705242191e with SHA-1 f28b6b705c is in history

Change-Id: Ide2ea957cb63654eb54bed449ab04e250f5ca904
2020-05-26 14:44:07 +00:00
Lorenzo Colitti
e7f7d91dc8 [automerger skipped] Inform the DNS resolver when it needs to do DNS64 synthesis. am: 119ecc6867 -s ours
am skip reason: Change-Id If8ad2d30712a6df3e207c8d3e8a129705242191e with SHA-1 f28b6b705c is in history

Change-Id: Iec52ca510f3c066abbd96636c595acb89828c29a
2020-05-26 14:29:28 +00:00
Lorenzo Colitti
f726d7ab2e Inform the DNS resolver when it needs to do DNS64 synthesis. am: 119ecc6867
Change-Id: Ic418b02d68985a6a8ea22d845ad57349468b4dcd
2020-05-26 14:29:13 +00:00
Automerger Merge Worker
c9f159d5f8 Merge "[automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 3e54957fac am: 71c4318efd am: 627e36992b -s ours" into rvc-qpr-dev-plus-aosp 2020-05-26 13:23:11 +00:00
Lorenzo Colitti
c6d2637ae2 [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 3e54957fac -s ours am: 19d45f3b0f -s ours am: faa2504ff0 -s ours
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 3e54957fac is in history

Change-Id: I2cc0163b25e772786b9c64dca9d354bc4d66044c
2020-05-26 13:23:01 +00:00
Lorenzo Colitti
fa9cf58b5d [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 3e54957fac am: 71c4318efd am: 627e36992b -s ours
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 2a0ef00bb9 is in history

Change-Id: I3df201e84534868fcca0deb79db41e1129cba284
2020-05-26 13:22:59 +00:00
Lorenzo Colitti
e4d37aa2fa [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 3e54957fac am: 71c4318efd -s ours am: 65a195ba40 -s ours
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 2a0ef00bb9 is in history

Change-Id: I8b4b33ce6742605690e2498054441ba7f5972347
2020-05-26 13:22:50 +00:00
Lorenzo Colitti
faa2504ff0 [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 3e54957fac -s ours am: 19d45f3b0f -s ours
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 3e54957fac is in history

Change-Id: Icb5f3ccb42469f84770a9a4b8a1dc990c67a9376
2020-05-26 13:10:39 +00:00
Lorenzo Colitti
65a195ba40 [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 3e54957fac am: 71c4318efd -s ours
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 2a0ef00bb9 is in history

Change-Id: Ie0482e523786bc79a414bf1bb38195365c3bef42
2020-05-26 13:10:23 +00:00
Lorenzo Colitti
19d45f3b0f [automerger skipped] Test that if an RA sets the same prefix as DNS, nothing happens. am: 3e54957fac -s ours
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 2a0ef00bb9 is in history

Change-Id: I3e050057ba6ac95d789ed7f34f390bec586d84b7
2020-05-26 12:58:24 +00:00
Lorenzo Colitti
71c4318efd Test that if an RA sets the same prefix as DNS, nothing happens. am: 3e54957fac
Change-Id: I171ff7fd8140028dc4a4e7df5cc4663b8ad696e7
2020-05-26 12:58:22 +00:00
Lorenzo Colitti
119ecc6867 Inform the DNS resolver when it needs to do DNS64 synthesis.
This is only necessary when learning the NAT64 prefix from the
RA, because if the NAT64 prefix is learned from DNS, the DNS
resolver already knows the prefix and automatically enables
DNS64 synthesis.

The DNS resolver needs to be informed of the prefix any time
clat is running on a prefix learned from an RA. This is simple to
implement: just set the prefix when starting clat if prefix
discovery is not running, and clear the prefix when stopping clat
if prefix discovery was not running. This ensures that the prefix
is cleared iff it was set.

Bug: 156914456
Test: new unit test coverage
Original-Change: https://android-review.googlesource.com/1315578
Merged-In: If8ad2d30712a6df3e207c8d3e8a129705242191e
Change-Id: If8ad2d30712a6df3e207c8d3e8a129705242191e
2020-05-26 11:52:35 +00:00
Lorenzo Colitti
3e54957fac Test that if an RA sets the same prefix as DNS, nothing happens.
This is not particularly likely to happen unless the pref64 RA is
sent by a different router than the main RA. But more tests are
always good, and this additional coverage will be more useful
in an upcoming change.

Bug: 150648313
Test: test-only change
Original-Change: https://android-review.googlesource.com/1316094
Merged-In: I3316d49d42100800740afadc4edf0a13a4d8377c
Change-Id: I3316d49d42100800740afadc4edf0a13a4d8377c
2020-05-26 11:35:33 +00:00
Lorenzo Colitti
29d3636dd4 Merge "Inform the DNS resolver when it needs to do DNS64 synthesis." am: eed51faa49 am: f5a5cd3bd7 am: d0cf1afac5 am: cff8146b4d
Change-Id: I717046592a6535d39b8def912c7b78a071ae5a99
2020-05-26 10:46:22 +00:00
Lorenzo Colitti
cff8146b4d Merge "Inform the DNS resolver when it needs to do DNS64 synthesis." am: eed51faa49 am: f5a5cd3bd7 am: d0cf1afac5
Change-Id: I38aa313a3e0b8c9f7a401f1a56f808e5fe723525
2020-05-26 10:28:04 +00:00
Lorenzo Colitti
d0cf1afac5 Merge "Inform the DNS resolver when it needs to do DNS64 synthesis." am: eed51faa49 am: f5a5cd3bd7
Change-Id: I06278ddff31d8c0dbb4ce6cfded01a38369d8a3c
2020-05-26 10:13:17 +00:00
Lorenzo Colitti
f5a5cd3bd7 Merge "Inform the DNS resolver when it needs to do DNS64 synthesis." am: eed51faa49
Change-Id: Ia18f83bd6a22f255bf17792ebc14e485810a39cd
2020-05-26 09:49:13 +00:00
Lorenzo Colitti
eed51faa49 Merge "Inform the DNS resolver when it needs to do DNS64 synthesis." 2020-05-26 09:26:46 +00:00
Lorenzo Colitti
ccc05a0bc8 Merge "Test that if an RA sets the same prefix as DNS, nothing happens." am: 82db920da4 am: 6d866bcd5f am: 352e8c2aa5 am: 7a35f41cf7
Change-Id: I9623d61a26ddfd90c5a37290056fd896a5e77a54
2020-05-24 11:57:23 +00:00
Lorenzo Colitti
7a35f41cf7 Merge "Test that if an RA sets the same prefix as DNS, nothing happens." am: 82db920da4 am: 6d866bcd5f am: 352e8c2aa5
Change-Id: I5bbb8e5adb2fb2a961fcc64b7952204bb1bb3b0d
2020-05-24 11:43:14 +00:00
Lorenzo Colitti
352e8c2aa5 Merge "Test that if an RA sets the same prefix as DNS, nothing happens." am: 82db920da4 am: 6d866bcd5f
Change-Id: Ib2eb07e3794630cc636759ce6a6529b7b56a3cfe
2020-05-24 11:30:55 +00:00
Lorenzo Colitti
6d866bcd5f Merge "Test that if an RA sets the same prefix as DNS, nothing happens." am: 82db920da4
Change-Id: I61f7ad698fb5b086f5e284309a21f56314d8163f
2020-05-24 11:17:02 +00:00
Lorenzo Colitti
82db920da4 Merge "Test that if an RA sets the same prefix as DNS, nothing happens." 2020-05-24 10:59:40 +00:00
Cody Kesting
e7d4aa8d99 Forward unknown Data Stall types to Connectivity Diagnostics.
This CL forwards suspected Data Stall events detected with unknown
detection methods to ConnectivityDiagnostics.

Currently, ConnectivityService drops any data stall events with unknown
detection methods, which leads to false negatives for Connectivity
Diagnostics registrants. This change ensures that registrants will still
be notified as NetworkStack is updated to use new detection methods.

The documentation for ConnectivityDiagnosticsManager#DataStallReport is
also updated to reflect that the detection methods included in the
report are a bit mask of detection methods used. Implicitly, this means
that data stalls detected via unknown methods will have an empty bit
mask (0x00).

Bug: 156294356
Test: atest ConnectivityDiagnosticsManager
Change-Id: I62d0bf91fcc17c7921afd519c72551399906bd6b
Merged-In: I62d0bf91fcc17c7921afd519c72551399906bd6b
(cherry picked from commit a1d9d811a05bf3447ebb90a39343b53eee79f0db)
2020-05-22 19:12:14 +00:00
Cody Kesting
4f36f41ca2 Merge "Forward unknown Data Stall types to Connectivity Diagnostics." am: c8e843e844 am: fe8cda4daf am: ab63079e61 am: 782a085f7d
Change-Id: I1bf9ca7531d3760f4dce2c9ff502ebf0183b4faf
2020-05-22 00:11:06 +00:00
Cody Kesting
782a085f7d Merge "Forward unknown Data Stall types to Connectivity Diagnostics." am: c8e843e844 am: fe8cda4daf am: ab63079e61
Change-Id: I33a89a56431f168f7bfeb72e2eabef9010685940
2020-05-21 23:50:03 +00:00
Cody Kesting
ab63079e61 Merge "Forward unknown Data Stall types to Connectivity Diagnostics." am: c8e843e844 am: fe8cda4daf
Change-Id: I31d17c5c353e822f3d48166ffe9cc39abd31c198
2020-05-21 23:35:38 +00:00
Cody Kesting
fe8cda4daf Merge "Forward unknown Data Stall types to Connectivity Diagnostics." am: c8e843e844
Change-Id: Ifc49eb81c219d1ba036c11887e2bc686a68dd67d
2020-05-21 23:19:30 +00:00
Cody Kesting
c8e843e844 Merge "Forward unknown Data Stall types to Connectivity Diagnostics." 2020-05-21 22:58:29 +00:00
Cody Kesting
5228100ca1 [automerger skipped] Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." into rvc-dev am: 8d1db61752 -s ours am: 160830b8e7 -s ours am: 49f2af5440 -s ours
am skip reason: Change-Id Ie2f6a1a2376c5c452750ab417cb5e8c24fc44fc3 with SHA-1 7e4528c080 is in history

Change-Id: Id0ac2a40f9e48c52ae1b488f89e408f586a34581
2020-05-21 16:56:02 +00:00
Cody Kesting
233bf14744 [automerger skipped] Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." into rvc-dev am: 8d1db61752 am: 4722e8dfa7 -s ours am: dd7f420cfe -s ours
am skip reason: Change-Id Ie2f6a1a2376c5c452750ab417cb5e8c24fc44fc3 with SHA-1 7e4528c080 is in history

Change-Id: I4d04b37417b0cd04416666b27e7172134893db1e
2020-05-21 16:54:20 +00:00