From 22a49320ad55bfb6308a230e43ddc90e2fd04617 Mon Sep 17 00:00:00 2001 From: wuminjie Date: Mon, 15 Apr 2024 20:41:35 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E9=AD=94=E9=AC=BC=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wuminjie --- samgr/adapter/cmsis/thread_adapter.c | 2 +- samgr_client/source/remote_register_rpc.c | 4 ++-- samgr_endpoint/source/default_client_mini_adapter.c | 2 +- samgr_endpoint/source/default_client_rpc.c | 2 +- samgr_endpoint/source/samgr_small_ipc_adapter.c | 6 ++++-- samgr_server/source/samgr_server_rpc.c | 3 ++- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/samgr/adapter/cmsis/thread_adapter.c b/samgr/adapter/cmsis/thread_adapter.c index 0e0708d..68c5cf7 100644 --- a/samgr/adapter/cmsis/thread_adapter.c +++ b/samgr/adapter/cmsis/thread_adapter.c @@ -15,8 +15,8 @@ #include "thread_adapter.h" #include "common.h" #include +#include "cmsis_os2.h" -extern void *osThreadGetArgument(void); MutexId MUTEX_InitValue() { diff --git a/samgr_client/source/remote_register_rpc.c b/samgr_client/source/remote_register_rpc.c index 5a630dd..5a31eb1 100644 --- a/samgr_client/source/remote_register_rpc.c +++ b/samgr_client/source/remote_register_rpc.c @@ -51,8 +51,8 @@ int SAMGR_RegisterServiceApi(const char *service, const char *feature, const Ide SaName saName = {service, feature}; int32 token = SAMGR_AddRouter(g_remoteRegister.endpoint, &saName, identity, iUnknown); #ifdef MINI_SAMGR_LITE_RPC - char saNameStr[2 * MAX_NAME_LEN + 2]; - (void)sprintf_s(saNameStr, 2 * MAX_NAME_LEN + 2, "%s#%s", service, feature?feature:""); + char saNameStr[RETRY_INTERVAL * MAX_NAME_LEN + RETRY_INTERVAL]; + (void)sprintf_s(saNameStr, RETRY_INTERVAL * MAX_NAME_LEN + RETRY_INTERVAL, "%s#%s", service, feature?feature:""); HILOG_INFO(HILOG_MODULE_SAMGR, "register saname: %s index: %d\n", saNameStr, token); SaNode *saNode = GetSaNodeBySaName(service, feature); if (saNode != NULL) { diff --git a/samgr_endpoint/source/default_client_mini_adapter.c b/samgr_endpoint/source/default_client_mini_adapter.c index dff156f..0626594 100644 --- a/samgr_endpoint/source/default_client_mini_adapter.c +++ b/samgr_endpoint/source/default_client_mini_adapter.c @@ -15,6 +15,7 @@ #include "default_client_adapter.h" #include "samgr_server.h" #include "dbinder_service.h" +#include "ipc_process_skeleton.h" #define MAX_COUNT_NUM 2 static pthread_mutex_t g_handleMutex = PTHREAD_MUTEX_INITIALIZER; static int32_t g_handle = 0; @@ -64,7 +65,6 @@ SvcIdentity QueryRemoteIdentityInner(const char *deviceId, const char *service, return target; } target.handle = GetNextHandle(); - extern void WaitForProxyInit(SvcIdentity *svc); WaitForProxyInit(&target); HILOG_ERROR(HILOG_MODULE_SAMGR, "MakeRemoteBinder sid handle=%d", target.handle); return target; diff --git a/samgr_endpoint/source/default_client_rpc.c b/samgr_endpoint/source/default_client_rpc.c index d18730b..d7cc4b7 100644 --- a/samgr_endpoint/source/default_client_rpc.c +++ b/samgr_endpoint/source/default_client_rpc.c @@ -179,7 +179,7 @@ static int ProxyInvoke(IClientProxy *proxy, int funcId, IpcIo *request, IOwner o IpcIoInit(&requestWrapper, data, MAX_IO_SIZE, MAX_OBJ_NUM); } ProxyInvokeArgInner(&requestWrapper, header); - if(request != NULL) { + if (request != NULL) { if (!IpcIoAppend(&requestWrapper, request)) { HILOG_ERROR(HILOG_MODULE_SAMGR, "ipc io append fail\n"); free(data); diff --git a/samgr_endpoint/source/samgr_small_ipc_adapter.c b/samgr_endpoint/source/samgr_small_ipc_adapter.c index a58199c..d1a5acc 100644 --- a/samgr_endpoint/source/samgr_small_ipc_adapter.c +++ b/samgr_endpoint/source/samgr_small_ipc_adapter.c @@ -340,7 +340,9 @@ static void GetRemotePolicy(IpcIo *reply, PolicyTrans **policy, uint32 *policyNu return; } for (i = 0; i < *policyNum; i++) { - if (ReadInt32(reply, &(*policy)[i].type)) { + if (!ReadInt32(reply, &(*policy)[i].type)) { + continue; + } switch ((*policy)[i].type) { case RANGE: ReadInt32(reply, &((*policy)[i].uidMin)); @@ -357,6 +359,6 @@ static void GetRemotePolicy(IpcIo *reply, PolicyTrans **policy, uint32 *policyNu default: break; } - } + } } \ No newline at end of file diff --git a/samgr_server/source/samgr_server_rpc.c b/samgr_server/source/samgr_server_rpc.c index a4b417f..f715a81 100644 --- a/samgr_server/source/samgr_server_rpc.c +++ b/samgr_server/source/samgr_server_rpc.c @@ -47,6 +47,7 @@ typedef int(*ProcFunc)(SamgrServer *server, int32 option, void *origin, IpcIo *r #define MAX_SA_SIZE 0x100 #define RETRY_TIMES 3 #define RETRY_INTERVAL 1 +#define READYSA 16 #define UID_HAP 10000 #define MAX_SYSCAP_NUM_PER_REPLY 118 @@ -168,7 +169,7 @@ static void InitializeGSaList(void) } saNode->saName.service = "mini_sa_rpc"; saNode->saName.feature = NULL; - saNode->saId = 16; + saNode->saId = READYSA; UtilsListInit(&g_saList); UtilsListAdd(&g_saList, &saNode->list); } -- Gitee From 7290fb16ee20e80e9b86c44cad36f9ac0bdf770d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Wed, 17 Apr 2024 11:54:01 +0000 Subject: [PATCH 02/10] update samgr_endpoint/source/samgr_small_ipc_adapter.c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- .../source/samgr_small_ipc_adapter.c | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/samgr_endpoint/source/samgr_small_ipc_adapter.c b/samgr_endpoint/source/samgr_small_ipc_adapter.c index d1a5acc..86efde8 100644 --- a/samgr_endpoint/source/samgr_small_ipc_adapter.c +++ b/samgr_endpoint/source/samgr_small_ipc_adapter.c @@ -343,22 +343,22 @@ static void GetRemotePolicy(IpcIo *reply, PolicyTrans **policy, uint32 *policyNu if (!ReadInt32(reply, &(*policy)[i].type)) { continue; } - switch ((*policy)[i].type) { - case RANGE: - ReadInt32(reply, &((*policy)[i].uidMin)); - ReadInt32(reply, &((*policy)[i].uidMax)); - break; - case FIXED: - for (j = 0; j < UID_SIZE; j++) { - ReadInt32(reply, &((*policy)[i].fixedUid[j])); - } - break; - case BUNDLENAME: - ReadInt32(reply, &((*policy)[i].fixedUid[0])); - break; - default: - break; - } + switch ((*policy)[i].type) { + case RANGE: + ReadInt32(reply, &((*policy)[i].uidMin)); + ReadInt32(reply, &((*policy)[i].uidMax)); + break; + case FIXED: + for (j = 0; j < UID_SIZE; j++) { + ReadInt32(reply, &((*policy)[i].fixedUid[j])); + } + break; + case BUNDLENAME: + ReadInt32(reply, &((*policy)[i].fixedUid[0])); + break; + default: + break; + } } } \ No newline at end of file -- Gitee From 72620a65c76317691df32b713b602bbd8dcb24cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Wed, 17 Apr 2024 11:55:02 +0000 Subject: [PATCH 03/10] update samgr_endpoint/source/samgr_small_ipc_adapter.c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- samgr_endpoint/source/samgr_small_ipc_adapter.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/samgr_endpoint/source/samgr_small_ipc_adapter.c b/samgr_endpoint/source/samgr_small_ipc_adapter.c index 86efde8..d640f78 100644 --- a/samgr_endpoint/source/samgr_small_ipc_adapter.c +++ b/samgr_endpoint/source/samgr_small_ipc_adapter.c @@ -358,7 +358,6 @@ static void GetRemotePolicy(IpcIo *reply, PolicyTrans **policy, uint32 *policyNu break; default: break; - } - + } } } \ No newline at end of file -- Gitee From a9b877b802a51f334b481815931191015c36702f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Thu, 18 Apr 2024 01:50:59 +0000 Subject: [PATCH 04/10] update samgr/adapter/cmsis/thread_adapter.c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- samgr/adapter/cmsis/thread_adapter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samgr/adapter/cmsis/thread_adapter.c b/samgr/adapter/cmsis/thread_adapter.c index 68c5cf7..0e0708d 100644 --- a/samgr/adapter/cmsis/thread_adapter.c +++ b/samgr/adapter/cmsis/thread_adapter.c @@ -15,8 +15,8 @@ #include "thread_adapter.h" #include "common.h" #include -#include "cmsis_os2.h" +extern void *osThreadGetArgument(void); MutexId MUTEX_InitValue() { -- Gitee From 2f4e805e4ac21cf516e900055dc51e7e8d7ec315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Thu, 18 Apr 2024 01:57:14 +0000 Subject: [PATCH 05/10] update samgr_client/source/remote_register_rpc.c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- samgr_client/source/remote_register_rpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samgr_client/source/remote_register_rpc.c b/samgr_client/source/remote_register_rpc.c index 5a31eb1..6381297 100644 --- a/samgr_client/source/remote_register_rpc.c +++ b/samgr_client/source/remote_register_rpc.c @@ -51,8 +51,8 @@ int SAMGR_RegisterServiceApi(const char *service, const char *feature, const Ide SaName saName = {service, feature}; int32 token = SAMGR_AddRouter(g_remoteRegister.endpoint, &saName, identity, iUnknown); #ifdef MINI_SAMGR_LITE_RPC - char saNameStr[RETRY_INTERVAL * MAX_NAME_LEN + RETRY_INTERVAL]; - (void)sprintf_s(saNameStr, RETRY_INTERVAL * MAX_NAME_LEN + RETRY_INTERVAL, "%s#%s", service, feature?feature:""); + char saNameStr[2 * MAX_NAME_LEN + 2]; //The first two is to double the character array, and the second is to add two spaces to the array + (void)sprintf_s(saNameStr, 2 * MAX_NAME_LEN + 2, "%s#%s", service, feature?feature:""); HILOG_INFO(HILOG_MODULE_SAMGR, "register saname: %s index: %d\n", saNameStr, token); SaNode *saNode = GetSaNodeBySaName(service, feature); if (saNode != NULL) { -- Gitee From 05f2794cbbb615f5eec22458ca9849d3f00f77bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Thu, 18 Apr 2024 01:58:17 +0000 Subject: [PATCH 06/10] update samgr_server/source/samgr_server_rpc.c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- samgr_server/source/samgr_server_rpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samgr_server/source/samgr_server_rpc.c b/samgr_server/source/samgr_server_rpc.c index f715a81..696819f 100644 --- a/samgr_server/source/samgr_server_rpc.c +++ b/samgr_server/source/samgr_server_rpc.c @@ -47,7 +47,7 @@ typedef int(*ProcFunc)(SamgrServer *server, int32 option, void *origin, IpcIo *r #define MAX_SA_SIZE 0x100 #define RETRY_TIMES 3 #define RETRY_INTERVAL 1 -#define READYSA 16 +#define mini_sa_rpc 16 #define UID_HAP 10000 #define MAX_SYSCAP_NUM_PER_REPLY 118 @@ -169,7 +169,7 @@ static void InitializeGSaList(void) } saNode->saName.service = "mini_sa_rpc"; saNode->saName.feature = NULL; - saNode->saId = READYSA; + saNode->saId = mini_sa_rpc; UtilsListInit(&g_saList); UtilsListAdd(&g_saList, &saNode->list); } -- Gitee From a17c8a578283ceb02c4ab8012de13e1ce618c3f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Thu, 18 Apr 2024 06:24:29 +0000 Subject: [PATCH 07/10] update samgr_server/source/samgr_server_rpc.c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- samgr_server/source/samgr_server_rpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samgr_server/source/samgr_server_rpc.c b/samgr_server/source/samgr_server_rpc.c index 696819f..88e1e9e 100644 --- a/samgr_server/source/samgr_server_rpc.c +++ b/samgr_server/source/samgr_server_rpc.c @@ -47,7 +47,7 @@ typedef int(*ProcFunc)(SamgrServer *server, int32 option, void *origin, IpcIo *r #define MAX_SA_SIZE 0x100 #define RETRY_TIMES 3 #define RETRY_INTERVAL 1 -#define mini_sa_rpc 16 +#define MINI_SA_RPC 16 #define UID_HAP 10000 #define MAX_SYSCAP_NUM_PER_REPLY 118 @@ -169,7 +169,7 @@ static void InitializeGSaList(void) } saNode->saName.service = "mini_sa_rpc"; saNode->saName.feature = NULL; - saNode->saId = mini_sa_rpc; + saNode->saId = MINI_SA_RPC; UtilsListInit(&g_saList); UtilsListAdd(&g_saList, &saNode->list); } -- Gitee From adb66fc463f18ce0c2595d158c3f3dd28a1f32b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Fri, 19 Apr 2024 01:18:55 +0000 Subject: [PATCH 08/10] update samgr_server/source/samgr_server_rpc.c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- samgr_server/source/samgr_server_rpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samgr_server/source/samgr_server_rpc.c b/samgr_server/source/samgr_server_rpc.c index 88e1e9e..1c024cc 100644 --- a/samgr_server/source/samgr_server_rpc.c +++ b/samgr_server/source/samgr_server_rpc.c @@ -47,7 +47,7 @@ typedef int(*ProcFunc)(SamgrServer *server, int32 option, void *origin, IpcIo *r #define MAX_SA_SIZE 0x100 #define RETRY_TIMES 3 #define RETRY_INTERVAL 1 -#define MINI_SA_RPC 16 +#define MINI_SA_RPC_ID 16 #define UID_HAP 10000 #define MAX_SYSCAP_NUM_PER_REPLY 118 @@ -169,7 +169,7 @@ static void InitializeGSaList(void) } saNode->saName.service = "mini_sa_rpc"; saNode->saName.feature = NULL; - saNode->saId = MINI_SA_RPC; + saNode->saId = MINI_SA_RPC_ID; UtilsListInit(&g_saList); UtilsListAdd(&g_saList, &saNode->list); } -- Gitee From 1c005479819d36bc36239725074feef64e236478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Fri, 19 Apr 2024 01:20:41 +0000 Subject: [PATCH 09/10] update samgr_client/source/remote_register_rpc.c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- samgr_client/source/remote_register_rpc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/samgr_client/source/remote_register_rpc.c b/samgr_client/source/remote_register_rpc.c index 6381297..33dca2a 100644 --- a/samgr_client/source/remote_register_rpc.c +++ b/samgr_client/source/remote_register_rpc.c @@ -37,6 +37,7 @@ #define RETRY_INTERVAL 2 #define MAX_RETRY_TIMES 10 #define ABILITY_UID_START 100 +#define SA_NAME_NUM 2 static void ClientInitializeRegistry(void); RemoteRegister g_remoteRegister; static BOOL g_isAbilityInited = FALSE; @@ -51,7 +52,7 @@ int SAMGR_RegisterServiceApi(const char *service, const char *feature, const Ide SaName saName = {service, feature}; int32 token = SAMGR_AddRouter(g_remoteRegister.endpoint, &saName, identity, iUnknown); #ifdef MINI_SAMGR_LITE_RPC - char saNameStr[2 * MAX_NAME_LEN + 2]; //The first two is to double the character array, and the second is to add two spaces to the array + char saNameStr[SA_NAME_NUM * MAX_NAME_LEN + SA_NAME_NUM]; (void)sprintf_s(saNameStr, 2 * MAX_NAME_LEN + 2, "%s#%s", service, feature?feature:""); HILOG_INFO(HILOG_MODULE_SAMGR, "register saname: %s index: %d\n", saNameStr, token); SaNode *saNode = GetSaNodeBySaName(service, feature); -- Gitee From 5c79bed701c2576982d22e25a744c33713d04ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Fri, 19 Apr 2024 02:20:40 +0000 Subject: [PATCH 10/10] update samgr_client/source/remote_register_rpc.c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- samgr_client/source/remote_register_rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samgr_client/source/remote_register_rpc.c b/samgr_client/source/remote_register_rpc.c index 33dca2a..4eb1462 100644 --- a/samgr_client/source/remote_register_rpc.c +++ b/samgr_client/source/remote_register_rpc.c @@ -53,7 +53,7 @@ int SAMGR_RegisterServiceApi(const char *service, const char *feature, const Ide int32 token = SAMGR_AddRouter(g_remoteRegister.endpoint, &saName, identity, iUnknown); #ifdef MINI_SAMGR_LITE_RPC char saNameStr[SA_NAME_NUM * MAX_NAME_LEN + SA_NAME_NUM]; - (void)sprintf_s(saNameStr, 2 * MAX_NAME_LEN + 2, "%s#%s", service, feature?feature:""); + (void)sprintf_s(saNameStr, SA_NAME_NUM * MAX_NAME_LEN + SA_NAME_NUM, "%s#%s", service, feature?feature:""); HILOG_INFO(HILOG_MODULE_SAMGR, "register saname: %s index: %d\n", saNameStr, token); SaNode *saNode = GetSaNodeBySaName(service, feature); if (saNode != NULL) { -- Gitee