openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2025-02-24 05:02:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

“fix fillp clean code problem

Browse Source 
Signed-off-by: luojuheng <luojuheng@huawei.com>
This commit is contained in:
luojuheng 2023-12-09 11:50:30 +08:00 committed by luojuheng
parent 96406741ab
commit 8b133ee720
19 changed files with 19 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/nstackx/fillp/src/app_lib/src/api.c
View File

@ -824,7 +824,6 @@ void FillpDebugCmdSocketConfigRes(FILLP_CONST void *content)
if (content == FILLP_NULL_PTR) {
FILLP_LOGERR("Input pointer is NULL");
return;
}

4
components/nstackx/fillp/src/app_lib/src/epoll_app.c
View File

@ -80,8 +80,6 @@ static void EpRbtreeInsert(struct EventPoll *ep, struct EpItem *epi)
*p = &epi->rbn;
FillpRbInsertColor(&epi->rbn, &ep->rbr);
return;
}
/*
@ -96,8 +94,6 @@ static void EpollAddToSockWaitList(struct FtSocket *sock, struct EpItem *epi)
}
HlistAddTail(&sock->epTaskList, &epi->sockWaitNode);
(void)SYS_ARCH_SEM_POST(&sock->epollTaskListLock);
return;
}
/* Check and triggle the event when do epoll ctl */

2
components/nstackx/fillp/src/app_lib/src/fillp_dfx.c
View File

