Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[dnssd] fix minimal mDNS resolver issues #11963

Merged
merged 1 commit into from
Nov 22, 2021

Conversation

gjc13
Copy link
Contributor

@gjc13 gjc13 commented Nov 18, 2021

Problem

  • When intializing both resolver and advertiser with minimal mDNS, the resolver will report INCORRECT_STATE when resolving.
  • The mNumIPs returned by resovler is always zero.

Change overview

Fix these issues.

Testing

The minimal mDNS resolver can give correct results when testing the switch app and binding.

@github-actions
Copy link

github-actions bot commented Nov 18, 2021

PR #11963: Size comparison from 2a7eaf0 to 90b9fb1

Increases (8 builds for esp32, linux)
platform target config section 2a7eaf0 90b9fb1 change % change
esp32 all-clusters-app m5stack (read only) 899319 899327 8 0.0
.flash.text 893935 893943 8 0.0
linux all-clusters-app debug (read only) 1724201 1724217 16 0.0
.text 1453906 1453922 16 0.0
chip-tool debug (read only) 4980557 4980573 16 0.0
.text 4401685 4401701 16 0.0
lighting-app debug+rpc (read only) 1588385 1588401 16 0.0
.text 1324114 1324130 16 0.0
ota-provider-app debug (read only) 1267993 1268009 16 0.0
.text 1056546 1056562 16 0.0
ota-requestor-app debug (read only) 1353665 1353697 32 0.0
.text 1128818 1128850 32 0.0
shell debug (read only) 798209 798241 32 0.0
.text 615490 615522 32 0.0
tv-app debug (read only) 1870881 1870913 32 0.0
.text 1568082 1568114 32 0.0
Full report (38 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 2a7eaf0 90b9fb1 change % change
efr32 lighting-app BRD4161A (read only) 749456 749456 0 0.0
(read/write) 115540 115540 0 0.0
.bss 113740 113740 0 0.0
.data 1800 1800 0 0.0
.text 749448 749448 0 0.0
BRD4161A+rpc (read only) 736988 736988 0 0.0
(read/write) 132168 132168 0 0.0
.bss 130244 130244 0 0.0
.data 1924 1924 0 0.0
.text 736980 736980 0 0.0
lock-app BRD4161A (read only) 726528 726528 0 0.0
(read/write) 113324 113324 0 0.0
.bss 111564 111564 0 0.0
.data 1756 1756 0 0.0
.text 726520 726520 0 0.0
window-app BRD4161A (read only) 727504 727504 0 0.0
(read/write) 113644 113644 0 0.0
.bss 111884 111884 0 0.0
.data 1760 1760 0 0.0
.text 727496 727496 0 0.0
esp32 all-clusters-app c3devkit (read only) 828296 828296 0 0.0
(read/write) 1220130 1220130 0 0.0
.dram0.bss 56688 56688 0 0.0
.dram0.data 14084 14084 0 0.0
.flash.rodata 164104 164104 0 0.0
.flash.text 828296 828296 0 0.0
.iram0.text 61394 61394 0 0.0
m5stack (read only) 899319 899327 8 0.0
(read/write) 419452 419452 0 0.0
.dram0.bss 62040 62040 0 0.0
.dram0.data 34056 34056 0 0.0
.flash.rodata 192076 192076 0 0.0
.flash.text 893935 893943 8 0.0
.iram0.text 122943 122943 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 706636 706636 0 0.0
.bss 77164 77164 0 0.0
.data 1912 1912 0 0.0
.text 621760 621760 0 0.0
lock-app k32w061+debug (read/write) 598076 598076 0 0.0
.bss 67676 67676 0 0.0
.data 1880 1880 0 0.0
.text 522720 522720 0 0.0
shell k32w061+debug (read/write) 663420 663420 0 0.0
.bss 78804 78804 0 0.0
.data 1848 1848 0 0.0
.text 576968 576968 0 0.0
linux all-clusters-app debug (read only) 1724201 1724217 16 0.0
(read/write) 126816 126816 0 0.0
.bss 57392 57392 0 0.0
.data 1042 1042 0 0.0
.data.rel.ro 63088 63088 0 0.0
.dynamic 592 592 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 552 552 0 0.0
.rodata 136341 136341 0 0.0
.text 1453906 1453922 16 0.0
bridge-app debug+rpc (read only) 1319301 1319301 0 0.0
(read/write) 77008 77008 0 0.0
.bss 42096 42096 0 0.0
.data 1568 1568 0 0.0
.data.rel.ro 28344 28344 0 0.0
.dynamic 592 592 0 0.0
.got 3984 3984 0 0.0
.init 27 27 0 0.0
.init_array 408 408 0 0.0
.rodata 111684 111684 0 0.0
.text 1110213 1110213 0 0.0
chip-tool debug (read only) 4980557 4980573 16 0.0
(read/write) 166920 166920 0 0.0
.bss 40456 40456 0 0.0
.data 2272 2272 0 0.0
.data.rel.ro 118680 118680 0 0.0
.dynamic 592 592 0 0.0
.got 4416 4416 0 0.0
.init 27 27 0 0.0
.init_array 472 472 0 0.0
.rodata 268362 268362 0 0.0
.text 4401685 4401701 16 0.0
lighting-app debug+rpc (read only) 1588385 1588401 16 0.0
(read/write) 110224 110224 0 0.0
.bss 47760 47760 0 0.0
.data 1234 1234 0 0.0
.data.rel.ro 55904 55904 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 536 536 0 0.0
.rodata 129265 129265 0 0.0
.text 1324114 1324130 16 0.0
ota-provider-app debug (read only) 1267993 1268009 16 0.0
(read/write) 75656 75656 0 0.0
.bss 44704 44704 0 0.0
.data 784 784 0 0.0
.data.rel.ro 25080 25080 0 0.0
.dynamic 592 592 0 0.0
.got 4016 4016 0 0.0
.init 27 27 0 0.0
.init_array 448 448 0 0.0
.rodata 113855 113855 0 0.0
.text 1056546 1056562 16 0.0
ota-requestor-app debug (read only) 1353665 1353697 32 0.0
(read/write) 79392 79392 0 0.0
.bss 47168 47168 0 0.0
.data 848 848 0 0.0
.data.rel.ro 26280 26280 0 0.0
.dynamic 592 592 0 0.0
.got 3992 3992 0 0.0
.init 27 27 0 0.0
.init_array 472 472 0 0.0
.rodata 124872 124872 0 0.0
.text 1128818 1128850 32 0.0
shell debug (read only) 798209 798241 32 0.0
(read/write) 66440 66440 0 0.0
.bss 23944 23944 0 0.0
.data 242 242 0 0.0
.data.rel.ro 37752 37752 0 0.0
.dynamic 592 592 0 0.0
.got 3528 3528 0 0.0
.init 27 27 0 0.0
.init_array 344 344 0 0.0
.rodata 78703 78703 0 0.0
.text 615490 615522 32 0.0
tv-app debug (read only) 1870881 1870913 32 0.0
(read/write) 318968 318968 0 0.0
.bss 250376 250376 0 0.0
.data 2768 2768 0 0.0
.data.rel.ro 60136 60136 0 0.0
.dynamic 592 592 0 0.0
.got 4432 4432 0 0.0
.init 27 27 0 0.0
.init_array 616 616 0 0.0
.rodata 157669 157669 0 0.0
.text 1568082 1568114 32 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2287384 2287384 0 0.0
.bss 179284 179284 0 0.0
.data 5216 5216 0 0.0
.heap 851944 851944 0 0.0
.text 1249984 1249984 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2273320 2273320 0 0.0
.bss 172148 172148 0 0.0
.data 5576 5576 0 0.0
.heap 858720 858720 0 0.0
.text 1235920 1235920 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2249160 2249160 0 0.0
.bss 171036 171036 0 0.0
.data 5568 5568 0 0.0
.heap 859840 859840 0 0.0
.text 1211760 1211760 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139744 1139744 0 0.0
.bss 11752 11752 0 0.0
.data 4368 4368 0 0.0
.heap 1020328 1020328 0 0.0
.text 103128 103128 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2050352 2050352 0 0.0
.bss 156224 156224 0 0.0
.data 4968 4968 0 0.0
.heap 875256 875256 0 0.0
.text 1012952 1012952 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 864295 864295 0 0.0
bss 110560 110560 0 0.0
rodata 95784 95784 0 0.0
text 582344 582344 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 826695 826695 0 0.0
bss 106916 106916 0 0.0
rodata 86968 86968 0 0.0
text 556512 556512 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 789354 789354 0 0.0
bss 111936 111936 0 0.0
rodata 91044 91044 0 0.0
text 511816 511816 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 839727 839727 0 0.0
bss 109584 109584 0 0.0
rodata 92256 92256 0 0.0
text 562436 562436 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 765014 765014 0 0.0
bss 110996 110996 0 0.0
rodata 87560 87560 0 0.0
text 492000 492000 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 497327 497327 0 0.0
bss 51824 51824 0 0.0
rodata 45780 45780 0 0.0
text 339436 339436 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 845835 845835 0 0.0
bss 109724 109724 0 0.0
rodata 93964 93964 0 0.0
text 566620 566620 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 839427 839427 0 0.0
bss 109620 109620 0 0.0
rodata 92212 92212 0 0.0
text 562056 562056 0 0.0
shell nrf52840dk_nrf52840 (read/write) 777795 777795 0 0.0
bss 109068 109068 0 0.0
rodata 73064 73064 0 0.0
text 521068 521068 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 692850 692850 0 0.0
bss 110052 110052 0 0.0
rodata 67708 67708 0 0.0
text 441680 441680 0 0.0
p6 all-clusters-app default (read/write) 2297480 2297480 0 0.0
.bss 112272 112272 0 0.0
.data 2520 2520 0 0.0
.heap 918552 918552 0 0.0
.text 1255744 1255744 0 0.0
lock-app default (read/write) 2214968 2214968 0 0.0
.bss 100896 100896 0 0.0
.data 2400 2400 0 0.0
.heap 930048 930048 0 0.0
.text 1173232 1173232 0 0.0
qpg lighting-app qpg6100+debug (read only) 493472 493472 0 0.0
(read/write) 114144 114144 0 0.0
.bss 50208 50208 0 0.0
.data 1008 1008 0 0.0
.text 488152 488152 0 0.0
lock-app qpg6100+debug (read only) 468452 468452 0 0.0
(read/write) 114140 114140 0 0.0
.bss 49152 49152 0 0.0
.data 964 964 0 0.0
.text 463132 463132 0 0.0
persistent-storage-app qpg6100+debug (read only) 105408 105408 0 0.0
(read/write) 114142 114142 0 0.0
.bss 8978 8978 0 0.0
.data 272 272 0 0.0
.text 100088 100088 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 767742 767742 0 0.0
bss 79072 79072 0 0.0
noinit 37160 37160 0 0.0
text 532972 532972 0 0.0

* Fix initialization with advertiser
* Fix wrong IP number in resolution result
@gjc13 gjc13 force-pushed the fix-mindns-resolve branch from 90b9fb1 to c26acc3 Compare November 19, 2021 03:37
@github-actions
Copy link

github-actions bot commented Nov 19, 2021

PR #11963: Size comparison from ebadd33 to c26acc3

Decreases (2 builds for linux, mbed)
platform target config section ebadd33 c26acc3b change % change
linux all-clusters-app debug (read only) 1726153 1726137 -16 -0.0
.text 1455538 1455522 -16 -0.0
mbed shell CY8CPROTO_062_4343W+release (read/write) 2050480 2050416 -64 -0.0
.text 1013080 1013016 -64 -0.0
Full report (38 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section ebadd33 c26acc3b change % change
efr32 lighting-app BRD4161A (read only) 749960 749960 0 0.0
(read/write) 115540 115540 0 0.0
.bss 113740 113740 0 0.0
.data 1800 1800 0 0.0
.text 749952 749952 0 0.0
BRD4161A+rpc (read only) 737484 737484 0 0.0
(read/write) 132168 132168 0 0.0
.bss 130244 130244 0 0.0
.data 1924 1924 0 0.0
.text 737476 737476 0 0.0
lock-app BRD4161A (read only) 727016 727016 0 0.0
(read/write) 113324 113324 0 0.0
.bss 111564 111564 0 0.0
.data 1756 1756 0 0.0
.text 727008 727008 0 0.0
window-app BRD4161A (read only) 728000 728000 0 0.0
(read/write) 113644 113644 0 0.0
.bss 111884 111884 0 0.0
.data 1760 1760 0 0.0
.text 727992 727992 0 0.0
esp32 all-clusters-app c3devkit (read only) 828538 828538 0 0.0
(read/write) 1220178 1220178 0 0.0
.dram0.bss 56688 56688 0 0.0
.dram0.data 14084 14084 0 0.0
.flash.rodata 164152 164152 0 0.0
.flash.text 828538 828538 0 0.0
.iram0.text 61394 61394 0 0.0
m5stack (read only) 899595 899595 0 0.0
(read/write) 419492 419492 0 0.0
.dram0.bss 62040 62040 0 0.0
.dram0.data 34056 34056 0 0.0
.flash.rodata 192116 192116 0 0.0
.flash.text 894211 894211 0 0.0
.iram0.text 122943 122943 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 706872 706872 0 0.0
.bss 77164 77164 0 0.0
.data 1912 1912 0 0.0
.text 621996 621996 0 0.0
lock-app k32w061+debug (read/write) 598312 598312 0 0.0
.bss 67676 67676 0 0.0
.data 1880 1880 0 0.0
.text 522956 522956 0 0.0
shell k32w061+debug (read/write) 663656 663656 0 0.0
.bss 78804 78804 0 0.0
.data 1848 1848 0 0.0
.text 577204 577204 0 0.0
linux all-clusters-app debug (read only) 1726153 1726137 -16 -0.0
(read/write) 126816 126816 0 0.0
.bss 57392 57392 0 0.0
.data 1042 1042 0 0.0
.data.rel.ro 63088 63088 0 0.0
.dynamic 592 592 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 552 552 0 0.0
.rodata 136661 136661 0 0.0
.text 1455538 1455522 -16 -0.0
bridge-app debug+rpc (read only) 1321181 1321181 0 0.0
(read/write) 77008 77008 0 0.0
.bss 42096 42096 0 0.0
.data 1568 1568 0 0.0
.data.rel.ro 28352 28352 0 0.0
.dynamic 592 592 0 0.0
.got 3984 3984 0 0.0
.init 27 27 0 0.0
.init_array 408 408 0 0.0
.rodata 111932 111932 0 0.0
.text 1111845 1111845 0 0.0
chip-tool debug (read only) 4986061 4986061 0 0.0
(read/write) 166888 166888 0 0.0
.bss 40456 40456 0 0.0
.data 2272 2272 0 0.0
.data.rel.ro 118672 118672 0 0.0
.dynamic 592 592 0 0.0
.got 4416 4416 0 0.0
.init 27 27 0 0.0
.init_array 472 472 0 0.0
.rodata 268458 268458 0 0.0
.text 4407093 4407093 0 0.0
lighting-app debug+rpc (read only) 1590289 1590289 0 0.0
(read/write) 110224 110224 0 0.0
.bss 47760 47760 0 0.0
.data 1234 1234 0 0.0
.data.rel.ro 55920 55920 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 536 536 0 0.0
.rodata 129553 129553 0 0.0
.text 1325730 1325730 0 0.0
ota-provider-app debug (read only) 1268729 1268729 0 0.0
(read/write) 75656 75656 0 0.0
.bss 44704 44704 0 0.0
.data 784 784 0 0.0
.data.rel.ro 25080 25080 0 0.0
.dynamic 592 592 0 0.0
.got 4016 4016 0 0.0
.init 27 27 0 0.0
.init_array 448 448 0 0.0
.rodata 113951 113951 0 0.0
.text 1057186 1057186 0 0.0
ota-requestor-app debug (read only) 1354465 1354465 0 0.0
(read/write) 79392 79392 0 0.0
.bss 47168 47168 0 0.0
.data 848 848 0 0.0
.data.rel.ro 26280 26280 0 0.0
.dynamic 592 592 0 0.0
.got 3992 3992 0 0.0
.init 27 27 0 0.0
.init_array 472 472 0 0.0
.rodata 124968 124968 0 0.0
.text 1129522 1129522 0 0.0
shell debug (read only) 798801 798801 0 0.0
(read/write) 66440 66440 0 0.0
.bss 23944 23944 0 0.0
.data 242 242 0 0.0
.data.rel.ro 37752 37752 0 0.0
.dynamic 592 592 0 0.0
.got 3528 3528 0 0.0
.init 27 27 0 0.0
.init_array 344 344 0 0.0
.rodata 78703 78703 0 0.0
.text 616082 616082 0 0.0
tv-app debug (read only) 1872785 1872785 0 0.0
(read/write) 318968 318968 0 0.0
.bss 250376 250376 0 0.0
.data 2768 2768 0 0.0
.data.rel.ro 60144 60144 0 0.0
.dynamic 592 592 0 0.0
.got 4432 4432 0 0.0
.init 27 27 0 0.0
.init_array 616 616 0 0.0
.rodata 157893 157893 0 0.0
.text 1569762 1569762 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2287616 2287616 0 0.0
.bss 179284 179284 0 0.0
.data 5216 5216 0 0.0
.heap 851944 851944 0 0.0
.text 1250216 1250216 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2273552 2273552 0 0.0
.bss 172148 172148 0 0.0
.data 5576 5576 0 0.0
.heap 858720 858720 0 0.0
.text 1236152 1236152 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2249456 2249456 0 0.0
.bss 171036 171036 0 0.0
.data 5568 5568 0 0.0
.heap 859840 859840 0 0.0
.text 1212056 1212056 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139744 1139744 0 0.0
.bss 11752 11752 0 0.0
.data 4368 4368 0 0.0
.heap 1020328 1020328 0 0.0
.text 103128 103128 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2050480 2050416 -64 -0.0
.bss 156224 156224 0 0.0
.data 4968 4968 0 0.0
.heap 875256 875256 0 0.0
.text 1013080 1013016 -64 -0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 864595 864595 0 0.0
bss 110560 110560 0 0.0
rodata 95828 95828 0 0.0
text 582604 582604 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 826995 826995 0 0.0
bss 106916 106916 0 0.0
rodata 87012 87012 0 0.0
text 556772 556772 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 789650 789650 0 0.0
bss 111936 111936 0 0.0
rodata 91084 91084 0 0.0
text 512076 512076 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 840027 840027 0 0.0
bss 109584 109584 0 0.0
rodata 92300 92300 0 0.0
text 562696 562696 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 765330 765330 0 0.0
bss 110996 110996 0 0.0
rodata 87604 87604 0 0.0
text 492260 492260 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 497327 497327 0 0.0
bss 51824 51824 0 0.0
rodata 45780 45780 0 0.0
text 339436 339436 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 846135 846135 0 0.0
bss 109724 109724 0 0.0
rodata 94008 94008 0 0.0
text 566880 566880 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 839727 839727 0 0.0
bss 109620 109620 0 0.0
rodata 92256 92256 0 0.0
text 562316 562316 0 0.0
shell nrf52840dk_nrf52840 (read/write) 777971 777971 0 0.0
bss 109068 109068 0 0.0
rodata 73064 73064 0 0.0
text 521236 521236 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 693026 693026 0 0.0
bss 110052 110052 0 0.0
rodata 67708 67708 0 0.0
text 441848 441848 0 0.0
p6 all-clusters-app default (read/write) 2297968 2297968 0 0.0
.bss 112272 112272 0 0.0
.data 2520 2520 0 0.0
.heap 918552 918552 0 0.0
.text 1256232 1256232 0 0.0
lock-app default (read/write) 2215456 2215456 0 0.0
.bss 100896 100896 0 0.0
.data 2400 2400 0 0.0
.heap 930048 930048 0 0.0
.text 1173720 1173720 0 0.0
qpg lighting-app qpg6100+debug (read only) 493688 493688 0 0.0
(read/write) 114144 114144 0 0.0
.bss 50208 50208 0 0.0
.data 1008 1008 0 0.0
.text 488368 488368 0 0.0
lock-app qpg6100+debug (read only) 468652 468652 0 0.0
(read/write) 114140 114140 0 0.0
.bss 49152 49152 0 0.0
.data 964 964 0 0.0
.text 463332 463332 0 0.0
persistent-storage-app qpg6100+debug (read only) 105408 105408 0 0.0
(read/write) 114142 114142 0 0.0
.bss 8978 8978 0 0.0
.data 272 272 0 0.0
.text 100088 100088 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 768010 768010 0 0.0
bss 79072 79072 0 0.0
noinit 37160 37160 0 0.0
text 533194 533194 0 0.0

@Damian-Nordic Damian-Nordic merged commit 3e64cff into project-chip:master Nov 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants