已合并
fix createConnection return errcode #11387
wangJE创建于 2025年12月26日
fix createConnection return errcode #11387
已合并
共 5 个文件变更+13-11
| @@ -26,7 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | 27 | ||
| 28 | 28 | ||
| 29 | -#define LINK_ENHANCE_INTERVAL_ERR 32390300 | 29 | +#define LINK_ENHANCE_INTERNAL_ERR 32390300 |
 | |||
| 30 | 30 | ||
| 31 | 31 | ||
| 32 | 32 | ||
| @@ -33,6 +33,8 @@ | |||
| 33 | 33 | ||
| 34 | 34 | ||
| 35 | 35 | ||
| 36 | + | ||
| 37 | + | ||
| 36 | namespace Communication { | 38 | namespace Communication { |
| 37 | namespace OHOS::Softbus { | 39 | namespace OHOS::Softbus { |
| 38 | 40 | ||
| @@ -52,7 +52,7 @@ static napi_status CheckCreateConnectionParams(napi_env env, napi_callback_info | |||
| 52 | return napi_string_expected; | 52 | return napi_string_expected; |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | - if (deviceId.length() == 0 || name.length() == 0) { | 55 | + if (deviceId.length() == 0 || name.length() == 0 || name.length() > SOFTBUS_NAME_MAX_LEN) { |
| 56 | COMM_LOGE(COMM_SDK, "name or deviceId is null"); | 56 | COMM_LOGE(COMM_SDK, "name or deviceId is null"); |
| 57 | return napi_invalid_arg; | 57 | return napi_invalid_arg; |
| 58 | } | 58 | } |
| @@ -296,7 +296,7 @@ napi_value NapiLinkEnhanceConnection::Connect(napi_env env, napi_callback_info i | |||
| 296 | size_t argc = 0; | 296 | size_t argc = 0; |
| 297 | napi_status status = napi_get_cb_info(env, info, &argc, nullptr, nullptr, nullptr); | 297 | napi_status status = napi_get_cb_info(env, info, &argc, nullptr, nullptr, nullptr); |
| 298 | if (status != napi_ok || argc > ARGS_SIZE_ZERO) { | 298 | if (status != napi_ok || argc > ARGS_SIZE_ZERO) { |
| 299 | - HandleSyncErr(env, LINK_ENHANCE_PARAMETER_INVALID); | 299 | + HandleSyncErr(env, LINK_ENHANCE_INTERNAL_ERR); |
| 300 | return NapiGetUndefinedRet(env); | 300 | return NapiGetUndefinedRet(env); |
| 301 | } | 301 | } |
| 302 | if (!CheckAccessToken()) { | 302 | if (!CheckAccessToken()) { |
| @@ -305,14 +305,14 @@ napi_value NapiLinkEnhanceConnection::Connect(napi_env env, napi_callback_info i | |||
| 305 | } | 305 | } |
| 306 | NapiLinkEnhanceConnection *connection = NapiGetEnhanceConnection(env, info); | 306 | NapiLinkEnhanceConnection *connection = NapiGetEnhanceConnection(env, info); |
| 307 | if (connection == nullptr) { | 307 | if (connection == nullptr) { |
| 308 | - HandleSyncErr(env, LINK_ENHANCE_PARAMETER_INVALID); | 308 | + HandleSyncErr(env, LINK_ENHANCE_INTERNAL_ERR); |
| 309 | return NapiGetUndefinedRet(env); | 309 | return NapiGetUndefinedRet(env); |
| 310 | } | 310 | } |
| 311 | Address address = { | 311 | Address address = { |
| 312 | .addrType = CONNECTION_ADDR_BLE, | 312 | .addrType = CONNECTION_ADDR_BLE, |
| 313 | }; | 313 | }; |
| 314 | if (strcpy_s(address.addr.ble.mac, BT_MAC_LEN, connection->deviceId_.c_str()) != 0) { | 314 | if (strcpy_s(address.addr.ble.mac, BT_MAC_LEN, connection->deviceId_.c_str()) != 0) { |
| 315 | - HandleSyncErr(env, LINK_ENHANCE_INTERVAL_ERR); | 315 | + HandleSyncErr(env, LINK_ENHANCE_INTERNAL_ERR); |
| 316 | return NapiGetUndefinedRet(env); | 316 | return NapiGetUndefinedRet(env); |
| 317 | } | 317 | } |
| 318 | 318 | ||
| @@ -483,7 +483,7 @@ napi_value NapiLinkEnhanceConnection::SendData(napi_env env, napi_callback_info | |||
| 483 | uint8_t *data = (uint8_t *)SoftBusCalloc(dataLen); | 483 | uint8_t *data = (uint8_t *)SoftBusCalloc(dataLen); |
| 484 | if (data == nullptr || memcpy_s(data, dataLen, bufferData, dataLen) != EOK) { | 484 | if (data == nullptr || memcpy_s(data, dataLen, bufferData, dataLen) != EOK) { |
| 485 | SoftBusFree(data); | 485 | SoftBusFree(data); |
| 486 | - HandleSyncErr(env, LINK_ENHANCE_INTERVAL_ERR); | 486 | + HandleSyncErr(env, LINK_ENHANCE_INTERNAL_ERR); |
| 487 | return NapiGetUndefinedRet(env); | 487 | return NapiGetUndefinedRet(env); |
| 488 | } | 488 | } |
| 489 | COMM_LOGI(COMM_SDK, "napi send handle=%{public}u, len=%{public}u", connection->handle_, (uint32_t)dataLen); | 489 | COMM_LOGI(COMM_SDK, "napi send handle=%{public}u, len=%{public}u", connection->handle_, (uint32_t)dataLen); |
| @@ -41,7 +41,7 @@ static napi_status CheckCreateServerParams(napi_env env, napi_callback_info info | |||
| 41 | COMM_LOGE(COMM_SDK, "unexpect string"); | 41 | COMM_LOGE(COMM_SDK, "unexpect string"); |
| 42 | return napi_string_expected; | 42 | return napi_string_expected; |
| 43 | } | 43 | } |
| 44 | - if (name.length() == 0) { | 44 | + if (name.length() == 0 || name.length() > SOFTBUS_NAME_MAX_LEN) { |
| 45 | COMM_LOGE(COMM_SDK, "invalid name"); | 45 | COMM_LOGE(COMM_SDK, "invalid name"); |
| 46 | return napi_invalid_arg; | 46 | return napi_invalid_arg; |
| 47 | } | 47 | } |
| @@ -272,12 +272,12 @@ napi_value NapiLinkEnhanceServer::Start(napi_env env, napi_callback_info info) | |||
| 272 | size_t argc = 0; | 272 | size_t argc = 0; |
| 273 | napi_status status = napi_get_cb_info(env, info, &argc, nullptr, nullptr, nullptr); | 273 | napi_status status = napi_get_cb_info(env, info, &argc, nullptr, nullptr, nullptr); |
| 274 | if (status != napi_ok || argc > ARGS_SIZE_ZERO) { | 274 | if (status != napi_ok || argc > ARGS_SIZE_ZERO) { |
| 275 | - HandleSyncErr(env, LINK_ENHANCE_INTERVAL_ERR); | 275 | + HandleSyncErr(env, LINK_ENHANCE_INTERNAL_ERR); |
| 276 | return NapiGetUndefinedRet(env); | 276 | return NapiGetUndefinedRet(env); |
| 277 | } | 277 | } |
| 278 | NapiLinkEnhanceServer *enhanceServer = NapiGetEnhanceServer(env, info); | 278 | NapiLinkEnhanceServer *enhanceServer = NapiGetEnhanceServer(env, info); |
| 279 | if (enhanceServer == nullptr) { | 279 | if (enhanceServer == nullptr) { |
| 280 | - HandleSyncErr(env, LINK_ENHANCE_INTERVAL_ERR); | 280 | + HandleSyncErr(env, LINK_ENHANCE_INTERNAL_ERR); |
| 281 | return NapiGetUndefinedRet(env); | 281 | return NapiGetUndefinedRet(env); |
| 282 | } | 282 | } |
| 283 | int32_t ret = GeneralCreateServer(PKG_NAME.c_str(), enhanceServer->name_.c_str()); | 283 | int32_t ret = GeneralCreateServer(PKG_NAME.c_str(), enhanceServer->name_.c_str()); |
| @@ -38,7 +38,7 @@ static std::map<int32_t, std::string> napiErrMsgMap { | |||
| 38 | {LINK_ENHANCE_CONNECTIONS_EXCEEDS, "The number of connection exceeds the limit."}, | 38 | {LINK_ENHANCE_CONNECTIONS_EXCEEDS, "The number of connection exceeds the limit."}, |
| 39 | {LINK_ENHANCE_CONNECTION_NOT_READY, "Connection is not ready."}, | 39 | {LINK_ENHANCE_CONNECTION_NOT_READY, "Connection is not ready."}, |
| 40 | {LINK_ENHANCE_PARAMETER_INVALID, "Invalid parameter."}, | 40 | {LINK_ENHANCE_PARAMETER_INVALID, "Invalid parameter."}, |
| 41 | - {LINK_ENHANCE_INTERVAL_ERR, "Internal error."}, | 41 | + {LINK_ENHANCE_INTERNAL_ERR, "Internal error."}, |
| 42 | }; | 42 | }; |
| 43 | 43 | ||
| 44 | int32_t DoInJsMainThread(napi_env env, std::function<void(void)> func) | 44 | int32_t DoInJsMainThread(napi_env env, std::function<void(void)> func) |
| @@ -209,7 +209,7 @@ int32_t ConvertToJsErrcode(int32_t err) | |||
| 209 | case SOFTBUS_CONN_GENERAL_CREATE_SERVER_MAX: | 209 | case SOFTBUS_CONN_GENERAL_CREATE_SERVER_MAX: |
| 210 | return LINK_ENHANCE_SERVERS_EXCEEDS; | 210 | return LINK_ENHANCE_SERVERS_EXCEEDS; |
| 211 | default: | 211 | default: |
| 212 | - return LINK_ENHANCE_INTERVAL_ERR; | 212 | + return LINK_ENHANCE_INTERNAL_ERR; |
| 213 | } | 213 | } |
| 214 | } | 214 | } |
| 215 | 215 | ||
LGTM