@ -493,7 +493,7 @@ static FILLP_INT FillpDumpShowSockResource(FILLP_INT sockIndex, void *softObj, F
}
return FILLP_FAILURE;
}
FILLP_INT32 isOk = DoShowSockConfigRes(sockIndex, &sock->resConf, data, &len);
(void)SYS_ARCH_RWSEM_RDPOST(&sock->sockConnSem);
if (isOk != FILLP_SUCCESS) {

2
components/nstackx/fillp/src/app_lib/src/fillp_stack_app_config_in.c
View File

@ -247,7 +247,6 @@ static FILLP_INT32 FtAppSetKeepAliveTime(
FillpErrorType ret = SpungePostMsg(sock->inst, (void *)sock, MSG_TYPE_SET_KEEP_ALIVE, FILLP_TRUE);
if (ret != ERR_OK) {
FILLP_LOGERR("fillp_sock_id:%d Failed to set the keep alive time for system socket", sockIndex);
return ret;
}
@ -323,7 +322,6 @@ static FILLP_INT32 FtAppConfigSetTxBurst(
configValue = *(FILLP_UINT16 *)value;
if ((configValue == 0) || (configValue > FILLP_MAX_TX_RX_BURST)) {
FILLP_LOGERR("fillp_sock_id:%d txBurst is invalid parameter!!!", sockIndex);
return ERR_FAILURE;
}

16
components/nstackx/fillp/src/app_lib/src/socket_app.c
View File

@ -1571,17 +1571,13 @@ FILLP_INT SockGetsockname(FILLP_INT sockIndex, struct sockaddr *name, socklen_t
if (*nameLen > (socklen_t)addrSize) {
*nameLen = (socklen_t)addrSize;
}
if (memcpy_s(name, *nameLen, &(sock->netconn->pcb->localAddr), *nameLen) != EOK) {
err = -1;
}
(void)memcpy_s(name, *nameLen, &(sock->netconn->pcb->localAddr), *nameLen);
} else if (sock->sockAddrType == AF_INET6) {
addrSize = sizeof(struct sockaddr_in6);
if (*nameLen > (socklen_t)addrSize) {
*nameLen = (socklen_t)addrSize;
}
if (memcpy_s(name, *nameLen, &(sock->netconn->pcb->localAddr), *nameLen) != EOK) {
err = -1;
}
(void)memcpy_s(name, *nameLen, &(sock->netconn->pcb->localAddr), *nameLen);
}
} else {
osSock = NETCONN_GET_OSSOCK(sock->netconn, sock->inst->instIndex);
@ -1632,17 +1628,13 @@ FILLP_INT SockGetpeername(FILLP_INT sockIndex, struct sockaddr *name, socklen_t
if (*nameLen > (socklen_t)addrSize) {
*nameLen = (socklen_t)addrSize;
}
if (memcpy_s(name, *nameLen, &(sock->netconn->pcb->remoteAddr), *nameLen) != EOK) {
err = -1;
}
(void)memcpy_s(name, *nameLen, &(sock->netconn->pcb->remoteAddr), *nameLen);
} else if (sock->sockAddrType == AF_INET6) {
addrSize = sizeof(struct sockaddr_in6);
if (*nameLen > (socklen_t)addrSize) {
*nameLen = (socklen_t)addrSize;
}
if (memcpy_s(name, *nameLen, &(sock->netconn->pcb->remoteAddr), *nameLen) != EOK) {
err = -1;
}
(void)memcpy_s(name, *nameLen, &(sock->netconn->pcb->remoteAddr), *nameLen);
}
(void)SYS_ARCH_RWSEM_RDPOST(&sock->sockConnSem);

1
components/nstackx/fillp/src/app_lib/src/spunge_app.c
View File

@ -87,7 +87,6 @@ struct FtSocket *SpungeAllocSock(FILLP_INT allocType)
if ((g_spunge == FILLP_NULL_PTR) || (!g_spunge->hasInited) || (g_spunge->sockTable == FILLP_NULL_PTR)) {
FILLP_LOGERR("FILLP Not yet Initialized");
return FILLP_NULL_PTR;
}

1
components/nstackx/fillp/src/fillp_lib/src/fillp/fillp_conn.c
View File

@ -643,7 +643,6 @@ static void FillpProcessConnConfirm(struct FillpPcb *pcb, FILLP_CONST struct Net
struct FtNetconn *newConn = FillpNetconnAlloc(addr->sa_family, inst);
if (newConn == FILLP_NULL_PTR) {
FILLP_LOGERR("fillp_sock_id:%d Failed in allocate new netconn connection", sock->index);
return;
}

2
components/nstackx/fillp/src/fillp_lib/src/fillp/fillp_input.c
View File

@ -939,8 +939,6 @@ void FillpDoInput(struct FillpPcb *pcb, FILLP_CONST struct NetBuf *buf, struct S
return;
}
FillpDoInputPktType(pcb, buf, inst, (FILLP_UINT16)FILLP_PKT_GET_TYPE(head->flag));
return;
}
#ifdef __cplusplus

7
components/nstackx/fillp/src/fillp_lib/src/fillp/fillp_mgt_msg_log.c
View File

@ -121,6 +121,7 @@ static FILLP_INT FillpExtParaCharacterFormat(FILLP_CONST struct FtNetconn *conn,
{
FILLP_INT ret = snprintf_s(buf, len, len - 1, " characters: 0x%08X", conn->peerCharacters);
if (ret < 0) {
FILLP_LOGERR("snprintf_s failed");
return ret;
}
size_t formatLen = (FILLP_UINT32)ret;
@ -129,6 +130,7 @@ static FILLP_INT FillpExtParaCharacterFormat(FILLP_CONST struct FtNetconn *conn,
ret = FillpBitmapFormat(buf + formatLen, len - formatLen, conn->peerCharacters,
characterStr, UTILS_ARRAY_LEN(characterStr));
if (ret < 0) {
FILLP_LOGERR("FillpBitmapFormat failed");
return ret;
}
formatLen += (FILLP_UINT32)ret;
@ -140,6 +142,7 @@ static FILLP_INT FillpExtParaFcAlgFormat(FILLP_CONST struct FtNetconn *conn, FIL
{
FILLP_INT ret = snprintf_s(buf, len, len - 1, " FC ALG: 0x%02X", conn->peerFcAlgs);
if (ret < 0) {
FILLP_LOGERR("snprintf_s failed");
return ret;
}
size_t formatLen = (FILLP_UINT32)ret;
@ -148,6 +151,7 @@ static FILLP_INT FillpExtParaFcAlgFormat(FILLP_CONST struct FtNetconn *conn, FIL
ret = FillpBitmapFormat(buf + formatLen, len - formatLen, conn->peerFcAlgs,
fcAlgStr, UTILS_ARRAY_LEN(fcAlgStr));
if (ret < 0) {
FILLP_LOGERR("FillpBitmapFormat failed");
return ret;
}
formatLen += (FILLP_UINT32)ret;
@ -169,6 +173,7 @@ static FILLP_INT FillpExtParaFormat(FILLP_CONST FILLP_UCHAR *extPara, FILLP_INT
struct FtNetconn conn;
(void)memset_s(&conn, sizeof(struct FtNetconn), 0, sizeof(struct FtNetconn));
if (FillpDecodeExtPara(extPara, extParaLen, &conn) != ERR_OK) {
FILLP_LOGERR("FillpDecodeExtPara failed");
return -1;
}
@ -181,6 +186,7 @@ static FILLP_INT FillpExtParaFormat(FILLP_CONST FILLP_UCHAR *extPara, FILLP_INT
FILLP_INT ret = g_extParaFormatter[i](&conn, buf + formatLen, len - formatLen);
if (ret < 0 || (FILLP_UINT32)ret > len - formatLen) {
FILLP_LOGERR("g_extParaFormatter failed");
return -1;
}
@ -310,6 +316,7 @@ void FillpConnFinLog(FILLP_INT sockIndex, FILLP_CONST struct FillpPktFin *fin, F
FILLP_CONST FILLP_CHAR *flagStr[] = { "WR", "RD", "ACK", "VERSION_MISMATCH" };
FILLP_UINT32 flags = FILLP_NTOHS(fin->flag);
if (FillpBitmapFormat(tmpBuf, sizeof(tmpBuf), flags, flagStr, UTILS_ARRAY_LEN(flagStr)) < 0) {
FILLP_LOGERR("FillpBitmapFormat failed");
return;
}

6
components/nstackx/fillp/src/fillp_lib/src/fillp/fillp_output.c
View File

@ -86,13 +86,13 @@ static FILLP_BOOL FillpIsAskMoreBuf(struct FillpSendPcb *sendPcb, struct FillpPc
if (askMoreRet <= 0) {
return FILLP_FALSE;
}
int inx = 0;
struct FtSocket *sock = FILLP_GET_SOCKET(pcb);
for (; inx < askMoreRet; inx++) {
#ifdef SOCK_SEND_SEM
for (int inx = 0; inx < askMoreRet; inx++) {
(void)SYS_ARCH_SEM_POST(&sendPcb->send_sem);
#endif /* SOCK_SEND_SEM */
}
#endif /* SOCK_SEND_SEM */
(void)SYS_ARCH_ATOMIC_INC(&sock->sendEventCount, askMoreRet);
sendPcb->curItemCount = (FILLP_UINT32)DYMP_GET_CUR_SIZE(sendPcb->itemPool);
FILLP_LOGDBG("Ask more buffer for send success, fillp_sock_id:%d", sock->index);

1
components/nstackx/fillp/src/fillp_lib/src/fillp_cookie.c
View File

@ -41,7 +41,6 @@ void FillpMacTimerExpire(
for (counter = 0; counter < FILLP_KEYSIZE; counter += (FILLP_UINT32)sizeof(FILLP_UINT32)) {
macInfo->oldMacKey[counter] = macInfo->currentMacKey[counter];
macInfo->currentMacKey[counter] = (FILLP_UINT8)FILLP_CRYPTO_RAND();
}

1
components/nstackx/fillp/src/fillp_lib/src/net.c
View File

@ -124,7 +124,6 @@ struct FtNetconn *FillpNetconnAlloc(FILLP_UINT16 domain, struct SpungeInstance *
conn->pcb = SpungePcbNew(conn, inst);
if (conn->pcb == FILLP_NULL_PTR) {
FILLP_LOGERR("alloc spunge_pcb fail");
DympFree(conn);
return FILLP_NULL_PTR;
}

2
components/nstackx/fillp/src/fillp_lib/src/res.c
View File

@ -129,8 +129,6 @@ void InitGlobalResourceDefault(void)
g_resource.fcMultiNumStep = FILLP_FLOW_CONTROL_MULTI_NUM_STEP_EXT;
g_resource.fcNightyPercentVal = FILLP_FC_NINETY_PERCENT_VAL_EXT;
g_resource.fullCpuUseThresholdRate = FILLP_DEFAULT_BFULL_CPU_THRESHOLD_RATE_EXT;
return;
}
#ifdef __cplusplus
}

3
components/nstackx/fillp/src/fillp_lib/src/spunge_core.c
View File

@ -589,8 +589,7 @@ void FtGlobalTimerInit(struct SpungeInstance *inst)
static FILLP_INT SpungeCheckCallbacks(void)
{
FILLP_INT ret = SpungeSysCallRegisted();
return ret;
return SpungeSysCallRegisted();
}
static FILLP_INT FtInitGlobalUdpIo(void)

1
components/nstackx/fillp/src/fillp_lib/src/spunge_stack.c
View File

@ -34,7 +34,6 @@ struct SockOsSocket *SpungeAllocSystemSocket(FILLP_INT domain, FILLP_INT type, F
osSock = (struct SockOsSocket *)SpungeAlloc(1, sizeof(struct SockOsSocket), SPUNGE_ALLOC_TYPE_CALLOC);
if (osSock == FILLP_NULL_PTR) {
FILLP_LOGERR("Failed to allocate memory for os socket \r\n");
return FILLP_NULL_PTR;
}

2
components/nstackx/fillp/src/public/src/dympool.c
View File

@ -23,7 +23,7 @@ DympoolType *DympCreatePool(int initSize, int maxSize, int itemSize, FILLP_BOOL
{
DympoolType *pool = FILLP_NULL_PTR;
if ((initSize <= 0) || (maxSize <= 0) || (itemSize <= 0)) {
FILLP_LOGERR("Error to crate pool initSize:%d,maxSize:%d,itemSize:%d", initSize, maxSize, itemSize);
FILLP_LOGERR("Error to create pool initSize:%d,maxSize:%d,itemSize:%d", initSize, maxSize, itemSize);
return FILLP_NULL_PTR;
}

15
components/nstackx/fillp/src/public/src/spunge_message.c
View File

@ -57,6 +57,7 @@ FillpErrorType SpungePostMsg(struct SpungeInstance *inst, void *value, FILLP_INT
if (SYS_ARCH_SEM_WAIT(&msg->syncSem)) {
FILLP_LOGWAR("sem wait failed");
(void)SYS_ARCH_ATOMIC_DEC(&inst->msgUsingCount, 1);
DympFree(msg);
return ERR_COMM;
}
DympFree(msg);
@ -79,7 +80,6 @@ static void SpungeHandleMsgAllocSock(void *value, struct SpungeInstance *inst)
struct FtNetconn *conn = FillpNetconnAlloc(sock->sockAddrType, inst);
if (conn == FILLP_NULL_PTR) {
FILLP_LOGERR("Error to alloc netconn");
sock->allocState = SOCK_ALLOC_STATE_ERR;
SET_ERRNO(FILLP_ENOMEM);
sock->coreErrType[MSG_TYPE_ALLOC_SOCK] = FILLP_EMFILE;
@ -99,7 +99,6 @@ static void SpungeHandleMsgAllocSock(void *value, struct SpungeInstance *inst)
struct SockOsSocket *osSock = SpungeAllocSystemSocket(msg->domain, msg->type, msg->protocol);
if (osSock == FILLP_NULL_PTR) {
FILLP_LOGERR("sock alloc sys sock failed. socketId=%d", sock->index);
sock->allocState = SOCK_ALLOC_STATE_ERR;
FILLP_INT errorNum = FtGetErrno();
if (errorNum == ERR_OK) {
@ -134,7 +133,6 @@ static void SpungeHandleMsgFreeSockEagain(void *value, struct SpungeInstance *in
}
SpungeFreeSock(sock);
return;
}
static FILLP_INT SpungeListenMsgCheckState(void *value, struct SpungeInstance *inst,
@ -365,7 +363,6 @@ static void SpungeHandleMsgConnect(void *value, struct SpungeInstance *inst)
FAIL:
(void)SYS_ARCH_SEM_POST(&sock->connBlockSem);
return;
}
static FILLP_INT SpungeBindMsgCheckState(struct FtSocket *sock, struct SockOsSocket **pOsSock,
@ -605,7 +602,6 @@ static void SpungeHandleMsgDoShutdown(void *value, struct SpungeInstance *inst)
FINISH:
sock->coreErrType[MSG_TYPE_DO_SHUTDOWN] = ERR_OK;
return;
}
static void SpungeCloseMsgFreeSrc(struct FtNetconn *conn, struct FtSocket *sock)
@ -637,7 +633,6 @@ static void SpungeCloseMsgFreeSrc(struct FtNetconn *conn, struct FtSocket *sock)
case CONN_STATE_CONNECTED:
FillpEnableFinCheckTimer(&conn->pcb->fpcb);
break;
default:
break;
}
@ -695,7 +690,6 @@ static void SpungeHandleMsgClose(void *value, struct SpungeInstance *inst)
SpungeCloseMsgFreeSrc(conn, sock);
sock->coreErrType[MSG_TYPE_DO_CLOSE] = ERR_OK;
return;
}
static void SpungeHandleMsgSetSendBuf(void *value, struct SpungeInstance *inst)
@ -730,7 +724,6 @@ static void SpungeHandleMsgSetSendBuf(void *value, struct SpungeInstance *inst)
}
sock->coreErrType[MSG_TYPE_SET_SEND_BUF] = ERR_OK;
return;
}
static void SpungeHandleMsgSetRecvBuf(void *value, struct SpungeInstance *inst)
@ -766,7 +759,6 @@ static void SpungeHandleMsgSetRecvBuf(void *value, struct SpungeInstance *inst)
}
sock->coreErrType[MSG_TYPE_SET_RECV_BUF] = ERR_OK;
return;
}
static void SpungeHandleMsgSetNackDelay(void *value, struct SpungeInstance *inst)
@ -802,7 +794,6 @@ static void SpungeHandleMsgSetNackDelay(void *value, struct SpungeInstance *inst
}
SpungeFree(cfg, SPUNGE_ALLOC_TYPE_MALLOC);
return;
}
static void SpungeHandleMsgGetEvtInfo(void *value, struct SpungeInstance *inst)
@ -823,7 +814,6 @@ static void SpungeHandleMsgGetEvtInfo(void *value, struct SpungeInstance *inst)
FILLP_UNUSED_PARA(info);
sock->coreErrType[MSG_TYPE_GET_EVENT_INFO] = ERR_PARAM;
return;
}
static void SpungeHandleMsgSetKeepAlive(void *value, struct SpungeInstance *inst)
@ -903,8 +893,6 @@ static void SpungeMsgDestroyPoolCb(DympItemType *item)
if (ret != FILLP_OK) {
FILLP_LOGERR("sys arch sem destroy failed ALARM !!\n");
}
return;
}
void *SpungeMsgCreatePool(int initSize, int maxSize)
@ -917,7 +905,6 @@ void *SpungeMsgCreatePool(int initSize, int maxSize)
void SpungeMsgPoolDestroy(DympoolType *msgPool)
{
DympDestroyPool(msgPool);
return;
}
#ifdef __cplusplus

1
components/nstackx/fillp/src/public/src/timing_wheel.c
View File

@ -175,7 +175,6 @@ static void FillpInitTimingWheelTimeHand(struct FillpTimingWheelHand *hand, FILL
hand->curTick = 0;
hand->accuracy = accuracy;
hand->curSlotTime = SYS_ARCH_GET_CUR_TIME_LONGLONG();
hand->curTick = 0;
hand->handLength = accuracy * FILLP_TIMING_WHEEL_SLOT_NUM;
for (i = 0; i < FILLP_TIMING_WHEEL_SLOT_NUM; i++) {

1
components/nstackx/nstackx_util/platform/unix/sys_util.c
View File

@ -31,6 +31,7 @@ static const char *g_illegalPathHeadString[] = {
uint8_t IsFileNameLegal(const char *fileName)
{
if (fileName == NULL || strlen(fileName) == 0) {
LOGE(TAG, "illegal filename");
return NSTACKX_FALSE;
}