From 34dcc9934995beec0f6fff0f8b656503ae7fa65a Mon Sep 17 00:00:00 2001 From: kou-chuxiong Date: Mon, 4 Aug 2025 20:54:49 +0800 Subject: [PATCH 1/2] diff error code from peer on das task main c Signed-off-by: kou-chuxiong --- interfaces/inner_api/device_auth_defines.h | 16 ++++++++++++++++ .../src/account_unrelated/das_task_main.c | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/interfaces/inner_api/device_auth_defines.h b/interfaces/inner_api/device_auth_defines.h index c9bbc134..4ba5becd 100644 --- a/interfaces/inner_api/device_auth_defines.h +++ b/interfaces/inner_api/device_auth_defines.h @@ -225,6 +225,22 @@ enum { BAD_PAYLOAD = 0xF000000B, // -268435445 ALGORITHM_UNSUPPORTED = 0xF000000C, // -268435444 PROOF_MISMATCH = 0xF000000D, // -268435443 + + /* error code used on DAS service for peer error */ + PEER_ERROR = 0x0F000000, // 251658240 + PEER_INVALID_PARAMETERS = 0xFF000001, // -16777214 + PEER_EXCEED_AUTHORITY = 0xFF000002, // -16777213 + PEER_TIMEOUT = 0xFF000003, // -16777212 + PEER_NOT_REGISTERED = 0xFF000004, // -16777211 + PEER_NOT_TRUST_PEER = 0xFF000005, // -16777210 + PEER_NOT_TRUST_CONTROLLER = 0xFF000006, // -16777209 + PEER_NOT_TRUST_ACCESSORY = 0xFF000007, // -16777208 + PEER_OVER_MAX_TRUST_NUM = 0xFF000008, // -16777207 + PEER_CONNECTION_INTERRUPTED = 0xFF000009, // -16777206 + PEER_UNSUPPORTED_VERSION = 0xFF00000A, // -16777205 + PEER_BAD_PAYLOAD = 0xFF00000B, // -16777204 + PEER_ALGORITHM_UNSUPPORTED = 0xFF00000C, // -16777203 + PEER_PROOF_MISMATCH = 0xFF00000D, // -16777202 }; #endif diff --git a/services/legacy/authenticators/src/account_unrelated/das_task_main.c b/services/legacy/authenticators/src/account_unrelated/das_task_main.c index e098aadf..cfc0f8f0 100644 --- a/services/legacy/authenticators/src/account_unrelated/das_task_main.c +++ b/services/legacy/authenticators/src/account_unrelated/das_task_main.c @@ -240,7 +240,7 @@ static int ProcessTaskT(Task *task, const CJson *in, CJson *out, int32_t *status int32_t res; if (IsPeerErrMessage(in, &res)) { LOGE("Receive error message from peer, errCode: %" LOG_PUB "x.", res); - DasSendErrMsgToSelf(out, HC_ERR_PEER_ERROR); + DasSendErrMsgToSelf(out, res | PEER_ERROR); return HC_ERR_PEER_ERROR; } if (task->vec.size(&(task->vec)) == 0) { From 14d9d3a22ee595a5266976b9d583d57986553537 Mon Sep 17 00:00:00 2001 From: kou-chuxiong Date: Mon, 4 Aug 2025 21:09:23 +0800 Subject: [PATCH 2/2] Modify to comply with the specifications Signed-off-by: kou-chuxiong --- interfaces/inner_api/device_auth_defines.h | 2 +- .../legacy/authenticators/src/account_unrelated/das_task_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/inner_api/device_auth_defines.h b/interfaces/inner_api/device_auth_defines.h index 4ba5becd..881ce418 100644 --- a/interfaces/inner_api/device_auth_defines.h +++ b/interfaces/inner_api/device_auth_defines.h @@ -227,7 +227,7 @@ enum { PROOF_MISMATCH = 0xF000000D, // -268435443 /* error code used on DAS service for peer error */ - PEER_ERROR = 0x0F000000, // 251658240 + PEER_ERROR_MASK = 0x0F000000, // 251658240 PEER_INVALID_PARAMETERS = 0xFF000001, // -16777214 PEER_EXCEED_AUTHORITY = 0xFF000002, // -16777213 PEER_TIMEOUT = 0xFF000003, // -16777212 diff --git a/services/legacy/authenticators/src/account_unrelated/das_task_main.c b/services/legacy/authenticators/src/account_unrelated/das_task_main.c index cfc0f8f0..c8a31cea 100644 --- a/services/legacy/authenticators/src/account_unrelated/das_task_main.c +++ b/services/legacy/authenticators/src/account_unrelated/das_task_main.c @@ -240,7 +240,7 @@ static int ProcessTaskT(Task *task, const CJson *in, CJson *out, int32_t *status int32_t res; if (IsPeerErrMessage(in, &res)) { LOGE("Receive error message from peer, errCode: %" LOG_PUB "x.", res); - DasSendErrMsgToSelf(out, res | PEER_ERROR); + DasSendErrMsgToSelf(out, res | PEER_ERROR_MASK); return HC_ERR_PEER_ERROR; } if (task->vec.size(&(task->vec)) == 0) {