Skip to content

Commit 636cb29

Browse files
authored
Use SOFTWARE_UDPATE_IGNORED error iso UNSUPPORTED_EXCHANGE_VERSION (#26261)
1 parent 5a68477 commit 636cb29

File tree

5 files changed

+3
-14
lines changed

5 files changed

+3
-14
lines changed

docs/ERROR_CODES.md

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ This file was **AUTOMATICALLY** generated by
2121
| 2 | 0x02 | `CHIP_ERROR_CONNECTION_ABORTED` |
2222
| 3 | 0x03 | `CHIP_ERROR_INCORRECT_STATE` |
2323
| 4 | 0x04 | `CHIP_ERROR_MESSAGE_TOO_LONG` |
24-
| 5 | 0x05 | `CHIP_ERROR_UNSUPPORTED_EXCHANGE_VERSION` |
2524
| 6 | 0x06 | `CHIP_ERROR_TOO_MANY_UNSOLICITED_MESSAGE_HANDLERS` |
2625
| 7 | 0x07 | `CHIP_ERROR_NO_UNSOLICITED_MESSAGE_HANDLER` |
2726
| 8 | 0x08 | `CHIP_ERROR_NO_CONNECTION_HANDLER` |

src/lib/core/CHIPError.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err)
7474
case CHIP_ERROR_MESSAGE_TOO_LONG.AsInteger():
7575
desc = "Message too long";
7676
break;
77-
case CHIP_ERROR_UNSUPPORTED_EXCHANGE_VERSION.AsInteger():
78-
desc = "Unsupported exchange version";
79-
break;
8077
case CHIP_ERROR_TOO_MANY_UNSOLICITED_MESSAGE_HANDLERS.AsInteger():
8178
desc = "Too many unsolicited message handlers";
8279
break;

src/lib/core/CHIPError.h

+1-8
Original file line numberDiff line numberDiff line change
@@ -466,14 +466,7 @@ using CHIP_ERROR = ::chip::ChipError;
466466
*/
467467
#define CHIP_ERROR_MESSAGE_TOO_LONG CHIP_CORE_ERROR(0x04)
468468

469-
/**
470-
* @def CHIP_ERROR_UNSUPPORTED_EXCHANGE_VERSION
471-
*
472-
* @brief
473-
* An exchange version is not supported.
474-
*
475-
*/
476-
#define CHIP_ERROR_UNSUPPORTED_EXCHANGE_VERSION CHIP_CORE_ERROR(0x05)
469+
// AVAILABLE: 0x05
477470

478471
/**
479472
* @def CHIP_ERROR_TOO_MANY_UNSOLICITED_MESSAGE_HANDLERS

src/lib/core/tests/TestCHIPErrorStr.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ static const CHIP_ERROR kTestElements[] =
5353
CHIP_ERROR_CONNECTION_ABORTED,
5454
CHIP_ERROR_INCORRECT_STATE,
5555
CHIP_ERROR_MESSAGE_TOO_LONG,
56-
CHIP_ERROR_UNSUPPORTED_EXCHANGE_VERSION,
5756
CHIP_ERROR_TOO_MANY_UNSOLICITED_MESSAGE_HANDLERS,
5857
CHIP_ERROR_NO_UNSOLICITED_MESSAGE_HANDLER,
5958
CHIP_ERROR_NO_CONNECTION_HANDLER,

src/platform/qpg/OTAImageProcessorImpl.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ CHIP_ERROR OTAImageProcessorImpl::ProcessHeader(ByteSpan & block)
9494

9595
if (true != qvCHIP_OtaValidateImage(qvCHIP_OtaImgHeader))
9696
{
97-
return CHIP_ERROR_UNSUPPORTED_EXCHANGE_VERSION;
97+
// Dropping image due to invalid header
98+
return CHIP_DEVICE_ERROR_SOFTWARE_UPDATE_IGNORED;
9899
}
99100
}
100101

0 commit comments

Comments
 (0)