fix:update br proxy-communication

已开启

fix:update br proxy #12523

crazy_hu创建于 2 天前从crazy_hu/communication_dsoftbus_4166： master 合入到 openharmony/communication_dsoftbus： master

fix:update br proxy #12523

已开启

crazy_hu创建于 2 天前

从crazy_hu/communication_dsoftbus_4166 master合入到openharmony/communication_dsoftbus master

crazy_hu

2 天前

合并受阻

openharmony_ci成员

2 天前添加了label：waiting_on_author

openharmony_ci成员

2 天前评论：

感谢提交 Pull Requests！如果您提交的PR已经开发完毕，请评论 "start build" 触发门禁，更多交互操作，请访问OpenHarmony社区支持命令清单。如果需要调整订阅PR、Issue的变更状态，请访问订阅链接。

Thanks for submitting the pull request. If your Pull Request has already been developed, you can leave a "start build" comment to trigger the gated system. For more commands, please visit OpenHarmony Command List. If you need to change the subscription of a Pull Request or Issue, please visit the link.

openharmony_ci成员

2 天前添加了label：dco检查成功

crazy_hu

2 天前关联了issue：[新需求]: brproxy补充dfx

byx0010成员2 天前进行代码检视1

br_proxy/br_proxy_server_manager.c

13051305 BrProxyInfo *nodeNext = NULL;

13061306 LIST_FOR_EACH_ENTRY_SAFE(nodeInfo, nodeNext, &(g_proxyList->list), BrProxyInfo, node) {

13071307 if (strcmp(nodeInfo->proxyInfo.brMac, param->brMac) != 0 ||

1308- strcmp(nodeInfo->proxyInfo.uuid, param->uuid) != 0) {

1308+ strcmp(nodeInfo->proxyInfo.uuid, param->uuid) != 0 ||

1309+ nodeInfo->requestId != requestId) {

13091310 continue;

13101311 }

13111312 if (nodeInfo->isConnected && nodeInfo->channel.refresh != NULL) {

13221323static int32_t InitProxyChannelParams(const char *brMac, const char *uuid,

13231324 uint32_t requestId, int32_t appIndex, ProxyChannelParam *param)

13241325{

1325- (void)memset_s(param, sizeof(ProxyChannelParam), 0, sizeof(ProxyChannelParam));

13261326 param->requestId = requestId;

13271327 param->appIndex = appIndex;

13281328 TransBrProxyStorageInfo info;

13351335 if (strcpy_s(param->brMac, sizeof(param->brMac), brMac) != EOK ||

13361336 strcpy_s(param->uuid, sizeof(param->uuid), uuid) != EOK) {

13371337 TRANS_LOGE(TRANS_SVC, "[br_proxy] copy brMac or uuid failed");

1338- return SOFTBUS_MEM_ERR;

1338+ return SOFTBUS_STRCPY_ERR;

13391339 }

13401340 param->timeoutMs = BR_PROXY_MAX_WAIT_TIME_MS;

13411341 return SOFTBUS_OK;

13591359 }

13601360 if (!isRefresh) {

13611361 ProxyChannelManager *proxyMgr = GetProxyChannelManager();

1362+ if (ret != SOFTBUS_OK) {

byx00102 天前评论：

应当判断 proxyMgr 是否为 NULL

相关的Issue

原因（目的、解决的问题等）

描述（做了什么，变更了什么）

验证结果（新增、改动、可能影响的功能）

日志规范自检：

安全编码自检：

是否已执行L0用例

合并受阻