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

[OTA] Use default country code in the QueryImage command if the local value is corrupted #14501

Merged
merged 1 commit into from
Jan 28, 2022
Merged

[OTA] Use default country code in the QueryImage command if the local value is corrupted #14501

merged 1 commit into from
Jan 28, 2022

Conversation

selissia
Copy link
Contributor

Problem

Due to #14500 the Requestor may send out an invalid CountryCode value (less than 2 bytes) in the QueryImage command. The Provider then rejects the command failing the OTA Update scenario.

Change overview

Use default country code in the QueryImage command if the local value is corrupted

Testing

Verified OTA Update flow on EFR32 over Thread

@boring-cyborg boring-cyborg bot added the app label Jan 28, 2022
@github-actions
Copy link

github-actions bot commented Jan 28, 2022 •
edited
Loading

PR #14501: Size comparison from 9f1c7e5 to f2eed70

Increases (3 builds for nrfconnect)
platform target config section 9f1c7e5 f2eed70 change % change
nrfconnect lighting-app nrf52840dk_nrf52840 text 668228 668232 4 0.0
nrf52840dk_nrf52840+rpc text 664672 664676 4 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 890546 890562 16 0.0
text 584416 584420 4 0.0
Full report (33 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 9f1c7e5 f2eed70 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 578130 578130 0 0.0
.app_xip_area 484224 484224 0 0.0
.bss 76652 76652 0 0.0
.data 596 596 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock-app CYW30739 (read/write) 536142 536142 0 0.0
.app_xip_area 443780 443780 0 0.0
.bss 75148 75148 0 0.0
.data 560 560 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
efr32 lighting-app BRD4161A (read only) 842984 842984 0 0.0
(read/write) 126200 126200 0 0.0
.bss 124296 124296 0 0.0
.data 1900 1900 0 0.0
.text 842976 842976 0 0.0
BRD4161A+rpc (read only) 830336 830336 0 0.0
(read/write) 142856 142856 0 0.0
.bss 140856 140856 0 0.0
.data 2000 2000 0 0.0
.text 830328 830328 0 0.0
window-app BRD4161A (read only) 815560 815560 0 0.0
(read/write) 124852 124852 0 0.0
.bss 122996 122996 0 0.0
.data 1856 1856 0 0.0
.text 815552 815552 0 0.0
esp32 all-clusters-app c3devkit (read only) 932934 932934 0 0.0
(read/write) 1397322 1397322 0 0.0
.dram0.bss 69688 69688 0 0.0
.dram0.data 14244 14244 0 0.0
.flash.rodata 194480 194480 0 0.0
.flash.text 932934 932934 0 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 980835 980835 0 0.0
(read/write) 461692 461692 0 0.0
.dram0.bss 74432 74432 0 0.0
.dram0.data 34024 34024 0 0.0
.flash.rodata 221108 221108 0 0.0
.flash.text 975451 975451 0 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 662940 662940 0 0.0
.bss 76428 76428 0 0.0
.data 1868 1868 0 0.0
.text 578844 578844 0 0.0
lock k32w061+release (read/write) 663844 663844 0 0.0
.bss 76692 76692 0 0.0
.data 1892 1892 0 0.0
.text 579460 579460 0 0.0
linux chip-tool-ipv6only arm64 (read only) 6765620 6765620 0 0.0
(read/write) 279201 279201 0 0.0
.bss 55537 55537 0 0.0
.data 1128 1128 0 0.0
.data.rel.ro 175984 175984 0 0.0
.dynamic 560 560 0 0.0
.got 42784 42784 0 0.0
.init 24 24 0 0.0
.init_array 200 200 0 0.0
.rodata 386892 386892 0 0.0
.text 5806628 5806628 0 0.0
thermostat-no-ble arm64 (read only) 2080748 2080748 0 0.0
(read/write) 149537 149537 0 0.0
.bss 67169 67169 0 0.0
.data 960 960 0 0.0
.data.rel.ro 74288 74288 0 0.0
.dynamic 560 560 0 0.0
.got 4144 4144 0 0.0
.init 24 24 0 0.0
.init_array 336 336 0 0.0
.rodata 129932 129932 0 0.0
.text 1733472 1733472 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2382472 2382472 0 0.0
.bss 188588 188588 0 0.0
.data 5288 5288 0 0.0
.text 1345072 1345072 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2338200 2338200 0 0.0
.bss 179304 179304 0 0.0
.data 5584 5584 0 0.0
.text 1300800 1300800 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2302240 2302240 0 0.0
.bss 179208 179208 0 0.0
.data 5552 5552 0 0.0
.text 1264840 1264840 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139712 1139712 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103096 103096 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2292980 2292980 0 0.0
.bss 176532 176532 0 0.0
.data 5384 5384 0 0.0
.text 1255552 1255552 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 981375 981375 0 0.0
bss 119660 119660 0 0.0
rodata 115684 115684 0 0.0
text 668228 668232 4 0.0
nrf52840dk_nrf52840+rpc (read/write) 966923 966923 0 0.0
bss 116704 116704 0 0.0
rodata 107160 107160 0 0.0
text 664672 664676 4 0.0
nrf52840dongle_nrf52840 (read/write) 997459 997459 0 0.0
bss 120832 120832 0 0.0
rodata 114516 114516 0 0.0
text 673656 673656 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 890546 890562 16 0.0
bss 116448 116448 0 0.0
rodata 108964 108964 0 0.0
text 584416 584420 4 0.0
lock-app nrf52840dk_nrf52840 (read/write) 913955 913955 0 0.0
bss 118040 118040 0 0.0
rodata 104320 104320 0 0.0
text 614212 614212 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 824006 824006 0 0.0
bss 114856 114856 0 0.0
rodata 97528 97528 0 0.0
text 531172 531172 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 541779 541779 0 0.0
bss 52588 52588 0 0.0
rodata 50048 50048 0 0.0
text 376940 376940 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 916819 916819 0 0.0
bss 117792 117792 0 0.0
rodata 104832 104832 0 0.0
text 616748 616748 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 912003 912003 0 0.0
bss 117816 117816 0 0.0
rodata 103936 103936 0 0.0
text 612788 612788 0 0.0
shell nrf52840dk_nrf52840 (read/write) 798203 798203 0 0.0
bss 109776 109776 0 0.0
rodata 78288 78288 0 0.0
text 533640 533640 0 0.0
p6 all-clusters-app default (read/write) 2441752 2441752 0 0.0
.bss 116740 116740 0 0.0
.data 2584 2584 0 0.0
.text 1400016 1400016 0 0.0
light-app default (read/write) 2338568 2338568 0 0.0
.bss 104484 104484 0 0.0
.data 2408 2408 0 0.0
.text 1296832 1296832 0 0.0
lock-app default (read/write) 2304080 2304080 0 0.0
.bss 104228 104228 0 0.0
.data 2360 2360 0 0.0
.text 1262344 1262344 0 0.0
qpg lighting-app qpg6105+debug (read only) 570884 570884 0 0.0
(read/write) 146936 146936 0 0.0
.bss 88640 88640 0 0.0
.data 1060 1060 0 0.0
.text 565564 565564 0 0.0
lock-app qpg6105+debug (read only) 517004 517004 0 0.0
(read/write) 146940 146940 0 0.0
.bss 88112 88112 0 0.0
.data 992 992 0 0.0
.text 511684 511684 0 0.0
persistent-storage-app qpg6105+debug (read only) 107140 107140 0 0.0
(read/write) 146940 146940 0 0.0
.bss 38504 38504 0 0.0
.data 288 288 0 0.0
.text 101820 101820 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 845786 845786 0 0.0
bss 86440 86440 0 0.0
noinit 37160 37160 0 0.0
text 592522 592522 0 0.0

@selissia selissia merged commit 865aab9 into project-chip:master Jan 28, 2022
selissia added a commit to selissia/connectedhomeip that referenced this pull request Jan 28, 2022
@selissia
Use default country code in QueryImage if the local value is corrupted (
9851ca1 
project-chip#14501)
@selissia selissia deleted the location_fix branch May 12, 2022 15:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmartinez-silabs jmartinez-silabs jmartinez-silabs approved these changes

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

@tcarmelveilleux tcarmelveilleux tcarmelveilleux approved these changes

@carol-apple carol-apple Awaiting requested review from carol-apple

@LuDuda LuDuda Awaiting requested review from LuDuda

@tima-q tima-q Awaiting requested review from tima-q

@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

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

@cecille cecille Awaiting requested review from cecille

@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

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

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

@gjc13 gjc13 Awaiting requested review from gjc13

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

@hawk248 hawk248 Awaiting requested review from hawk248

@jelderton jelderton Awaiting requested review from jelderton

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

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@lzgrablic02 lzgrablic02 Awaiting requested review from lzgrablic02

@mlepage-google mlepage-google Awaiting requested review from mlepage-google

@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

@tecimovic tecimovic Awaiting requested review from tecimovic

@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

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

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

Successfully merging this pull request may close these issues.
4 participants
@selissia @tcarmelveilleux @Damian-Nordic @jmartinez-silabs