summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-02Enable Async MTE in android-clat. am: a8d862c80aandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseEvgenii Stepanov
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/14793614 Change-Id: I5df29ac272511edf2268fb30659d12336a63258a
2021-06-01Enable Async MTE in android-clat.android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devEvgenii Stepanov
This change enables Async mode ARM MTE in clatd on compatible hardware and has no effect otherwise. Bug: 181603044 Test: atest under external/android-clat Change-Id: Ib3c23381e2c7ef84499b26672347468b30c6209a Merged-In: Ib3c23381e2c7ef84499b26672347468b30c6209a (cherry picked from commit afe05e1fdf9cc176617438c87f20c7cbb6fe90b9)
2021-04-06clatd - wait for SIGTERM before terminating am: 05b0541b73 am: 365af12624 ↵Maciej Żenczykowski
am: 34aca1b9f1 Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1661919 Change-Id: I539897f38c81127c41649e79e287858c7b77fb87
2021-04-06clatd - wait for SIGTERM before terminating am: 05b0541b73 am: 365af12624Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1661919 Change-Id: I0c91c3e9459d905811f70d5a3f281f12f85ada03
2021-04-06clatd - wait for SIGTERM before terminating am: 05b0541b73Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1661919 Change-Id: Ifac631378ef7e59429084560f3ab2613ebe75537
2021-04-01clatd - wait for SIGTERM before terminatingandroid-s-beta-2android-s-beta-1Maciej Żenczykowski
Example log from tests: ... 04-01 04:12:22.246 4699 4699 I clatd : Starting clat version 1.4 on netdd54bd mark=0xfffdd plat=2001:db8:cafe:f00d:1:2:: v4=192.0.0.4 v6=2001:db8:1:2:841b:2681:290a:d5d8 04-01 04:12:22.247 4699 4699 I clatd : Using ring buffer with 656 frames (1048576 bytes) at 0xe9883000 04-01 04:12:22.248 4699 4699 W clatd : ipv4 mtu is 1472 04-01 04:12:22.248 4699 4699 I clatd : Using IPv4 address 192.0.0.4 on v4-netdd54bd 04-01 04:12:22.268 322 322 E ClatdController: clatd pid=4699 already started on netdd54bd 04-01 04:12:22.270 4699 4699 I clatd : Using IPv6 address 2001:db8:1:2:841b:2681:290a:d5d8 on netdd54bd 04-01 04:12:22.404 4699 4699 I clatd : Shutting down clat on netdd54bd 04-01 04:12:22.427 4699 4699 I clatd : Clatd on netdd54bd already received SIGTERM ... Bug: 181601458 Test: atest, TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: If6458fb4fd1d611992774e9ae5ec324162ab0629
2021-03-10Merge "Copy the 464xlat vendor property to an AOSP property." am: 1934063f20 ↵Lorenzo Colitti
am: 1886366e64 am: 10a3cf41c3 Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1553819 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7d097f5eedc54b363f0c5fdd3a3fe273d3b22623
2021-03-10Merge "Copy the 464xlat vendor property to an AOSP property." am: 1934063f20 ↵Lorenzo Colitti
am: 1886366e64 Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1553819 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifa8fb1cc469af554d91f90814f72c60681aa0f6b
2021-03-10Merge "Copy the 464xlat vendor property to an AOSP property." am: 1934063f20Lorenzo Colitti
Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1553819 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I76e63ab1646ab930a3f9a7b00ecea74aa3b65692
2021-03-10Merge "Copy the 464xlat vendor property to an AOSP property."Lorenzo Colitti
2021-03-10Copy the 464xlat vendor property to an AOSP property.Lorenzo Colitti
Test: manual Bug: 182333299 Change-Id: I88d570911d4afd0c4123ca7f50c6e7cf3b40b42b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8a332ed6b6 -s ↵Xin Li
ours am: 72b58c3784 -s ours am skip reason: Change-Id Ic101be70fd9ead7df75bcdd1656d504891df8f98 with SHA-1 b4a63890e8 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2a830aa41d54f77c96253c1184fb3c14d9e63ba5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8a332ed6b6 -s oursXin Li
am skip reason: Change-Id Ic101be70fd9ead7df75bcdd1656d504891df8f98 with SHA-1 b4a63890e8 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I29a3e9e1ade60e189b5294fab7c61e5eea57f2ec
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Ic101be70fd9ead7df75bcdd1656d504891df8f98 Change-Id: Icc1d94294a7cfd85c8206b77d05324f4ad62e8d7
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/android-clat am: 370808d269 am: ↵Bob Badour
f446eda196 am: 1f902b59ad Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1588634 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifa3f90e62a0135a87fbaa3b4b2cd1447ff60f9e9
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/android-clat am: 370808d269 am: ↵Bob Badour
f446eda196 Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1588634 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6a53b3e309d2088fb74cf1522f5d586dff444b77
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/android-clat am: 370808d269Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1588634 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib19d3ce3c1cff48a2d8682abb0b5f7a550de9c26
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/android-clatandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ib768b2a4d3461e352c0f8577a0d7cb43eb5e3d89
2021-02-04clatd: move stop_loop() into main.c am: 8ab7e13332 am: 2c2543395c am: 246713b634Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1574002 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I391595e70475b4314fce6ebe0e980bc9126fbb2a
2021-02-04clatd: move stop_loop() into main.c am: 8ab7e13332 am: 2c2543395cMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1574002 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4f7f88e5bddef5508a2a28981cd352a04e2320e6
2021-02-04clatd: move stop_loop() into main.c am: 8ab7e13332Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1574002 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I88221b6c178ddc5e1044e947a7c712dd620ca9f7
2021-02-04clatd: move stop_loop() into main.cMaciej Żenczykowski
* New clang-tidy gives more warnings: .../external/android-clat/main.c:136:23: error: 'stop_loop' may not be asynchronous-safe; calling it from a signal handler may be dangerous [cert-sig30-c,-warnings-as-errors] if (signal(SIGTERM, stop_loop) == SIG_ERR) { ^ .../external/android-clat/main.c:136:7: note: signal handler registered here if (signal(SIGTERM, stop_loop) == SIG_ERR) { ^ external/android-clat/clatd.h:38:1: note: handler function declared here void stop_loop(); ^ Bug: 179304856 Test: builds, atest, TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I06bad709df2ddded97829833f5e86d72ac282fa3
2020-11-24Mark ab/6881855 as merged am: bf4b136c8a am: b4a63890e8Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/13111974 Change-Id: I2b30fdb0f07b5ef8cf9972890b1a4e6c73d0b1d2
2020-11-24Mark ab/6881855 as merged am: bf4b136c8aXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/13111974 Change-Id: Ic101be70fd9ead7df75bcdd1656d504891df8f98
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I1b6589f81545a17e31181d509ca7b5462a54138a
2020-10-20Fix some build errors when CLAT_DEBUG is set to 1 am: df33869985 am: ↵Rocco Yue
ad7caf81ea am: af4ed3d356 am: 598be4f9d4 Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1465871 Change-Id: I06aa76b12fdcbc66715d1a1e9c6231c7a08dbb17
2020-10-20Fix some build errors when CLAT_DEBUG is set to 1 am: df33869985 am: ↵Rocco Yue
ad7caf81ea am: af4ed3d356 Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1465871 Change-Id: I38479a640f000cbd73b28eb9dfb1591af29e8a41
2020-10-20Fix some build errors when CLAT_DEBUG is set to 1 am: df33869985 am: ad7caf81eaRocco Yue
Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1465871 Change-Id: I26e106d9ddb79892683820b1b2ee2b499bdcf0d7
2020-10-20Fix some build errors when CLAT_DEBUG is set to 1 am: df33869985Rocco Yue
Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1465871 Change-Id: I1271efcd337bcb057aacca4c82e029880de88e31
2020-10-20Fix some build errors when CLAT_DEBUG is set to 1Rocco Yue
After seteing CLAT_DEBUG to 1 to enable debug logging, there were some build errors, as shown below: external/android-clat/dump.c:205:6: error: conflicting types for 'dump_tcp' external/android-clat/dump.c:214:6: error: conflicting types for 'dump_tcp6' external/android-clat/dump.c:229:30: error: invalid application of 'sizeof' to an incomplete type 'struct tun_pi' for (i = 0; i < len && i < PACKETLEN; i++) { ^~~~~~~~~ Bug: 171277941 Test: builds and boots Test: connect to ipv6-only wifi network: ping 8.8.8.8 still works Change-Id: Ifb5d84951c4832ae4e3eb8a24329df0243f6ee55
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 0149a84b33 -s ours am: ↵Xin Li
6e883ccb88 -s ours am: dac409f601 -s ours am skip reason: Change-Id Iec23ad0549f731217f4cb5da50aa683434785de6 with SHA-1 06d2f0e393 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/12797235 Change-Id: I0d07f60f63cdb78a593a29f5c67fb6ed7ea855c8
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 0149a84b33 -s ours am: ↵Xin Li
6e883ccb88 -s ours am skip reason: Change-Id Iec23ad0549f731217f4cb5da50aa683434785de6 with SHA-1 06d2f0e393 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/12797235 Change-Id: I0a18cdfe087c9a669ce37c2d3248af773847abf6
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 0149a84b33 -s oursXin Li
am skip reason: Change-Id Iec23ad0549f731217f4cb5da50aa683434785de6 with SHA-1 06d2f0e393 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/12797235 Change-Id: I59aa95f6c867f380a79cacd38f5b6798f2659955
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Iec23ad0549f731217f4cb5da50aa683434785de6 Change-Id: I0510d7371955a836386de45844a2b49bcbdc3a8c
2020-09-13[automerger skipped] update last poll time when the interface poll frequency ↵Rocco Yue
is reached am: 276fdd023c am: 07f75c13b8 -s ours am skip reason: Change-Id I815361b799c444a1094601e83a9b6a2d9fabf521 with SHA-1 276fdd023c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/12541933 Change-Id: I9b783a80b243d7394d6b28386496d345491bd8e4
2020-09-13[automerger skipped] cleanup - remove config.c am: 2d35cdbd89 am: c26d3df4fc ↵Maciej Żenczykowski
-s ours am skip reason: Change-Id I8500881852f1255a69b49eba6354777883fe438f with SHA-1 2d35cdbd89 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/11736440 Change-Id: I7caba6ca05b157725107a9217911c4275e94aee5
2020-09-13[automerger skipped] cleanup - remove tun.h am: 551367e946 am: 4e371d9e5f -s ↵Maciej Żenczykowski
ours am skip reason: Change-Id I7c3a986584aa3d02519545fb928457b61247ed14 with SHA-1 551367e946 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/11736439 Change-Id: Ib3eab42d4059fb52c92e6fcf84627e813ef3e903
2020-09-13[automerger skipped] cleanup - remove send_tun() am: 73a5f20360 am: ↵Maciej Żenczykowski
296cdb1605 -s ours am skip reason: Change-Id If81ca18bf5a33549b532de0d6406e32f4560c93a with SHA-1 73a5f20360 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/11736438 Change-Id: I1d8b55e2aaa2af083ab88e2b8913feaad9456e87
2020-09-13[automerger skipped] cleanup - read_config() and ipv4_local_prefixlen am: ↵Maciej Żenczykowski
8452f3f652 am: e529ea9ab7 -s ours am skip reason: Change-Id I67b70fe298f69ac51dfbc5daf4078b842fb62808 with SHA-1 8452f3f652 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/11736257 Change-Id: Ib75fbb56e4e0880f4222792fdee31b092366cc0a
2020-09-13[automerger skipped] cleanup - config_item_ip() and ↵Maciej Żenczykowski
DEFAULT_IPV4_LOCAL_SUBNET am: 36f4665ab4 am: e8c2d0a817 -s ours am skip reason: Change-Id I0cb3fe5bae5f663d07a8cb63f2dd9ef9ca1a6dd8 with SHA-1 36f4665ab4 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/11736256 Change-Id: I1d7a7efd57dc38ea048a3ab9c8c934741817cd3b
2020-09-13[automerger skipped] cleanup - config_item_ip6() am: 533e31f4ea am: ↵Maciej Żenczykowski
cfdf4fd581 -s ours am skip reason: Change-Id I0338f7ac29fdb0de56bd4a500e2a827cab2c47f7 with SHA-1 533e31f4ea is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/11736255 Change-Id: I72b0e24868e6d586cfc03c6aa857b06d7cc29238
2020-09-13[automerger skipped] cleanup - config_item_int16() & ↵Maciej Żenczykowski
DEFAULT_IPV4_LOCAL_PREFIXLEN am: 6be24d8214 am: a31dc167ea -s ours am skip reason: Change-Id I71716cdcba382bc5fb1efa5000189f63a57015c9 with SHA-1 6be24d8214 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/11736254 Change-Id: Id03324646b1e0417e62b7095c94ee35fdbbd3f76
2020-09-13[automerger skipped] cleanup - config_item_str() am: 2c286b0702 am: ↵Maciej Żenczykowski
fd26ee4c9f -s ours am skip reason: Change-Id I1a8f21e55534457718ea58cdab15266b9f232fd3 with SHA-1 2c286b0702 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/11736243 Change-Id: I840fba05560dc66ed1166d536535306a9b9e2317
2020-09-13[automerger skipped] cleanup - ipv6_host_id and is_dynamic_iid am: ↵Maciej Żenczykowski
2f45839780 am: cb0dff463a -s ours am skip reason: Change-Id Ie3ed4583a95f15165a05412a556bae99dc07706b with SHA-1 2f45839780 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/11735696 Change-Id: I14543e3ba1d4cfe8a67c61ee6f1d39d6801260e3
2020-09-13[automerger skipped] cleanup - dump_config() am: e6bf18509a am: 67994ec799 ↵Maciej Żenczykowski
-s ours am skip reason: Change-Id I781bbb0523211349893d947a500edf0eb12dedfd with SHA-1 e6bf18509a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/11735695 Change-Id: I3841b2ba04adce536124fbaed78ccdc6ff854eb1
2020-09-12[automerger skipped] Delete the clatd code that assigns IPv4 and IPv6 ↵Maciej Żenczykowski
addresses. am: f13d56995f am: 9f6dcb8b7b -s ours am skip reason: Change-Id I8265e9bb04d44ed1dda445fa91881fcd1601dc47 with SHA-1 f13d56995f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/11704601 Change-Id: I3979d3d581c48414962825b91f1ee0af39a946b1
2020-09-12[automerger skipped] Remove DNS64 detection code from clatd. am: c29e1785c1 ↵Lorenzo Colitti
am: 66ce03833b -s ours am skip reason: Change-Id I892f364d6cbfe76277686387e35c04d3d6eb5ecc with SHA-1 c29e1785c1 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/11704600 Change-Id: Id4252e4ecfde84c713700d37759972178bb159f6
2020-09-12Use dnsproxyd_protocol_headers instead of libnetd_client_headers for ↵Luke Huang
NETID_USE_LOCAL_NAMESERVERS am: 12a1f2d8b5 am: 3b332209b5 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/11626547 Change-Id: Ia07699fd37b2a5ff34d6e6ff19d161ec4e23114b
2020-09-09[automerger skipped] update last poll time when the interface poll frequency ↵Rocco Yue
is reached am: 276fdd023c am: f7cbaf36df am: 5a982408e9 -s ours am: 1dd71f8eea -s ours am skip reason: Change-Id I815361b799c444a1094601e83a9b6a2d9fabf521 with SHA-1 276fdd023c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/12541933 Change-Id: Ifa6838a5ee307a6c37e438b6cd7800760fbc74be
2020-09-09[automerger skipped] update last poll time when the interface poll frequency ↵Rocco Yue
is reached am: 276fdd023c -s ours am: da3cebc78b -s ours am: f3c2358de0 -s ours am: 9fc2fe85c3 -s ours am skip reason: Change-Id I815361b799c444a1094601e83a9b6a2d9fabf521 with SHA-1 276fdd023c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/12541933 Change-Id: Ifa28171f11868f4c16f30cc613f15b7c6deda2cb
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 06:58:59 +0000