Commit Graph

10696 Commits

Author SHA1 Message Date
Cody Kesting
dfc033dce1 Merge "Comment reason for simulateDataStall structure." am: 7039e1cbc8 am: 6342a7d978 am: 55cc17ac7d am: aa15955b02 am: 7d024f22c3
Change-Id: I5eb8b9e52e99a2a42cd7d7038442209b89de48ad
2020-05-27 18:22:56 +00:00
Benedict Wong
b7730471fb [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: 05f92d182c -s ours
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 23bd36bc04 is in history

Change-Id: I965a80da971c20403212a8dd3a3ca93f32a901a8
2020-05-27 18:22:17 +00:00
Benedict Wong
9dc8c5fd59 [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: 8132cb6a9e -s ours
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 23bd36bc04 is in history

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

Change-Id: I6188b04df9ca6d33561807128bf3344da874e37e
2020-05-27 18:19:47 +00:00
Cody Kesting
7d024f22c3 Merge "Comment reason for simulateDataStall structure." am: 7039e1cbc8 am: 6342a7d978 am: 55cc17ac7d am: aa15955b02
Change-Id: If3addc4180060680b80f2486839d41539caac73e
2020-05-27 18:10:24 +00:00
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
Cody Kesting
aa15955b02 Merge "Comment reason for simulateDataStall structure." am: 7039e1cbc8 am: 6342a7d978 am: 55cc17ac7d
Change-Id: I0a59c4e0bede9b38922e4c682a7b81b3cdd92fb6
2020-05-27 17:58:10 +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
Cody Kesting
55cc17ac7d Merge "Comment reason for simulateDataStall structure." am: 7039e1cbc8 am: 6342a7d978
Change-Id: Ie236cb45cb2192702df4ce9aaa4e3db7fa1e007c
2020-05-27 17:55:03 +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
6342a7d978 Merge "Comment reason for simulateDataStall structure." am: 7039e1cbc8
Change-Id: I4ef90859ba5a9b4a829016f7b20711d8734492e4
2020-05-27 17:24:20 +00:00
Cody Kesting
7039e1cbc8 Merge "Comment reason for simulateDataStall structure." 2020-05-27 17:11:57 +00:00
Automerger Merge Worker
acca3178c8 Merge "[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: 66931d35c8 -s ours" 2020-05-27 17:07:12 +00:00
Cody Kesting
161420f585 [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: 66931d35c8 -s ours
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 e7d4aa8d99 is in history

Change-Id: I457eddc26f541b284563557e7681b93c03afdefe
2020-05-27 17:06:56 +00:00
Cody Kesting
73818101dc [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: bfefe7c18f -s ours
am skip reason: Change-Id I62d0bf91fcc17c7921afd519c72551399906bd6b with SHA-1 e7d4aa8d99 is in history

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

Change-Id: I2e6cb835b7e4ddda2ffac98a4b70501c2e062109
2020-05-27 17:04:22 +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
f1d48fc772 Merge "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" into rvc-qpr-dev-plus-aosp am: 9d3360ac8f -s ours
am skip reason: Change-Id If8ad2d30712a6df3e207c8d3e8a129705242191e with SHA-1 119ecc6867 is in history

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

Change-Id: I984f1f9314b959fb04e3a81b3064bb3e580baefc
2020-05-26 15:10:56 +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
c6f7b56662 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 am: c9f159d5f8 -s ours
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 3e54957fac is in history

Change-Id: I19602a98f7bf371d1cc0c742b82460c0480c2be8
2020-05-26 13:47:03 +00:00
Lorenzo Colitti
869301c776 [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: c6d2637ae2 -s ours
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 3e54957fac is in history

Change-Id: Ib2211cb849a9235fdbe1536ee8c352e551df61aa
2020-05-26 13:46:53 +00:00
Lorenzo Colitti
d484067bde [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: e4d37aa2fa -s ours
am skip reason: Change-Id I3316d49d42100800740afadc4edf0a13a4d8377c with SHA-1 2a0ef00bb9 is in history

Change-Id: I2617d3198e686417098f8f47d6133579d13f89dc
2020-05-26 13:46:39 +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