aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-08Snap for 10460766 from e80cf191495cad6788c19ecd42b51ceb25598021 to ↵aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030android14-mainline-healthfitness-releaseAndroid Build Coastguard Worker
mainline-healthfitness-release Change-Id: I13a56e7d818bdca26a8af18a14a8d6a6d3ac30d3
2023-05-26Snap for 10209341 from 7036dd3feed7a39d123a3243d66e849dcacb3e11 to ↵Android Build Coastguard Worker
mainline-healthfitness-release Change-Id: I3042e44e281adb280e2bedf94cd094f9f9b1c6f0
2023-03-08[automerger skipped] Fix UWB start/stop ranging causing mDNS drop am: ↵Ante
9576bf0640 -s ours am: c282fc45c2 -s ours am: 7036dd3fee -s ours am skip reason: Merged-In I1c070d989769752fda92bbe9308ca5bfc7c2d3e5 with SHA-1 b63cb20590 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21805065 Change-Id: I1a8b3d834c3520a9191465613d3521c68ab6e21b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08[automerger skipped] Fix UWB start/stop ranging causing mDNS drop am: ↵android14-devAnte
9576bf0640 -s ours am: c282fc45c2 -s ours am skip reason: Merged-In I1c070d989769752fda92bbe9308ca5bfc7c2d3e5 with SHA-1 b63cb20590 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21805065 Change-Id: I4a974d41693f76adeb72f4ec963daf27bdda68fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08[automerger skipped] Fix UWB start/stop ranging causing mDNS drop am: ↵Ante
9576bf0640 -s ours am skip reason: Merged-In I1c070d989769752fda92bbe9308ca5bfc7c2d3e5 with SHA-1 b63cb20590 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21805065 Change-Id: I557c4466e76fa11cd6b40e6681d1818eb2b6d486 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Fix UWB start/stop ranging causing mDNS dropandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseAnte
Cherry-pick from aosp/2463529 Current mDNS implementation closes and re-opens all of the network interfaces when any of the existing interfaces changes. Since UWB on start/stop ranging modifies its interface, mDNS detects that as a significant enough change to restart all of its interfaces. This change prevents that behaviour since the UWB interface is not related to anything what mDNS does. If the detected interface change is neither an IPv4 or IPv6 capable interface and if the interface type is ARPHRD_IEEE802154 which is the IEEE 802.15.4 PHY and MAC standard that UWB uses, then mDNS will ignore it. Bug:265207453 Test: Verified manually after this fix is applied interfaces no longer restart on UWB start/stop ranging. Change-Id: I1c070d989769752fda92bbe9308ca5bfc7c2d3e5 Merged-In: I1c070d989769752fda92bbe9308ca5bfc7c2d3e5
2023-03-07[automerger skipped] Avoid undefined behavior with high interface index am: ↵Remi NGUYEN VAN
21d030fe43 -s ours am: addd640d82 -s ours am: 29975fdd96 -s ours am skip reason: Merged-In I41fae1900400779cecb715e8cfb1e662b88fd41d with SHA-1 e5434e1b07 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21735193 Change-Id: I64c214473488e5da24b026a6d1816d87659e8aa7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06[automerger skipped] Avoid undefined behavior with high interface index am: ↵Remi NGUYEN VAN
21d030fe43 -s ours am: addd640d82 -s ours am skip reason: Merged-In I41fae1900400779cecb715e8cfb1e662b88fd41d with SHA-1 e5434e1b07 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21735193 Change-Id: I4191f7811a2f6e2e315031524998359d93c9b02d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06[automerger skipped] Avoid undefined behavior with high interface index am: ↵Remi NGUYEN VAN
21d030fe43 -s ours am skip reason: Merged-In I41fae1900400779cecb715e8cfb1e662b88fd41d with SHA-1 e5434e1b07 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/21735193 Change-Id: I37d76f687ca1a41743596b6352da5e6584566fb9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03Merge "Fix UWB start/stop ranging causing mDNS drop" am: e1787d392f am: ↵Ante Culo
3b23452722 am: 62c6662cc2 am: 9aa4389656 Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2463529 Change-Id: I045d699ed8a9c082a7119fe4665a11cec44501af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03Merge "Fix UWB start/stop ranging causing mDNS drop" am: e1787d392f am: ↵Ante Culo
3b23452722 am: 62c6662cc2 Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2463529 Change-Id: Ic9a28bf81c133d1f2bc71b2847ae2b6ed68a6adb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03Avoid undefined behavior with high interface indexRemi NGUYEN VAN
Cherry-pick from aosp/2125173 Behavior of bitwise left shift is undefined when the right operator is greater than the number of bits in the left operand; so the code relied on undefined behavior when interface indexes were >= 32. Just use a boolean instead, as the result was only used as a boolean. Also do not limit reads in if_inet6 to 1 byte for address flags, scope value, and prefix length, as there is no good reason to do so, and this is in line with more recent upstream versions and the interface index read. In practice prefix length, scope value and interface flags should not be above 255 so this should be a no-op. Bug: 235797641 Test: atest NsdManagerTest --rerun-until-failure 50 Change-Id: I41fae1900400779cecb715e8cfb1e662b88fd41d Merged-In: I41fae1900400779cecb715e8cfb1e662b88fd41d
2023-03-03Merge "Fix UWB start/stop ranging causing mDNS drop" am: e1787d392f am: ↵Ante Culo
3b23452722 Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2463529 Change-Id: Id79aba5d2663b79396b27f5483ec51fe001722a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02Merge "Fix UWB start/stop ranging causing mDNS drop" am: e1787d392fandroid-u-beta-1-gplAnte Culo
Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2463529 Change-Id: Ic5f52020e9920913eeafb2307b52aeee8a7c3e06 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02Merge "Fix UWB start/stop ranging causing mDNS drop"Ante Culo
2023-03-01Fix UWB start/stop ranging causing mDNS dropAnte
Current mDNS implementation closes and re-opens all of the network interfaces when any of the existing interfaces changes. Since UWB on start/stop ranging modifies its interface, mDNS detects that as a significant enough change to restart all of its interfaces. This change prevents that behaviour since the UWB interface is not related to anything what mDNS does. If the detected interface change is neither an IPv4 or IPv6 capable interface and if the interface type is ARPHRD_IEEE802154 which is the IEEE 802.15.4 PHY and MAC standard that UWB uses, then mDNS will ignore it. Bug:265207453 Test: Verified manually after this fix is applied interfaces no longer restart on UWB start/stop ranging. Change-Id: I1c070d989769752fda92bbe9308ca5bfc7c2d3e5
2022-07-04[automerger skipped] Merge "Set min_sdk_version" am: 53ed7525b1 am: ↵Treehugger Robot
65aabca6fa -s ours am: 52b2e21388 -s ours am: 30e3b94c99 -s ours am: 4cdbbf938a -s ours am skip reason: Merged-In I50bb1965908beb694a3b417268beb0d8c510b3bd with SHA-1 0a1101c3db is already in history Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2139233 Change-Id: I256bcd2fef7f352393bdd9c45fd4bd2711beadec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04[automerger skipped] Merge "Set min_sdk_version" am: 53ed7525b1 am: ↵main-16k-with-phonesTreehugger Robot
65aabca6fa -s ours am: 52b2e21388 -s ours am: 30e3b94c99 -s ours am skip reason: Merged-In I50bb1965908beb694a3b417268beb0d8c510b3bd with SHA-1 0a1101c3db is already in history Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2139233 Change-Id: I0616f15080745f0af99b10a52a9d642e80b448f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04[automerger skipped] Merge "Set min_sdk_version" am: 53ed7525b1 am: ↵Treehugger Robot
65aabca6fa -s ours am: 52b2e21388 -s ours am skip reason: Merged-In I50bb1965908beb694a3b417268beb0d8c510b3bd with SHA-1 0a1101c3db is already in history Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2139233 Change-Id: I2e4ed53fc32037f17201ce7f4653a2e78d919149 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04[automerger skipped] Merge "Set min_sdk_version" am: 53ed7525b1 am: ↵Treehugger Robot
65aabca6fa -s ours am skip reason: Merged-In I50bb1965908beb694a3b417268beb0d8c510b3bd with SHA-1 0a1101c3db is already in history Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2139233 Change-Id: I25b1aad56ca5569868f4294984d9a86b725d4f4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04Merge "Set min_sdk_version" am: 53ed7525b1main-16kTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2139233 Change-Id: I6c04f8e2df5ce34f85a1419c70ea1177824c2e60 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04Merge "Set min_sdk_version"Treehugger Robot
2022-06-29[automerger skipped] Set min_sdk_version am: 0a1101c3db am: 2716426f6f am: ↵Jooyung Han
290145ab1c -s ours am skip reason: Merged-In I50bb1965908beb694a3b417268beb0d8c510b3bd with SHA-1 b93f834c15 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/19083773 Change-Id: I99be1b3e60a83b4141b40549c281464f315c97ef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29Set min_sdk_version am: 0a1101c3db am: 2716426f6fJooyung Han
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/19083773 Change-Id: I741bddc4263b8be38f2d084a2cb91d35d35bedf8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29Set min_sdk_version am: 0a1101c3dbJooyung Han
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/19083773 Change-Id: Ibdf13da9e836002f021be30ffa548371904ea867 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28Set min_sdk_versionJooyung Han
This was done via the hard-coded list in build/soong. Bug: 158059172 Test: m Merged-In: I50bb1965908beb694a3b417268beb0d8c510b3bd Change-Id: I50bb1965908beb694a3b417268beb0d8c510b3bd (cherry picked from commit 100644d2af7e8c4c2840f446931f49d7710274da)
2022-06-27Set min_sdk_versionJooyung Han
This was done via the hard-coded list in build/soong. Bug: 158059172 Test: m Merged-In: I50bb1965908beb694a3b417268beb0d8c510b3bd Change-Id: I50bb1965908beb694a3b417268beb0d8c510b3bd
2022-06-24Set min_sdk_versionJooyung Han
This was done via the hard-coded list in build/soong. Bug: 158059172 Test: m Change-Id: I50bb1965908beb694a3b417268beb0d8c510b3bd
2022-06-15[automerger skipped] Fix listing of interfaces with ID > 255 am: 4400e30d33 ↵Remi NGUYEN VAN
am: e19915d15d am: 7b6aea7183 -s ours am: d536d07ef1 -s ours am skip reason: Merged-In Iddca5052e7d76bc7878f0442acb9ccd67cbb620f with SHA-1 4400e30d33 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/18883665 Change-Id: I1897dda51a65848d35b06f6bc4b978169d9d66f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15[automerger skipped] Fix listing of interfaces with ID > 255 am: 4400e30d33 ↵Remi NGUYEN VAN
am: e19915d15d -s ours am: a0e4ab477c -s ours am: 240a54a14b -s ours am skip reason: Merged-In Iddca5052e7d76bc7878f0442acb9ccd67cbb620f with SHA-1 4400e30d33 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/18883665 Change-Id: I05959648f70d3596f53ef702cf690ee32ce75019 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15[automerger skipped] Fix listing of interfaces with ID > 255 am: 4400e30d33 ↵Remi NGUYEN VAN
-s ours am: bb14f2c4b0 -s ours am: c0f74715a9 -s ours am: 0d28e96d1f -s ours am skip reason: Merged-In Iddca5052e7d76bc7878f0442acb9ccd67cbb620f with SHA-1 e9c96727e7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/18883665 Change-Id: Icc9cfeeab72eca15c237ba53a47618e21a4a743b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15[automerger skipped] Fix listing of interfaces with ID > 255 am: 4400e30d33 ↵Remi NGUYEN VAN
am: e19915d15d am: 7b6aea7183 -s ours am skip reason: Merged-In Iddca5052e7d76bc7878f0442acb9ccd67cbb620f with SHA-1 4400e30d33 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/18883665 Change-Id: I4f355f06feecc3a424a2b673680f96bd47746684 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15[automerger skipped] Fix listing of interfaces with ID > 255 am: 4400e30d33 ↵Remi NGUYEN VAN
am: e19915d15d -s ours am: a0e4ab477c -s ours am skip reason: Merged-In Iddca5052e7d76bc7878f0442acb9ccd67cbb620f with SHA-1 4400e30d33 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/18883665 Change-Id: Icf753550eadf76d735aba5e7c33767e3d41d5c3c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15[automerger skipped] Fix listing of interfaces with ID > 255 am: 4400e30d33 ↵Remi NGUYEN VAN
-s ours am: bb14f2c4b0 -s ours am: c0f74715a9 -s ours am skip reason: Merged-In Iddca5052e7d76bc7878f0442acb9ccd67cbb620f with SHA-1 e9c96727e7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/18883665 Change-Id: I90e8a1bdbe5e49644a5998f4e1326a8efce3e0b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Fix listing of interfaces with ID > 255 am: 4400e30d33 am: e19915d15dandroid-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseRemi NGUYEN VAN
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/18883665 Change-Id: Ieb0b217cf5768c206c7b5452f21ad3151d8549d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15[automerger skipped] Fix listing of interfaces with ID > 255 am: 4400e30d33 ↵Remi NGUYEN VAN
am: e19915d15d -s ours am skip reason: Merged-In Iddca5052e7d76bc7878f0442acb9ccd67cbb620f with SHA-1 4400e30d33 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/18883665 Change-Id: Id6de64f5ee6c2ab417751d9162ea46354bcbeaea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15[automerger skipped] Fix listing of interfaces with ID > 255 am: 4400e30d33 ↵Remi NGUYEN VAN
am: 81ba82cdf3 -s ours am skip reason: Merged-In Iddca5052e7d76bc7878f0442acb9ccd67cbb620f with SHA-1 e9c96727e7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/18883665 Change-Id: Ia2294c2c7aa28a2bf94607245b038ea34fb01eea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15[automerger skipped] Fix listing of interfaces with ID > 255 am: 4400e30d33 ↵Remi NGUYEN VAN
-s ours am: bb14f2c4b0 -s ours am skip reason: Merged-In Iddca5052e7d76bc7878f0442acb9ccd67cbb620f with SHA-1 e9c96727e7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/18883665 Change-Id: I8c66e7b61386498af64e1e9469d6b571fa97874f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Fix listing of interfaces with ID > 255 am: 4400e30d33Remi NGUYEN VAN
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/18883665 Change-Id: Iac3c41d1c01d11ad1f17df602f447a2d678e80d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15Fix listing of interfaces with ID > 255 am: 4400e30d33Remi NGUYEN VAN
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/18883665 Change-Id: I2273bed9d54b8e52e668fb3d078c7e67d750d5d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15[automerger skipped] Fix listing of interfaces with ID > 255 am: 4400e30d33 ↵Remi NGUYEN VAN
-s ours am skip reason: Merged-In Iddca5052e7d76bc7878f0442acb9ccd67cbb620f with SHA-1 e9c96727e7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/18883665 Change-Id: I61e78d8bf8a21d713092d80af589713bdea4d560 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14Merge "Avoid undefined behavior with high interface index" am: e4f527df23 ↵Maciej Żenczykowski
am: 63725d530c am: 56af74adbd am: d43fa1965e am: f18009bc0c Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2125173 Change-Id: Iebe82a5734aefb060f638aaf6b4d894e27716777 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14Merge "Avoid undefined behavior with high interface index" am: e4f527df23 ↵Maciej Żenczykowski
am: 63725d530c am: 56af74adbd am: d43fa1965e Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2125173 Change-Id: Iba510c061a44b43908b492d9645f5f0f579ba6c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14Merge "Avoid undefined behavior with high interface index" am: e4f527df23 ↵Maciej Żenczykowski
am: 63725d530c am: 56af74adbd Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2125173 Change-Id: I406bfcd1e7a10649f65c2d6a01736106a3659b64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14Merge "Avoid undefined behavior with high interface index" am: e4f527df23 ↵Maciej Żenczykowski
am: 63725d530c Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2125173 Change-Id: Idbfd40e21b7f1d79463a8e0ed7b58bc478bc0de1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14Merge "Avoid undefined behavior with high interface index" am: e4f527df23Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2125173 Change-Id: I92d0a0edb0d67de4d90eeb6b4bfeb11f376227df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14Merge "Avoid undefined behavior with high interface index"Maciej Żenczykowski
2022-06-14Avoid undefined behavior with high interface indexRemi NGUYEN VAN
Behavior of bitwise left shift is undefined when the right operator is greater than the number of bits in the left operand; so the code relied on undefined behavior when interface indexes were >= 32. Just use a boolean instead, as the result was only used as a boolean. Also do not limit reads in if_inet6 to 1 byte for address flags, scope value, and prefix length, as there is no good reason to do so, and this is in line with more recent upstream versions and the interface index read. In practice prefix length, scope value and interface flags should not be above 255 so this should be a no-op. Bug: 235797641 Test: atest NsdManagerTest --rerun-until-failure 50 Change-Id: I41fae1900400779cecb715e8cfb1e662b88fd41d
2022-06-14Fix listing of interfaces with ID > 255android13-devRemi NGUYEN VAN
get_ifi_info_linuxv6 only reads up to 2 hexadecimal characters for interface indexes, so interface indexes above 255 cannot be used. Use %x instead of %02x to remove this limitation. This is what upstream used up to version 878.270.2, after which mdnsresponder stopped using /proc to list interfaces. Only the interface index reading is changed to keep the change minimal. Test: atest NsdManagerTest --rerun-until-failure 100 Bug: 235797641 Change-Id: Iddca5052e7d76bc7878f0442acb9ccd67cbb620f (cherry picked from commit e9c96727e7e42c0ef6ff8edf79087b81a5fb5082) Merged-In: Iddca5052e7d76bc7878f0442acb9ccd67cbb620f
2022-06-14Merge "Fix listing of interfaces with ID > 255" am: 8aac8390a4 am: ↵Remi NGUYEN VAN
c2227020a6 am: c2fabdb7e0 am: af9595656a am: 1a3da6b577 Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2122358 Change-Id: I50f59883168705bb4c15d164504954e2587a56d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 03:53:18 +0000