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.

Sign up for GitHub

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

Jump to bottom

Make CASESessionManager the resolver delegate if ResolverProxy is not passed in #12864

Merged
merged 1 commit into from
Dec 10, 2021
Merged

Make CASESessionManager the resolver delegate if ResolverProxy is not passed in #12864

merged 1 commit into from
Dec 10, 2021

Conversation

carol-apple
Copy link
Contributor

Problem

After #12481 merged, CASESessionManager now takes a ResolverProxy for the config param in order to keep track of which controller is issuing a DNS request. For OTARequestor class, nullptr was being passed in for the ResolverProxy which causes DNS lookup to fail for the OTA case.

Fixes: #12773

Change overview

Make CASESessionManager the resolver delegate if a ResolverProxy is not passed in. This helps with any users of CASESessionManager where it just needs the Node ID resolved but does not need to take additional action.

Testing

Manually tested on Linux:

./out/debug/chip-ota-provider-app -f test.bin
./out/chip-tool pairing onnetwork 1 20202021
./out/debug/chip-ota-requestor-app -d 30 -u 5550
./out/chip-tool pairing onnetwork-long 2 20202021 30
./out/chip-tool otasoftwareupdaterequestor announce-ota-provider 1 0 0 2 0

@boring-cyborg boring-cyborg bot added the app label Dec 10, 2021
@github-actions
Copy link

github-actions bot commented Dec 10, 2021 •
edited
Loading

PR #12864: Size comparison from a37aab5 to 0bb13de

Increases (1 build for linux)
platform target config section a37aab5 0bb13de change % change
linux chip-tool-ipv6only arm64 (read only) 6856796 6856892 96 0.0
.text 5814164 5814260 96 0.0
Full report (14 builds for efr32, k32w, linux, p6, qpg)
platform target config section a37aab5 0bb13de change % change
efr32 lighting-app BRD4161A (read only) 808964 808964 0 0.0
(read/write) 123020 123020 0 0.0
.bss 121160 121160 0 0.0
.data 1860 1860 0 0.0
.text 808956 808956 0 0.0
BRD4161A+rpc (read only) 796600 796600 0 0.0
(read/write) 139696 139696 0 0.0
.bss 137736 137736 0 0.0
.data 1960 1960 0 0.0
.text 796592 796592 0 0.0
window-app BRD4161A (read only) 785940 785940 0 0.0
(read/write) 121152 121152 0 0.0
.bss 119328 119328 0 0.0
.data 1824 1824 0 0.0
.text 785932 785932 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 669336 669336 0 0.0
.bss 73744 73744 0 0.0
.data 1892 1892 0 0.0
.text 587900 587900 0 0.0
lock-app k32w061+debug (read/write) 619284 619284 0 0.0
.bss 71896 71896 0 0.0
.data 1852 1852 0 0.0
.text 539736 539736 0 0.0
shell k32w061+debug (read/write) 624384 624384 0 0.0
.bss 74124 74124 0 0.0
.data 1832 1832 0 0.0
.text 542628 542628 0 0.0
linux chip-tool-ipv6only arm64 (read only) 6856796 6856892 96 0.0
(read/write) 318225 318225 0 0.0
.bss 51713 51713 0 0.0
.data 1096 1096 0 0.0
.data.rel.ro 208696 208696 0 0.0
.dynamic 560 560 0 0.0
.got 53024 53024 0 0.0
.init 24 24 0 0.0
.init_array 168 168 0 0.0
.rodata 363836 363836 0 0.0
.text 5814164 5814260 96 0.0
thermostat-no-ble arm64 (read only) 1947348 1947348 0 0.0
(read/write) 137041 137041 0 0.0
.bss 59441 59441 0 0.0
.data 832 832 0 0.0
.data.rel.ro 70304 70304 0 0.0
.dynamic 560 560 0 0.0
.got 3592 3592 0 0.0
.init 24 24 0 0.0
.init_array 272 272 0 0.0
.rodata 125508 125508 0 0.0
.text 1614336 1614336 0 0.0
p6 all-clusters-app default (read/write) 2361664 2361664 0 0.0
.bss 113116 113116 0 0.0
.data 2520 2520 0 0.0
.heap 917704 917704 0 0.0
.text 1319928 1319928 0 0.0
light-app default (read/write) 2294480 2294480 0 0.0
.bss 100888 100888 0 0.0
.data 2360 2360 0 0.0
.heap 930096 930096 0 0.0
.text 1252744 1252744 0 0.0
lock-app default (read/write) 2270544 2270544 0 0.0
.bss 99768 99768 0 0.0
.data 2328 2328 0 0.0
.heap 931248 931248 0 0.0
.text 1228808 1228808 0 0.0
qpg lighting-app qpg6100+debug (read only) 521224 521224 0 0.0
(read/write) 122336 122336 0 0.0
.bss 82616 82616 0 0.0
.data 992 992 0 0.0
.text 515904 515904 0 0.0
lock-app qpg6100+debug (read only) 495592 495592 0 0.0
(read/write) 122332 122332 0 0.0
.bss 81752 81752 0 0.0
.data 948 948 0 0.0
.text 490272 490272 0 0.0
persistent-storage-app qpg6100+debug (read only) 108104 108104 0 0.0
(read/write) 122336 122336 0 0.0
.bss 36160 36160 0 0.0
.data 288 288 0 0.0
.text 102784 102784 0 0.0

