openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2024-11-30 04:10:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!5853 bugfix join metanode

Browse Source 
Merge pull request !5853 from 付舒长/master
This commit is contained in:
openharmony_ci 2024-04-25 06:41:44 +00:00 committed by Gitee
commit fa7ab421de
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/authentication/src/auth_session_message.c
View File

@ -786,7 +786,7 @@ static bool VerifySessionInfoIdType(const AuthSessionInfo *info, JsonObj *obj, c
return true;
}
static void PackUDIDAbatementFlag(JsonObj *obj, AuthSessionInfo *info)
static void PackUDIDAbatementFlag(JsonObj *obj, const AuthSessionInfo *info)
{
if (IsSupportUDIDAbatement() && !JSON_AddBoolToObject(obj, IS_NEED_PACK_CERT, IsNeedUDIDAbatement(info))) {
AUTH_LOGE(AUTH_FSM, "add pack cert flag fail.");
@ -850,7 +850,7 @@ static char *PackDeviceIdJson(const AuthSessionInfo *info)
if (info->isServer && info->connInfo.type == AUTH_LINK_TYPE_WIFI) {
GenerateUdidShortHash(info->udid, (char *)info->connInfo.info.ipInfo.deviceIdHash, UDID_HASH_LEN);
}
PackUDIDAbatementFlag(obj, (AuthSessionInfo *)info);
PackUDIDAbatementFlag(obj, info);
char *msg = JSON_PrintUnformatted(obj);
JSON_Delete(obj);
return msg;
@ -1745,7 +1745,7 @@ static int32_t UnpackDeviceInfoBtV1(const JsonObj *json, NodeInfo *info)
static int32_t PackCertificateInfo(JsonObj *json, const AuthSessionInfo *info)
{
if (!IsSupportUDIDAbatement() || !info->isNeedPackCert) {
if (info == NULL || !IsSupportUDIDAbatement() || !info->isNeedPackCert) {
AUTH_LOGI(AUTH_FSM, "device not support udid abatement or no need");
return SOFTBUS_OK;
}
@ -1774,7 +1774,7 @@ static int32_t PackCertificateInfo(JsonObj *json, const AuthSessionInfo *info)
static int32_t UnpackCertificateInfo(JsonObj *json, NodeInfo *nodeInfo, const AuthSessionInfo *info)
{
if (!IsSupportUDIDAbatement() || !IsNeedUDIDAbatement(info)) {
if (info == NULL || !IsSupportUDIDAbatement() || !IsNeedUDIDAbatement(info)) {
AUTH_LOGI(AUTH_FSM, "device not support udid abatement or no need");
return SOFTBUS_OK;
}
@ -1811,7 +1811,7 @@ char *PackDeviceInfoMessage(int32_t linkType, SoftBusVersion version, bool isMet
{
AUTH_LOGI(AUTH_FSM, "connType=%{public}d", linkType);
const NodeInfo *nodeInfo = LnnGetLocalNodeInfo();
if (info == NULL) {
if (nodeInfo == NULL) {
AUTH_LOGE(AUTH_FSM, "local info is null");
return NULL;
}