summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Snap for 6402531 from 7b753522c0b9fbf9f60fcf2648ffb6a5e5742c88 to rvc-releaseandroid-vts-11.0_r1android-cts-11.0_r1android-11.0.0_r3android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1r-beta-2android11-tests-releaseandroid11-releaseandroid11-gsiandroid-build-team Robot2020-04-171-1/+4
|\ | | | | | | Change-Id: I3add6db84790573d4ed778240fcd8ef02a0ad080
| * Don't enumerate interfaces if no interfaces were found.android11-devLorenzo Colitti2020-04-161-1/+4
|/ | | | | | | | | | | | | | | | When dnsmasq receives a list of interfaces, but cannot find any of them (e.g., because they have all been deleted), it enters the default non-Android codepath where it listens on all interfaces. Then, if any of the interfaces on the system is deleted while it is starting up on all interfaces, it can enter a codepath where it gets stuck for 20(!) seconds for DAD to complete on an interface that no longer exists. Bug: 152695206 Test: new test coverage in netd_integration_test Merged-In: Id9289e5a22dddceb53782d75e3caa4f6a88c6fb1 Change-Id: Id9289e5a22dddceb53782d75e3caa4f6a88c6fb1
* Merge stage-aosp-master into pi-dev-plus-aospandroid-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r11android-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_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12ndk-sysroot-r21android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li2019-02-250-0/+0
|\ | | | | | | | | | | am: 0e01d87593 Change-Id: I83ce519b864b8c2bf230234157928874db337b37
| * Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\ | | | | | | | | | | | | Bug: 126125118 Change-Id: I12eefda4a4a88f65b9116901ed250f764e984d93
| | * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\ | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: I598ebd0579d77c70139670be9a7e83ff4224571e
* | | | Merge "Add default code reviewers into OWNERS" am: ccad735546 am: d5987b6177Chih-hung Hsieh2019-01-241-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | am: 21e623d7e6 Change-Id: I76c48a7bf18801bdeeab3d21c7e94f32e593303a
| * | | Merge "Add default code reviewers into OWNERS" am: ccad735546Chih-hung Hsieh2019-01-241-0/+1
| |\| | | | |/ | |/| | | | | | | | | | am: d5987b6177 Change-Id: If52657280bda7911cbb5254a599578c6e3a00f5e
| | * Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh2019-01-241-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | am: ccad735546 Change-Id: I11104d5f18265e32b406f9f0c8d1554fe064a786
| | | * Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh2019-01-251-0/+1
| | | |\
| | | | * Add default code reviewers into OWNERSChih-Hung Hsieh2019-01-241-0/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | Bug: 33166666 Test: gerrit uploader Change-Id: I1cf5778e622307fc508189991a3d6c24ce6806ac
* | | | Merge "Convert to Android.bp" am: 926a9ca483 am: 036ff47227Dan Willemsen2018-11-163-19/+37
|\| | | | | | | | | | | | | | | | | | | | | | | am: 1bfd896f16 Change-Id: I1dfc4fa629548cc7dc77b8e584e56f1382903bd0
| * | | Merge "Convert to Android.bp" am: 926a9ca483Dan Willemsen2018-11-163-19/+37
| |\| | | | | | | | | | | | | | | | | | | | | | am: 036ff47227 Change-Id: I13eb7bddde8c002700d3bdd8985bcc6b9f8e4ac7
| | * | Merge "Convert to Android.bp"Dan Willemsen2018-11-163-19/+37
| | |\| | | | | | | | | | | | | | | | | | | | | am: 926a9ca483 Change-Id: I242ab3700840a5cf261109fb168ed600588615dd
| | | * Merge "Convert to Android.bp"Treehugger Robot2018-11-173-19/+37
| | | |\
| | | | * Convert to Android.bpDan Willemsen2018-11-163-19/+37
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | See build/soong/README.md for more information. Test: cd external/dnsmasq; mma Change-Id: I1daeca783a0f78f2382fc4d471c4d1191c6e7032
* | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: c26cd5df19 -s ours am: 7cc48d7a68 -s ours am: f0950a4af2 -s ours Change-Id: Ic6267bfeb1575e6ff281a926815685cc46166bc5
| * | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: c26cd5df19 -s ours am: 7cc48d7a68 -s ours Change-Id: I75a140eb10bee5057c28d96233a6a4ba0881d8cd
| | * | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | am: c26cd5df19 -s ours Change-Id: I5c1ae5757538d1cc651d7460704c65f92ffa2698
| | | * Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | | |\ | | | | | | | | | | | | | | | Change-Id: Ibb5c3d1d6c3f3a2c7ae9ef0e70caaebc28e06b73
* | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: 67bc4ebcd3 -s ours am: 8b06235556 -s ours Change-Id: I6bff61435e7819379aa9d3507d8b742cdab0277a
| * | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | MERGE am: 67bc4ebcd3 -s ours Change-Id: Ic17e116d19794dba290d4b9b058e6ee8a0e257d5
| | * | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| |/| | | | |/ | | | | | | Change-Id: If42f4295f7cfa660f9b30320f5bdb18b42e0c078
| | * Snap for 4807121 from be9b6f807197ae63c4e347f6d0bf4427ecacc205 to pi-releaseandroid-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-p-preview-5android-p-preview-4android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releasepie-arcp-preview-4android-build-team Robot2018-05-271-0/+1
| | |\ | | | | | | | | | | | | Change-Id: I8b531ad1814c9ee8b2443fedb92cd5911fda356f
| | * \ Snap for 4620899 from ec0c6d659cc869b0b6f55362a18936afc7885249 to pi-releaseandroid-build-team Robot2018-02-2569-24151/+109
| | |\ \ | | | | | | | | | | | | | | | Change-Id: Ie1ff1d448d2772aeb03014a77ce50be2f8a19e3f
| | * \ \ Snap for 4551672 from d1ba67ece1bce85f60be999572a0b6f1188150d7 to pi-releaseandroid-p-preview-1p-preview-1android-build-team Robot2018-01-181-4/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I191d5c80c7b9cf6ec7d7304a85b9422531a1e16a
| | * \ \ \ Snap for 4373608 from bbaef5a855d74c36e712492c2af5bec9706242be to pi-releaseandroid-build-team Robot2017-10-030-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie1a582ef903ed3739999d5bd3532f3d9b0109c74
| | * \ \ \ \ release-request-c38dc7a9-f664-4c91-8e15-307b4f336902-for-git_pi-release-4277 ↵android-build-team Robot2017-08-161-1/+4
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 421 snap-temp-L88300000093613514 Change-Id: Ibf9df4c6167712d198245a079ddbd277202959c1
* | | | | | | | Merge "Run clang-format with netd's .clang-format file." am: 2295ec5d3a am: ↵Erik Kline2018-06-0617-13688/+11714
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 921409b653 am: 8a524e76a1 Change-Id: I724b6ba58b692191bc882c1949040a338cc1373d
| * | | | | | | Merge "Run clang-format with netd's .clang-format file." am: 2295ec5d3amaster-cuttlefish-testing-releaseErik Kline2018-06-0617-13688/+11714
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 921409b653 Change-Id: I7ef749f115b387475bcfc85355f4e41b552b354a
| | * \ \ \ \ \ \ Merge "Run clang-format with netd's .clang-format file."Erik Kline2018-06-0617-13688/+11714
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2295ec5d3a Change-Id: I25bcc68c089cd26b457f288129f35ac374219e89
| | | * \ \ \ \ \ \ Merge "Run clang-format with netd's .clang-format file."Treehugger Robot2018-06-0717-13688/+11714
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Run clang-format with netd's .clang-format file.Erik Kline2018-06-0617-13688/+11714
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: as follows - built, flashed, booted - USB tethering shows dnsmasq working as expected Change-Id: I41a0cd562cb74634ba571a8f59403e36694345c3
* | | | | | | | | | Merge "Remove unused HAVE_SOCKADDR_SA_LEN ifdef'd code" am: 1d59671fd8 am: ↵Erik Kline2018-06-047-75/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f70f3b7b7b am: 9ab921785d Change-Id: Ic394a74e443dd7b5960958fe235f65994a570098
| * | | | | | | | | Merge "Remove unused HAVE_SOCKADDR_SA_LEN ifdef'd code" am: 1d59671fd8Erik Kline2018-06-047-75/+27
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f70f3b7b7b Change-Id: Iae611e7656e51207c720de4d6fd93b2c2603fb03
| | * | | | | | | | Merge "Remove unused HAVE_SOCKADDR_SA_LEN ifdef'd code"Erik Kline2018-06-047-75/+27
| |/| | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1d59671fd8 Change-Id: I877d2ce514630e9770dcd9bd8d6ad9c3c8eed8c7
| | * | | | | | | Merge "Remove unused HAVE_SOCKADDR_SA_LEN ifdef'd code"Treehugger Robot2018-06-047-75/+27
| | |\ \ \ \ \ \ \
| | | * | | | | | | Remove unused HAVE_SOCKADDR_SA_LEN ifdef'd codeErik Kline2018-06-017-75/+27
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dnsmasq is only built for Android on Linux. Clean up a bit so we can more easily read the code. Also: a few whitespace fixes and assertion of HAVE_IPV6 code paths. Test: as follows - built, flashed, booted - USB tethering works as expected Bug: 38364896 Change-Id: I636ba74b83594f13a7a2e9836e8829e113ca88a0
* | | | | | | | | Merge "Make dnsmasq src files non-executable" am: 67f523ca38 am: c1388d4c4dErik Kline2018-05-2922-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2e0d742d41 Change-Id: If5607acf4a36223f14b2b65febca0a076de396cb
| * | | | | | | | Merge "Make dnsmasq src files non-executable" am: 67f523ca38Erik Kline2018-05-2922-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c1388d4c4d Change-Id: Ifa172d25024c2175091fe66a6d1b2be7f76b664c
| | * | | | | | | | Merge "Make dnsmasq src files non-executable"Erik Kline2018-05-2922-0/+0
| |/| | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 67f523ca38 Change-Id: Ia26a428418d45116236768c3b4635fbfe6edf5ee
| | * | | | | | | Merge "Make dnsmasq src files non-executable"Treehugger Robot2018-05-2922-0/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | Make dnsmasq src files non-executableErik Kline2018-05-2922-0/+0
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: as follows - built, flashed, booted - USB tethering works as expected Bug: 38364896 Change-Id: Ibb95fd5b83eb37e96f8811a4ae03457cd3820b58
* | | | | | | | | [automerger skipped] Merge "Lessen EACCES log spam" am: ed9da87a6e am: ↵Erik Kline2018-05-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 942aec341e -s ours am: d6c1f05c56 -s ours Change-Id: I7c81c300c4af170a8ed39d23416236d6892d8023
| * | | | | | | | [automerger skipped] Merge "Lessen EACCES log spam" am: ed9da87a6eErik Kline2018-05-250-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 942aec341e -s ours Change-Id: I6ace57ec43de1fea92d7569f40220d2c384defbc
| | * | | | | | | | Merge "Lessen EACCES log spam"Erik Kline2018-05-251-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ed9da87a6e Change-Id: I2cd1b5c233c9468e6a64e3b75d2324020223efb6
| | | * | | | | | | Merge "Lessen EACCES log spam"Erik Kline2018-05-251-0/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Lessen EACCES log spamErik Kline2018-05-251-0/+1
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: as follows - built, flashed, booted - started tethering, observed dnsmasq log messages but no EACCES spam Bug: 32163131 Bug: 38364896 Bug: 80229031 Merged-In: I6e6263c1dc535e986b6cf952b61bf44fcf24627a Merged-In: I2b294f3bbde01c1c8ca46df79e9a18d261830a68 Change-Id: I719c81c326c95186576c7186cc25f4eda24091fa (cherry picked from commit be9b6f807197ae63c4e347f6d0bf4427ecacc205)
* | | | | | | | | | Lessen EACCES log spam am: be9b6f8071Erik Kline2018-05-251-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1cdfa7989f Change-Id: I2b294f3bbde01c1c8ca46df79e9a18d261830a68
| * | | | | | | | | Lessen EACCES log spamErik Kline2018-05-251-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | am: be9b6f8071 Change-Id: I6e6263c1dc535e986b6cf952b61bf44fcf24627a
| | * | | | | | | Lessen EACCES log spamandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r3android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devErik Kline2018-05-251-0/+1
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: as follows - built, flashed, booted - started tethering, observed dnsmasq log messages but no EACCES spam Bug: 32163131 Bug: 38364896 Bug: 80229031 Change-Id: I719c81c326c95186576c7186cc25f4eda24091fa