summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Snap for 5558509 from 8addcc0f6360cc3762e9ef27437ded250e785da3 to qt-releaseandroid-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r1android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid-build-team Robot2019-05-117-65/+56
|\ | | | | | | Change-Id: I0e5565734f35630e089a6504bb60cbee2f572502
| * clatd: change to pass in tun filedescriptor via command lineandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseMaciej Żenczykowski2019-05-087-65/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest clatd_test, built and installed on aosp_blueline device connected to ipv6-only wifi network: ping 8.8.8.8 still works and it is via v4-wlan0 clat tun interface Bug: 65674744 Bug: 131268436 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I8c9e235e9a5bf1a1436e8dc3af8d0aa86f6dc1a5 Merged-In: I8c9e235e9a5bf1a1436e8dc3af8d0aa86f6dc1a5 (cherry picked from commit 716518d9b9ca52182498b1d7ed0f0ed8ab42cbe1)
* | Snap for 5533229 from 3297c7d7bca85db2b178e8838138b71e9d2a86ad to qt-releaseandroid-build-team Robot2019-05-048-11/+30
|\| | | | | | | Change-Id: I6deb01ed8523b806029a11c2eb7985bb57b6aa9a
| * Enable clang-tidy for clatd.Lorenzo Colitti2019-05-025-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | Enable the same warnings used elsewhere in the tree, and fix two warnings it found (a safe use of strcpy, and a missing O_CLOEXEC when opening the tun device node. Test: builds, boots, clatd works Test: m clatd clatd_test clatd_microbenchmark && atest clatd_test Bug: 131268436 Change-Id: I9a5ea4de5f31d3c495871250a6493b07535a604b Merged-In: I9a5ea4de5f31d3c495871250a6493b07535a604b (cherry picked from commit 6a095dfa6bd2000f650308cdfa5a69e2635c02ec)
| * Fix some clatd cloexec and file descriptor leaking via missing close()Maciej Żenczykowski2019-05-024-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not terribly important since clatd doesn't exec anything, but was muddying the waters while I was searching for other fd-survives-across-exec leakage in netd. While at it also fix another leaked fd which we forgot to close(). Test: builds and boots Bug: 131268436 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Iceb7d4052dc9be29db5c7bb3fe2ee27da7864379 Merged-In: Iceb7d4052dc9be29db5c7bb3fe2ee27da7864379 (cherry picked from commit 60bce378cfa29463f57756fc724d1572747f4fc5)
* | Snap for 5434517 from 9c613ba2bdb1dd029d7eea8475fa47cb9e759a54 to qt-releaseandroid-build-team Robot2019-04-040-0/+0
|\| | | | | | | Change-Id: I1dda877a8acf45868f1da5d8f2b22a2e48f7e38f
| * Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-030-0/+0
| |\ | | | | | | | | | | | | | | | am: 5b3dca4783 Change-Id: Ibff3f70b2b53a5e571a63c354d245802241501c4
| | * Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-021-0/+5
| | |\ | | |/ | |/| | | | | | | Change-Id: I6a8453fa3bf5d87116f15f1fb0237026f4687f78 BUG: 129345239
* | | Snap for 5422062 from 91aa7ccdb2b92c09535d3e309e315635e6ba62a9 to qt-releaseandroid-build-team Robot2019-03-301-0/+5
|\| | | | | | | | | | | Change-Id: Ied45cbe6507c6b75b65f8f6472ece30cf8fa60cc
| * | clat - turn off spurious log messages caused by IPv6 packets am: 4e1601e533 ↵Maciej enczykowski2019-03-301-0/+5
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | am: 95da58bb18 am: 5b9d637742 Change-Id: I6bff6e790f2f6208041b327486d47ecc6cfdf3a3
| | * clat - turn off spurious log messages caused by IPv6 packets am: 4e1601e533Maciej enczykowski2019-03-301-0/+5
| | |\ | | | | | | | | | | | | | | | | | | | | am: 95da58bb18 Change-Id: I997f219909e35cb809a97e9550c8f354958c0122
| | | * clat - turn off spurious log messages caused by IPv6 packetsMaciej enczykowski2019-03-301-0/+5
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | am: 4e1601e533 Change-Id: Ia354583cb87465caefe02d781e4d65f96d6ce570
| | | | * clat - turn off spurious log messages caused by IPv6 packetsMaciej Żenczykowski2019-03-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This eliminates log lines of the form: W clatd : read_packet: unknown packet type = 0x86dd Test: stuff is much quieter on device Bug: 129305844 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I8ee7478b4f956265233ba4e2c4237895607d697c
* | | | | Snap for 5335706 from e6395f1bef4102ad0978f13ea93dcf586653337f to qt-releaseandroid-build-team Robot2019-02-260-0/+0
|\| | | | | | | | | | | | | | | | | | | Change-Id: I1ddad5ebaf2c7e42dc1596be05c9389508d90911
| * | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e9d8305b8c Change-Id: I89e3a047b149b3435b6a1ff71bb5b7c041534f43
| | * | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | Bug: 126125118 Change-Id: I9e05af7783f57268b4fedef04b85ebf001379215
| | | * | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: Ibbd16bc77a559cb6af5c4a00c5c51f623ac5b710
* | | | | | Snap for 5304721 from 212e2fd6bd7bf185abc72883d50b54cae69ab9d2 to qt-releaseandroid-build-team Robot2019-02-131-5/+0
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I77a5a2fc23924a70df383cf5bfbf3626f3fa54b0
| * | | | | Remove the fail-safe owner. am: 6230574aad am: 8b9fb56ec3junyulai2019-02-121-5/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6a4e25abad Change-Id: Idbd0f6df0b0d7a6088ffe63e2508e1f77b21418d
| | * | | | Remove the fail-safe owner. am: 6230574aadjunyulai2019-02-121-5/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8b9fb56ec3 Change-Id: I01b23f7d9084f8774c99cd7935ab0ce961aa9093
| | | * | | Remove the fail-safe owner.junyulai2019-02-121-5/+0
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | am: 6230574aad Change-Id: Icf3bfeea8f428eedec37cb1c63cf9d53274904f4
| | | | * | Remove the fail-safe owner.android-q-preview-1android-o-mr1-iot-release-1.0.10junyulai2019-02-121-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since include statement in OWNERS works as expected. The fail-safe owner could be removed safely. Bug: 120829091 Test: build/make/tools/checkowners.py -c -v path/OWNERS Change-Id: I72ea25d1df96b7de955b69c5e2a9b6ede23adf99
* | | | | | Snap for 5271441 from 156db333bba726a074dde7b1644e38d24dc9d6a1 to qt-releaseandroid-build-team Robot2019-01-3110-185/+14
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8f0fcd780509ec295ab74434506b0f8c21fb9e29
| * | | | | Move checksum code from clatd to libnetutils. am: 98de5958cf am: db02878bb2Lorenzo Colitti2019-01-3010-185/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7dde6ef867 Change-Id: I3aa67d2ab2b45aafa80a8218f9acc44fbfdc81bb
| | * | | | Move checksum code from clatd to libnetutils. am: 98de5958cfLorenzo Colitti2019-01-3010-185/+14
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: db02878bb2 Change-Id: I09c2e95e8232265e4eef6f7b2eee2ecb6eabda24
| | | * | | Move checksum code from clatd to libnetutils.Lorenzo Colitti2019-01-3010-185/+14
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 98de5958cf Change-Id: I740ca590688aaf3b38767c6a4dbd2d5f5c0a5442
| | | | * | Move checksum code from clatd to libnetutils.Lorenzo Colitti2019-01-2010-185/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to use it elsewhere, for example, in netd. Bug: 65674744 Test: builds, boots Test: atest clatd_test clatd_microbenchmark Change-Id: Ic2cea1cd658ffd23ba9fbe45cb6b28e3b5312005
* | | | | | Snap for 5240105 from 56c625999a4434e7b285ea8c43bcdb648872f45d to qt-releaseandroid-build-team Robot2019-01-175-45/+207
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I85f2d0d11bba25ab2a9e032595d44834eda9d3b3
| * | | | | Merge "clatd's .clang-format shouldn't be kept in sync with system/core" am: ↵Maciej Żenczykowski2019-01-161-3/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2356fefaf8 am: 42f6bcba2e am: cd29fe261d Change-Id: I907be6a3747c715acbd357fa8d6cd8c07370dbc1
| | * | | | Merge "clatd's .clang-format shouldn't be kept in sync with system/core" am: ↵Maciej Żenczykowski2019-01-161-3/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2356fefaf8 am: 42f6bcba2e Change-Id: I240f2c2909b4a7513bd1fbc4aa2cbe12f36a75d2
| | | * | | Merge "clatd's .clang-format shouldn't be kept in sync with system/core"Maciej Żenczykowski2019-01-161-3/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2356fefaf8 Change-Id: I096e1ec929e7946c913198fa1a28402470206697
| | | | * | Merge "clatd's .clang-format shouldn't be kept in sync with system/core"Maciej Żenczykowski2019-01-171-3/+0
| | | | |\ \
| | | | | * | clatd's .clang-format shouldn't be kept in sync with system/coreSteven Moreland2019-01-171-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: manual Change-Id: I1d912813fdcf886813595a3eba6af51146640fd7
| * | | | | | Allow passing in the IPv4 and IPv6 addresses on the command line. am: ↵Lorenzo Colitti2019-01-164-42/+207
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0fac8631a am: 2650aff1c5 am: f09aa516a2 Change-Id: Icbb60959797407d72cca9fe6e9278d68f1afd498
| | * | | | | Allow passing in the IPv4 and IPv6 addresses on the command line. am: f0fac8631aLorenzo Colitti2019-01-164-42/+207
| | |\| | | | | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | am: 2650aff1c5 Change-Id: Ic3cb2a0bb3fba97b166efc7a8e0c0df01aa7a7da
| | | * | | Allow passing in the IPv4 and IPv6 addresses on the command line.Lorenzo Colitti2019-01-164-42/+207
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f0fac8631a Change-Id: I517a52334a89a87eafacfdc9e2f862ca87d5f56d
| | | | * | Allow passing in the IPv4 and IPv6 addresses on the command line.Lorenzo Colitti2019-01-154-42/+207
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the address to be determined by netd and passed in, which makes it possible for the rest of the OS to know what the clatd IPv6 address is. Bug: 65674744 Test: atest clatd_test Test: IPv4 on IPv6-only networks continues to work Test: clatd continues to avoid existing IPv4 addresses in 192.0.0.0/29 Test: passing NAT64 prefix, IPv4/IPv6 addresses on command line works Change-Id: I8519c2f01b44022ef036c80aa0df32cd76003055
* | | | | Snap for 5214914 from cce4d974ae42eb7be39ba3575fb78b8c01f46632 to qt-releaseandroid-build-team Robot2019-01-0811-200/+381
|\| | | | | | | | | | | | | | | | | | | Change-Id: I5696bbb35fc4f9e58aa2306d52bbfcbddd0df71c
| * | | | Add clatd_test to presubmit. am: 3335193003 am: 072c04d8f4Lorenzo Colitti2019-01-062-0/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9b6d9f2053 Change-Id: I4613ab497c34d3cb4c295f5e990d2105163a7729
| | * | | Add clatd_test to presubmit. am: 3335193003Lorenzo Colitti2019-01-062-0/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 072c04d8f4 Change-Id: I71dbadeedb0b85be9add3d76dba03df19628d044
| | | * | Add clatd_test to presubmit.Lorenzo Colitti2019-01-062-0/+8
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 3335193003 Change-Id: I28133d81bf0c2758f784eac6f5d03530c62c987a
| | | | * Add clatd_test to presubmit.android-o-mr1-iot-release-1.0.8Lorenzo Colitti2019-01-062-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the instructions at: https://source.android.com/compatibility/tests/development/test-mapping Test: cd external/android-clat; atest Change-Id: Ifca302f53b38d47200d6a1651280391297f14edc
| * | | | Drop support for updating IPv6 addresses in clatd. am: 66deecd38f am: 8f81d511b1Lorenzo Colitti2019-01-064-28/+71
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 210b0dd705 Change-Id: Ib4290a671f7f3266f8dd0c17a1b5e5a4dcbbb123
| | * | | Drop support for updating IPv6 addresses in clatd. am: 66deecd38fLorenzo Colitti2019-01-064-28/+71
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8f81d511b1 Change-Id: I611417f71e5cc5045db3f2e8596ba8d223c1680f
| | | * | Drop support for updating IPv6 addresses in clatd.Lorenzo Colitti2019-01-064-28/+71
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 66deecd38f Change-Id: I2c1c37d733a0147f6f5e764ba603e1bddc754f4c
| | | | * Drop support for updating IPv6 addresses in clatd.Lorenzo Colitti2019-01-064-28/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when clatd detects that the IPv6 address on its interface has changed, it updates its configuration accordingly. This complicates the code, and it prevents us from determining the IPv6 address in netd instead of clatd. Stop doing this, and simply exit instead. The framework will notice that the interface is gone and restart clatd, which will then have the correct configuration (and, unlike current code, the correct NAT64 prefix, if that has changed as well). This change also allows us to drop CAP_NET_ADMIN and run clatd as an unprivileged user with no capabilities. Test: atest clatd_test Test: changing IPv6 address on interface causes clatd to exit Test: "adb shell cat /proc/$(adb shell pidof clatd)/status | grep Cap" Change-Id: I296dcb185f603f685223b24ffefdf7a5c22b66e6
| * | | | Test clatd methods that affect interface IP addresses. am: 72f770c4ad am: ↵Lorenzo Colitti2019-01-061-2/+60
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20a5158d92 am: 2dc24135b4 Change-Id: Iff031bc23d4705c90c6d11e17c93ef39fc198e5b
| | * | | Test clatd methods that affect interface IP addresses. am: 72f770c4adLorenzo Colitti2019-01-061-2/+60
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 20a5158d92 Change-Id: Ic4ee9244477bfdcdb507ed7e14b1f29c5f55b93e
| | | * | Test clatd methods that affect interface IP addresses.Lorenzo Colitti2019-01-061-2/+60
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 72f770c4ad Change-Id: Idbcd11e02f5e700d15f93ec3cefcaf94f6f5337b
| | | | * Test clatd methods that affect interface IP addresses.Lorenzo Colitti2019-01-061-2/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depend on tun_interface so we can add tests to clatd_test that use a real interface instead of mocking everything out. Add a simple test for determining the clat IPv6 address. Test: atest clatd_test Change-Id: I1f10c372388a7c663bebab3c45b206036a264673