@woody-apple
Copy link
Contributor

/rebase

gjc13
gjc13 approved these changes Dec 10, 2021
View reviewed changes
src/app/CASESessionManager.h Outdated Show resolved Hide resolved
@github-actions
Copy link

github-actions bot commented Dec 10, 2021 •
edited
Loading

PR #12864: Size comparison from 2400884 to a68ff79

Increases (1 build for linux)
platform target config section 2400884 a68ff79 change % change
linux chip-tool-ipv6only arm64 (read only) 6864988 6865068 80 0.0
.text 5820564 5820644 80 0.0
Full report (21 builds for efr32, esp32, k32w, linux, mbed, p6, qpg)
platform target config section 2400884 a68ff79 change % change
efr32 lighting-app BRD4161A (read only) 809204 809204 0 0.0
(read/write) 123148 123148 0 0.0
.bss 121288 121288 0 0.0
.data 1860 1860 0 0.0
.text 809196 809196 0 0.0
BRD4161A+rpc (read only) 796824 796824 0 0.0
(read/write) 139824 139824 0 0.0
.bss 137864 137864 0 0.0
.data 1960 1960 0 0.0
.text 796816 796816 0 0.0
window-app BRD4161A (read only) 786180 786180 0 0.0
(read/write) 121280 121280 0 0.0
.bss 119456 119456 0 0.0
.data 1824 1824 0 0.0
.text 786172 786172 0 0.0
esp32 all-clusters-app c3devkit (read only) 862792 862792 0 0.0
(read/write) 1306058 1306058 0 0.0
.dram0.bss 65832 65832 0 0.0
.dram0.data 14124 14124 0 0.0
.flash.rodata 173064 173064 0 0.0
.flash.text 862792 862792 0 0.0
.iram0.text 62076 62076 0 0.0
m5stack (read only) 966015 966015 0 0.0
(read/write) 451744 451744 0 0.0
.dram0.bss 75128 75128 0 0.0
.dram0.data 34056 34056 0 0.0
.flash.rodata 210772 210772 0 0.0
.flash.text 960631 960631 0 0.0
.iram0.text 123451 123451 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 669560 669560 0 0.0
.bss 73872 73872 0 0.0
.data 1892 1892 0 0.0
.text 587996 587996 0 0.0
lock-app k32w061+debug (read/write) 619508 619508 0 0.0
.bss 72024 72024 0 0.0
.data 1852 1852 0 0.0
.text 539832 539832 0 0.0
shell k32w061+debug (read/write) 624608 624608 0 0.0
.bss 74252 74252 0 0.0
.data 1832 1832 0 0.0
.text 542724 542724 0 0.0
linux chip-tool-ipv6only arm64 (read only) 6864988 6865068 80 0.0
(read/write) 318785 318785 0 0.0
.bss 51985 51985 0 0.0
.data 1192 1192 0 0.0
.data.rel.ro 208776 208776 0 0.0
.dynamic 560 560 0 0.0
.got 53096 53096 0 0.0
.init 24 24 0 0.0
.init_array 176 176 0 0.0
.rodata 364764 364764 0 0.0
.text 5820564 5820644 80 0.0
thermostat-no-ble arm64 (read only) 1947444 1947444 0 0.0
(read/write) 137201 137201 0 0.0
.bss 59601 59601 0 0.0
.data 832 832 0 0.0
.data.rel.ro 70304 70304 0 0.0
.dynamic 560 560 0 0.0
.got 3592 3592 0 0.0
.init 24 24 0 0.0
.init_array 272 272 0 0.0
.rodata 125508 125508 0 0.0
.text 1614432 1614432 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2324328 2324328 0 0.0
.bss 185108 185108 0 0.0
.data 5240 5240 0 0.0
.heap 846096 846096 0 0.0
.text 1286904 1286904 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2308944 2308944 0 0.0
.bss 175824 175824 0 0.0
.data 5528 5528 0 0.0
.heap 855096 855096 0 0.0
.text 1271544 1271544 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2282064 2282064 0 0.0
.bss 174864 174864 0 0.0
.data 5520 5520 0 0.0
.heap 856064 856064 0 0.0
.text 1244664 1244664 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1140008 1140008 0 0.0
.bss 11756 11756 0 0.0
.data 4376 4376 0 0.0
.heap 1020312 1020312 0 0.0
.text 103392 103392 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2053336 2053336 0 0.0
.bss 156900 156900 0 0.0
.data 4864 4864 0 0.0
.heap 874680 874680 0 0.0
.text 1015936 1015936 0 0.0
p6 all-clusters-app default (read/write) 2361904 2361904 0 0.0
.bss 113244 113244 0 0.0
.data 2520 2520 0 0.0
.heap 917576 917576 0 0.0
.text 1320168 1320168 0 0.0
light-app default (read/write) 2294704 2294704 0 0.0
.bss 101016 101016 0 0.0
.data 2360 2360 0 0.0
.heap 929968 929968 0 0.0
.text 1252968 1252968 0 0.0
lock-app default (read/write) 2270784 2270784 0 0.0
.bss 99896 99896 0 0.0
.data 2328 2328 0 0.0
.heap 931120 931120 0 0.0
.text 1229048 1229048 0 0.0
qpg lighting-app qpg6100+debug (read only) 521320 521320 0 0.0
(read/write) 122336 122336 0 0.0
.bss 82712 82712 0 0.0
.data 992 992 0 0.0
.text 516000 516000 0 0.0
lock-app qpg6100+debug (read only) 495688 495688 0 0.0
(read/write) 122332 122332 0 0.0
.bss 81848 81848 0 0.0
.data 948 948 0 0.0
.text 490368 490368 0 0.0
persistent-storage-app qpg6100+debug (read only) 108104 108104 0 0.0
(read/write) 122336 122336 0 0.0
.bss 36160 36160 0 0.0
.data 288 288 0 0.0
.text 102784 102784 0 0.0

