p71924506
/
distributedschedule_samgr_lite1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modify warning 

Signed-off-by: zjucx <chengxiang4@huawei.com>
This commit is contained in:
zjucx 2022-01-24 17:07:01 +08:00
parent 8156d04a87
commit ceffe31b11
4 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
samgr_endpoint/BUILD.gn
View File

@ -19,7 +19,7 @@ config("endpoint_public") {
"//utils/native/lite/include", "//utils/native/lite/include",
"//foundation/communication/ipc_lite/interfaces/kits", "//foundation/communication/ipc_lite/interfaces/kits",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
"//base/security/permission/services/permission_lite/ipc_auth/include" "//base/security/permission/services/permission_lite/ipc_auth/include",
] ]
} }
@ -41,7 +41,10 @@ source_set("endpoint_source") {
] ]
if (ohos_kernel_type == "linux") { if (ohos_kernel_type == "linux") {
defines = [ "LITE_LINUX_BINDER_IPC" ] defines = [
"_GNU_SOURCE",
"LITE_LINUX_BINDER_IPC",
]
} }
configs += [ ":endpoint_internal" ] configs += [ ":endpoint_internal" ]

27
samgr_endpoint/source/endpoint.c
View File

@ -13,11 +13,15 @@
* limitations under the License. * limitations under the License.
*/ */
#include "endpoint.h" #include "endpoint.h"
#include <stdlib.h> #include <stdlib.h>
#include <securec.h> #include <securec.h>
#include <unistd.h>
#include <ohos_errno.h> #include <ohos_errno.h>
#include <service.h> #include <service.h>
#include <log.h> #include <log.h>
#include "policy_define.h" #include "policy_define.h"
#include "iproxy_server.h" #include "iproxy_server.h"
#include "memory_adapter.h" #include "memory_adapter.h"
@ -49,13 +53,6 @@
#define MAX_BURST_RATE (MAX_BUCKET_RATE + (MAX_BUCKET_RATE >> 1)) #define MAX_BURST_RATE (MAX_BUCKET_RATE + (MAX_BUCKET_RATE >> 1))
#endif #endif
#ifndef MAX_SYSCAP_NUM
#define MAX_SYSCAP_NUM 512
#endif
#ifndef MAX_SYSCAP_NAME_LEN
#define MAX_SYSCAP_NAME_LEN 64
#endif
#define SAMGR_SERVICE "samgr" #define SAMGR_SERVICE "samgr"
typedef struct Router { typedef struct Router {
@ -166,7 +163,7 @@ int32 SAMGR_AddSysCap(const Endpoint *endpoint, const char *sysCap, BOOL isReg)
} }
if (replyBuf != NULL) { if (replyBuf != NULL) {
FreeBuffer(endpoint, replyBuf); FreeBuffer(endpoint->context, replyBuf);
} }
HILOG_DEBUG(HILOG_MODULE_SAMGR, "SAMGR_AddSysCap ret = %d", ret); HILOG_DEBUG(HILOG_MODULE_SAMGR, "SAMGR_AddSysCap ret = %d", ret);
@ -200,7 +197,7 @@ int32 SAMGR_GetSysCap(const Endpoint *endpoint, const char *sysCap, BOOL *isReg)
*isReg = IpcIoPopBool(&reply); *isReg = IpcIoPopBool(&reply);
} }
if (replyBuf != NULL) { if (replyBuf != NULL) {
FreeBuffer(endpoint, replyBuf); FreeBuffer(endpoint->context, replyBuf);
} }
HILOG_DEBUG(HILOG_MODULE_SAMGR, "SAMGR_GetSysCap ret = %d", ret); HILOG_DEBUG(HILOG_MODULE_SAMGR, "SAMGR_GetSysCap ret = %d", ret);
return ret; return ret;
@ -235,7 +232,7 @@ static int32 ParseGetAllSysCapsReply(IpcIo *reply, char sysCaps[MAX_SYSCAP_NUM][
size = ((size > MAX_SYSCAP_NUM) ? MAX_SYSCAP_NUM : size); size = ((size > MAX_SYSCAP_NUM) ? MAX_SYSCAP_NUM : size);
int cnt = *sysCapNum; int cnt = *sysCapNum;
for (uint32 i = 0; i < size; i++) { for (uint32 i = 0; i < size; i++) {
int len = 0; uint32 len = 0;
char *sysCap = (char *)IpcIoPopString(reply, &len); char *sysCap = (char *)IpcIoPopString(reply, &len);
if (sysCap == NULL || len == 0) { if (sysCap == NULL || len == 0) {
continue; continue;
@ -263,7 +260,7 @@ int32 SAMGR_GetSystemCapabilities(const Endpoint *endpoint,
HILOG_DEBUG(HILOG_MODULE_SAMGR, "SAMGR_GetSystemCapabilities begin"); HILOG_DEBUG(HILOG_MODULE_SAMGR, "SAMGR_GetSystemCapabilities begin");
IpcIo reply; IpcIo reply;
void *replyBuf = NULL; void *replyBuf = NULL;
int startIdx = 0; uint32 startIdx = 0;
BOOL isEnd = TRUE; BOOL isEnd = TRUE;
int ret; int ret;
do { do {
@ -272,7 +269,7 @@ int32 SAMGR_GetSystemCapabilities(const Endpoint *endpoint,
ret = ParseGetAllSysCapsReply(&reply, sysCaps, sysCapNum, &isEnd, &startIdx); ret = ParseGetAllSysCapsReply(&reply, sysCaps, sysCapNum, &isEnd, &startIdx);
} }
if (replyBuf != NULL) { if (replyBuf != NULL) {
FreeBuffer(endpoint, replyBuf); FreeBuffer(endpoint->context, replyBuf);
} }
} while (isEnd == FALSE && ret == EC_SUCCESS); } while (isEnd == FALSE && ret == EC_SUCCESS);
HILOG_DEBUG(HILOG_MODULE_SAMGR, "SAMGR_GetSystemCapabilities ret = %d", ret); HILOG_DEBUG(HILOG_MODULE_SAMGR, "SAMGR_GetSystemCapabilities ret = %d", ret);
@ -362,7 +359,7 @@ static void *Receive(void *argv)
} }
int ret = EC_INVALID; int ret = EC_INVALID;
uint8 retry = 0; uint32 retry = 0;
while (retry < MAX_RETRY_TIMES) { while (retry < MAX_RETRY_TIMES) {
ret = endpoint->registerEP(endpoint->context, &endpoint->identity); ret = endpoint->registerEP(endpoint->context, &endpoint->identity);
if (ret == EC_SUCCESS) { if (ret == EC_SUCCESS) {
@ -513,7 +510,7 @@ static int RegisterIdentity(const IpcContext *context, const SaName *saName, Svc
ret = IpcIoPopInt32(&reply); ret = IpcIoPopInt32(&reply);
} }
if (ret == EC_SUCCESS) { if (ret == EC_SUCCESS) {
saInfo = IpcIoPopSvc(&reply); IpcIoPopSvc(&reply);
GetRemotePolicy(&reply, policy, policyNum); GetRemotePolicy(&reply, policy, policyNum);
} }
if (replyBuf != NULL) { if (replyBuf != NULL) {
@ -554,7 +551,7 @@ static int RegisterRemoteEndpoint(const IpcContext *context, SvcIdentity *identi
IpcIoInit(&req, data, MAX_DATA_LEN, 0); IpcIoInit(&req, data, MAX_DATA_LEN, 0);
IpcIoPushUint32(&req, RES_ENDPOINT); IpcIoPushUint32(&req, RES_ENDPOINT);
IpcIoPushUint32(&req, OP_POST); IpcIoPushUint32(&req, OP_POST);
uint8 retry = 0; uint32 retry = 0;
while (retry < MAX_RETRY_TIMES) { while (retry < MAX_RETRY_TIMES) {
++retry; ++retry;
IpcIo reply; IpcIo reply;

11
samgr_endpoint/source/endpoint.h
View File

@ -32,6 +32,13 @@ extern "C" {
#define SAMGR_COOKIE 0 #define SAMGR_COOKIE 0
#define MAX_DATA_LEN 0x100 #define MAX_DATA_LEN 0x100
#define MIN_DATA_LEN 0x40 #define MIN_DATA_LEN 0x40
#ifndef MAX_SYSCAP_NUM
#define MAX_SYSCAP_NUM 512
#endif
#ifndef MAX_SYSCAP_NAME_LEN
#define MAX_SYSCAP_NAME_LEN 64
#endif
typedef enum ResourceID { typedef enum ResourceID {
RES_ENDPOINT, RES_ENDPOINT,
@ -64,6 +71,10 @@ struct Endpoint {
Endpoint *SAMGR_CreateEndpoint(const char *name, RegisterEndpoint registry); Endpoint *SAMGR_CreateEndpoint(const char *name, RegisterEndpoint registry);
int SAMGR_AddRouter(Endpoint *endpoint, const SaName *saName, const Identity *id, IUnknown *proxy); int SAMGR_AddRouter(Endpoint *endpoint, const SaName *saName, const Identity *id, IUnknown *proxy);
int SAMGR_ProcPolicy(const Endpoint *endpoint, const SaName *saName, int token); int SAMGR_ProcPolicy(const Endpoint *endpoint, const SaName *saName, int token);
int32 SAMGR_AddSysCap(const Endpoint *endpoint, const char *sysCap, BOOL isReg);
int32 SAMGR_GetSysCap(const Endpoint *endpoint, const char *sysCap, BOOL *isReg);
int32 SAMGR_GetSystemCapabilities(const Endpoint *endpoint,
char sysCaps[MAX_SYSCAP_NUM][MAX_SYSCAP_NAME_LEN], int32 *sysCapNum);
#ifdef __cplusplus #ifdef __cplusplus
#if __cplusplus #if __cplusplus

15
samgr_server/source/samgr_server.c
View File

@ -17,18 +17,21 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <ohos_init.h> #include <ohos_init.h>
#include <ohos_types.h> #include <ohos_types.h>
#include <ohos_errno.h> #include <ohos_errno.h>
#include <liteipc.h> #include <liteipc.h>
#include <liteipc_adapter.h> #include <liteipc_adapter.h>
#include <log.h> #include <log.h>
#include "cJSON.h" #include "cJSON.h"
#include "default_client.h"
#include "policy_define.h" #include "policy_define.h"
#include "samgr_lite.h" #include "samgr_lite.h"
#include "memory_adapter.h" #include "securec.h"
#include "thread_adapter.h" #include "thread_adapter.h"
#include "default_client.h" #include "memory_adapter.h"
#undef LOG_TAG #undef LOG_TAG
#undef LOG_DOMAIN #undef LOG_DOMAIN
@ -380,7 +383,7 @@ static int32 ProcAddSysCap(SamgrServer *server, IpcIo *req)
return EC_FAILURE; return EC_FAILURE;
} }
SysCapImpl *serviceImpl = (SysCapImpl *)VECTOR_At(sysCapablitys, pos); SysCapImpl *serviceImpl = (SysCapImpl *)VECTOR_At(sysCapablitys, pos);
if (serviceImpl == NULL || serviceImpl->name == NULL) { if (serviceImpl == NULL) {
MUTEX_Unlock(server->sysCapMtx); MUTEX_Unlock(server->sysCapMtx);
return EC_FAILURE; return EC_FAILURE;
} }
@ -389,7 +392,7 @@ static int32 ProcAddSysCap(SamgrServer *server, IpcIo *req)
return EC_SUCCESS; return EC_SUCCESS;
} }
static BOOL ProcGetSysCap(const SamgrServer *server, IpcIo *req) static BOOL ProcGetSysCap(SamgrServer *server, IpcIo *req)
{ {
size_t len = 0; size_t len = 0;
char *sysCap = (char *)IpcIoPopString(req, &len); char *sysCap = (char *)IpcIoPopString(req, &len);
@ -415,7 +418,7 @@ static BOOL ProcGetSysCap(const SamgrServer *server, IpcIo *req)
return res; return res;
} }
static int32 GetReplyNumAndNextReqIdx(const Vector *sysCapablitys, int32 startIdx, int32 *nextRequestIdx) static int32 GetReplyNumAndNextReqIdx(Vector *sysCapablitys, int32 startIdx, int32 *nextRequestIdx)
{ {
int32 registerNum = 0; int32 registerNum = 0;
int32 size = VECTOR_Num(sysCapablitys); int32 size = VECTOR_Num(sysCapablitys);
@ -431,7 +434,7 @@ static int32 GetReplyNumAndNextReqIdx(const Vector *sysCapablitys, int32 startId
return registerNum; return registerNum;
} }
void ProcGetAllSysCap(const SamgrServer *server, IpcIo *req, IpcIo *reply) void ProcGetAllSysCap(SamgrServer *server, IpcIo *req, IpcIo *reply)
{ {
uint32_t startIdx = IpcIoPopUint32(req); uint32_t startIdx = IpcIoPopUint32(req);
MUTEX_Lock(server->sysCapMtx); MUTEX_Lock(server->sysCapMtx);