@boring-cyborg boring-cyborg bot added the lib label Dec 10, 2021
@restyled-io restyled-io bot mentioned this pull request Dec 10, 2021
Closed
@github-actions
Copy link

github-actions bot commented Dec 10, 2021 •
edited
Loading

PR #12864: Size comparison from e76d65b to cd25978

Increases (1 build for linux)
platform target config section e76d65b cd25978 change % change
linux chip-tool-ipv6only arm64 (read only) 6847340 6847628 288 0.0
.rodata 363964 364044 80 0.0
.text 5802388 5802596 208 0.0
Full report (32 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section e76d65b cd25978 change % change
efr32 lighting-app BRD4161A (read only) 814844 814844 0 0.0
(read/write) 123132 123132 0 0.0
.bss 121272 121272 0 0.0
.data 1860 1860 0 0.0
.text 814836 814836 0 0.0
BRD4161A+rpc (read only) 802476 802476 0 0.0
(read/write) 139808 139808 0 0.0
.bss 137848 137848 0 0.0
.data 1960 1960 0 0.0
.text 802468 802468 0 0.0
window-app BRD4161A (read only) 791920 791920 0 0.0
(read/write) 122080 122080 0 0.0
.bss 120256 120256 0 0.0
.data 1824 1824 0 0.0
.text 791912 791912 0 0.0
esp32 all-clusters-app c3devkit (read only) 856438 856438 0 0.0
(read/write) 1304970 1304970 0 0.0
.dram0.bss 65016 65016 0 0.0
.dram0.data 14124 14124 0 0.0
.flash.rodata 172792 172792 0 0.0
.flash.text 856438 856438 0 0.0
.iram0.text 62076 62076 0 0.0
m5stack (read only) 960099 960099 0 0.0
(read/write) 450704 450704 0 0.0
.dram0.bss 74304 74304 0 0.0
.dram0.data 34048 34048 0 0.0
.flash.rodata 210564 210564 0 0.0
.flash.text 954715 954715 0 0.0
.iram0.text 123451 123451 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 669632 669632 0 0.0
.bss 73856 73856 0 0.0
.data 1892 1892 0 0.0
.text 588084 588084 0 0.0
lock-app k32w061+debug (read/write) 619584 619584 0 0.0
.bss 72008 72008 0 0.0
.data 1852 1852 0 0.0
.text 539924 539924 0 0.0
shell k32w061+debug (read/write) 624904 624904 0 0.0
.bss 74316 74316 0 0.0
.data 1832 1832 0 0.0
.text 542956 542956 0 0.0
linux chip-tool-ipv6only arm64 (read only) 6847340 6847628 288 0.0
(read/write) 318945 318945 0 0.0
.bss 51889 51889 0 0.0
.data 1192 1192 0 0.0
.data.rel.ro 208712 208712 0 0.0
.dynamic 560 560 0 0.0
.got 53424 53424 0 0.0
.init 24 24 0 0.0
.init_array 176 176 0 0.0
.rodata 363964 364044 80 0.0
.text 5802388 5802596 208 0.0
thermostat-no-ble arm64 (read only) 1947956 1947956 0 0.0
(read/write) 137185 137185 0 0.0
.bss 59505 59505 0 0.0
.data 832 832 0 0.0
.data.rel.ro 70344 70344 0 0.0
.dynamic 560 560 0 0.0
.got 3624 3624 0 0.0
.init 24 24 0 0.0
.init_array 272 272 0 0.0
.rodata 125476 125476 0 0.0
.text 1614704 1614704 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2313616 2313616 0 0.0
.bss 184284 184284 0 0.0
.data 5232 5232 0 0.0
.heap 846928 846928 0 0.0
.text 1276192 1276192 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2309040 2309040 0 0.0
.bss 175808 175808 0 0.0
.data 5528 5528 0 0.0
.heap 855112 855112 0 0.0
.text 1271640 1271640 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2282160 2282160 0 0.0
.bss 174848 174848 0 0.0
.data 5520 5520 0 0.0
.heap 856080 856080 0 0.0
.text 1244760 1244760 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1140008 1140008 0 0.0
.bss 11756 11756 0 0.0
.data 4376 4376 0 0.0
.heap 1020312 1020312 0 0.0
.text 103392 103392 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2053672 2053672 0 0.0
.bss 156980 156980 0 0.0
.data 4864 4864 0 0.0
.heap 874600 874600 0 0.0
.text 1016272 1016272 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 906939 906939 0 0.0
bss 116280 116280 0 0.0
rodata 101932 101932 0 0.0
text 613140 613140 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 869987 869987 0 0.0
bss 112628 112628 0 0.0
rodata 93228 93228 0 0.0
text 587884 587884 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 832938 832938 0 0.0
bss 117656 117656 0 0.0
rodata 97188 97188 0 0.0
text 543568 543568 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 879599 879599 0 0.0
bss 113544 113544 0 0.0
rodata 98048 98048 0 0.0
text 592584 592584 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 805838 805838 0 0.0
bss 114952 114952 0 0.0
rodata 93336 93336 0 0.0
text 523104 523104 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 497463 497463 0 0.0
bss 51820 51820 0 0.0
rodata 45852 45852 0 0.0
text 339492 339492 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 884535 884535 0 0.0
bss 113456 113456 0 0.0
rodata 99400 99400 0 0.0
text 596176 596176 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 877731 877731 0 0.0
bss 113332 113332 0 0.0
rodata 97540 97540 0 0.0
text 591372 591372 0 0.0
shell nrf52840dk_nrf52840 (read/write) 782283 782283 0 0.0
bss 109624 109624 0 0.0
rodata 74296 74296 0 0.0
text 523852 523852 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 697362 697362 0 0.0
bss 110604 110604 0 0.0
rodata 68940 68940 0 0.0
text 444492 444492 0 0.0
p6 all-clusters-app default (read/write) 2360168 2360168 0 0.0
.bss 112484 112484 0 0.0
.data 2520 2520 0 0.0
.heap 918336 918336 0 0.0
.text 1318432 1318432 0 0.0
light-app default (read/write) 2300384 2300384 0 0.0
.bss 101064 101064 0 0.0
.data 2360 2360 0 0.0
.heap 929920 929920 0 0.0
.text 1258648 1258648 0 0.0
lock-app default (read/write) 2276456 2276456 0 0.0
.bss 99944 99944 0 0.0
.data 2328 2328 0 0.0
.heap 931072 931072 0 0.0
.text 1234720 1234720 0 0.0
qpg lighting-app qpg6100+debug (read only) 521412 521412 0 0.0
(read/write) 122336 122336 0 0.0
.bss 82696 82696 0 0.0
.data 992 992 0 0.0
.text 516092 516092 0 0.0
lock-app qpg6100+debug (read only) 495800 495800 0 0.0
(read/write) 122332 122332 0 0.0
.bss 81832 81832 0 0.0
.data 948 948 0 0.0
.text 490480 490480 0 0.0
persistent-storage-app qpg6100+debug (read only) 108104 108104 0 0.0
(read/write) 122336 122336 0 0.0
.bss 36160 36160 0 0.0
.data 288 288 0 0.0
.text 102784 102784 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 811418 811418 0 0.0
bss 82848 82848 0 0.0
noinit 37160 37160 0 0.0
text 566528 566528 0 0.0

@carol-apple carol-apple merged commit 04b8378 into project-chip:master Dec 10, 2021
@carol-apple carol-apple mentioned this pull request Dec 10, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Damian-Nordic Damian-Nordic Damian-Nordic approved these changes

@bzbarsky-apple bzbarsky-apple bzbarsky-apple approved these changes

@yunhanw-google yunhanw-google yunhanw-google approved these changes

@gjc13 gjc13 gjc13 approved these changes

@andy31415 andy31415 Awaiting requested review from andy31415

@anush-apple anush-apple Awaiting requested review from anush-apple

@austinh0 austinh0 Awaiting requested review from austinh0

@balducci-apple balducci-apple Awaiting requested review from balducci-apple

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

@franck-apple franck-apple Awaiting requested review from franck-apple

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

@hawk248 hawk248 Awaiting requested review from hawk248

@holbrookt holbrookt Awaiting requested review from holbrookt

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@LuDuda LuDuda Awaiting requested review from LuDuda

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@pan-apple pan-apple Awaiting requested review from pan-apple

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@sagar-apple sagar-apple Awaiting requested review from sagar-apple

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@turon turon Awaiting requested review from turon

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

Assignees
No one assigned
Labels
app lib review - approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Revisit who should be set as the resolver delegate
6 participants
@carol-apple @woody-apple @gjc13 @yunhanw-google @bzbarsky-apple @Damian-Nordic