X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcu_stub%2Fcu_stub_sctp.c;h=452e318641da677e603b972b473fe33d2529294f;hb=efd3fd582205e5c94878e6bcae6d6282dd6f1d25;hp=1aba5cdf90aace1fd4ce3ea218b4c133ff1136e7;hpb=105199ef642ffe9736ea24a01d4546578fa25e60;p=o-du%2Fl2.git diff --git a/src/cu_stub/cu_stub_sctp.c b/src/cu_stub/cu_stub_sctp.c index 1aba5cdf9..452e31864 100644 --- a/src/cu_stub/cu_stub_sctp.c +++ b/src/cu_stub/cu_stub_sctp.c @@ -19,7 +19,6 @@ /* This file contains all SCTP related functionality */ #include "common_def.h" -#include "odu_common_codec.h" #include "cu_f1ap_msg_hdl.h" #include "cu_stub_sctp.h" #include "cu_stub_egtp.h" @@ -48,7 +47,7 @@ CuSctpDestCb f1Params; ***************************************************************************/ S16 sctpActvInit() { - DU_LOG("\n\nSCTP : Initializing"); + DU_LOG("\n\nDEBUG --> SCTP : Initializing"); connUp = FALSE; assocId = 0; nonblocking = FALSE; @@ -109,7 +108,7 @@ S16 sctpCfgReq() memset(&f1Params.lstnSockFd, -1, sizeof(CmInetFd)); fillDestNetAddr(&f1Params.destIpNetAddr, &sctpCfg.duIpAddr); - RETVALUE(ROK); + return ROK; } @@ -135,9 +134,9 @@ S16 fillAddrLst(CmInetNetAddrLst *addrLstPtr, SctpIpAddr *ipAddr) { addrLstPtr->count++; addrLstPtr->addrs[(addrLstPtr->count - 1)].type = CM_INET_IPV4ADDR_TYPE; - addrLstPtr->addrs[(addrLstPtr->count - 1)].u.ipv4NetAddr = CM_INET_NTOH_U32(ipAddr->ipV4Addr); + addrLstPtr->addrs[(addrLstPtr->count - 1)].u.ipv4NetAddr = CM_INET_NTOH_UINT32(ipAddr->ipV4Addr); - RETVALUE(ROK); + return ROK; } /****************************************************************************** @@ -161,8 +160,8 @@ S16 fillDestNetAddr(CmInetNetAddr *destAddrPtr, SctpIpAddr *dstIpPtr) { /* Filling destination address */ destAddrPtr->type = CM_INET_IPV4ADDR_TYPE; - destAddrPtr->u.ipv4NetAddr = CM_INET_NTOH_U32(dstIpPtr->ipV4Addr); - RETVALUE(ROK); + destAddrPtr->u.ipv4NetAddr = CM_INET_NTOH_UINT32(dstIpPtr->ipV4Addr); + return ROK; } /****************************************************************************** @@ -190,21 +189,21 @@ S16 sctpStartReq() if((ret = cmInetSocket(socket_type, &f1Params.lstnSockFd, IPPROTO_SCTP) != ROK)) { - DU_LOG("\nSCTP : Socket[%d] coudnt open for listening", f1Params.lstnSockFd.fd); + DU_LOG("\nERROR --> SCTP : Socket[%d] coudnt open for listening", f1Params.lstnSockFd.fd); } else if((ret = cmInetSctpBindx(&f1Params.lstnSockFd, &f1Params.localAddrLst, f1Params.srcPort)) != ROK) { - DU_LOG("\nSCTP: Binding failed at CU"); + DU_LOG("\nERROR --> SCTP: Binding failed at CU"); } else if((ret = sctpAccept(&f1Params.lstnSockFd, &f1Params.peerAddr, &f1Params.sockFd)) != ROK) { - DU_LOG("\nSCTP: Unable to accept the connection at CU"); + DU_LOG("\nERROR --> SCTP: Unable to accept the connection at CU"); } else if(sctpSockPoll() != ROK) { - DU_LOG("\nSCTP: Polling failed to start at CU"); + DU_LOG("\nERROR --> SCTP: Polling failed to start at CU"); } - RETVALUE(ret); + return (ret); } /******************************************************************* * @@ -241,7 +240,7 @@ S16 sctpSetSockOpts(CmInetFd *sock_Fd) ret = RFAILED; } - RETVALUE(ret); + return (ret); } /******************************************************************* @@ -263,17 +262,17 @@ S16 sctpSetSockOpts(CmInetFd *sock_Fd) * ****************************************************************/ S16 sctpAccept(CmInetFd *lstnSock_Fd, CmInetAddr *peerAddr, CmInetFd *sock_Fd) { - U8 ret; + uint8_t ret; ret = cmInetListen(lstnSock_Fd, 1); if (ret != ROK) { - DU_LOG("\nSCTP : Listening on socket failed"); + DU_LOG("\nERROR --> SCTP : Listening on socket failed"); cmInetClose(lstnSock_Fd); - RETVALUE(RFAILED); + return RFAILED; } - DU_LOG("\nSCTP : Connecting"); + DU_LOG("\nINFO --> SCTP : Connecting"); while(!connUp) { @@ -284,8 +283,8 @@ S16 sctpAccept(CmInetFd *lstnSock_Fd, CmInetAddr *peerAddr, CmInetFd *sock_Fd) } else if(ret != ROK) { - DU_LOG("\nSCTP : Failed to accept connection"); - RETVALUE(RFAILED); + DU_LOG("\nERROR --> SCTP : Failed to accept connection"); + return RFAILED; } else { @@ -294,9 +293,9 @@ S16 sctpAccept(CmInetFd *lstnSock_Fd, CmInetAddr *peerAddr, CmInetFd *sock_Fd) break; } } - DU_LOG("\nSCTP : Connection established"); + DU_LOG("\nINFO --> SCTP : Connection established"); - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -321,62 +320,62 @@ S16 sctpNtfyHdlr(CmInetSctpNotification *ntfy) switch(ntfy->header.nType) { case CM_INET_SCTP_ASSOC_CHANGE : - DU_LOG("\nSCTP : Assoc change notification received"); + DU_LOG("\nINFO --> SCTP : Assoc change notification received"); switch(ntfy->u.assocChange.state) { case CM_INET_SCTP_COMM_UP: - DU_LOG("Event : COMMUNICATION UP"); + DU_LOG("DEBUG --> Event : COMMUNICATION UP"); connUp = TRUE; break; case CM_INET_SCTP_COMM_LOST: - DU_LOG("Event : COMMUNICATION LOST"); + DU_LOG("DEBUG --> Event : COMMUNICATION LOST"); connUp = FALSE; break; case CM_INET_SCTP_RESTART: - DU_LOG("Event : SCTP RESTART"); + DU_LOG("DEBUG --> Event : SCTP RESTART"); connUp = FALSE; break; case CM_INET_SCTP_SHUTDOWN_COMP: /* association gracefully shutdown */ - DU_LOG("Event : SHUTDOWN COMPLETE"); + DU_LOG("DEBUG --> Event : SHUTDOWN COMPLETE"); connUp = FALSE; break; case CM_INET_SCTP_CANT_STR_ASSOC: - DU_LOG("Event : CANT START ASSOC"); + DU_LOG("DEBUG --> Event : CANT START ASSOC"); connUp = FALSE; break; default: - DU_LOG("\nInvalid event"); + DU_LOG("\nERROR --> Invalid event"); break; } break; case CM_INET_SCTP_PEER_ADDR_CHANGE : - DU_LOG("\nSCTP : Peer Address Change notificarion received"); + DU_LOG("\nINFO --> SCTP : Peer Address Change notificarion received"); /* Need to add handler */ break; case CM_INET_SCTP_REMOTE_ERROR : - DU_LOG("\nSCTP : Remote Error notification received"); + DU_LOG("\nINFO --> SCTP : Remote Error notification received"); break; case CM_INET_SCTP_SEND_FAILED : - DU_LOG("\nSCTP : Send Failed notification received\n"); + DU_LOG("\nINFO --> SCTP : Send Failed notification received\n"); break; case CM_INET_SCTP_SHUTDOWN_EVENT : /* peer socket gracefully closed */ - DU_LOG("\nSCTP : Shutdown Event notification received\n"); + DU_LOG("\nINFO --> SCTP : Shutdown Event notification received\n"); connUp = FALSE; exit(0); break; case CM_INET_SCTP_ADAPTATION_INDICATION : - DU_LOG("\nSCTP : Adaptation Indication received\n"); + DU_LOG("\nINFO --> SCTP : Adaptation Indication received\n"); break; case CM_INET_SCTP_PARTIAL_DELIVERY_EVENT: - DU_LOG("\nSCTP : Partial Delivery Event received\n"); + DU_LOG("\nINFO --> SCTP : Partial Delivery Event received\n"); break; default: - DU_LOG("\nSCTP : Invalid notification type\n"); + DU_LOG("\nERROR --> SCTP : Invalid notification type\n"); break; } sctpNtfyInd(ntfy); - RETVALUE(ROK); + return ROK; }/* End of sctpNtfyHdlr */ /******************************************************************* @@ -397,9 +396,9 @@ S16 sctpNtfyHdlr(CmInetSctpNotification *ntfy) * ****************************************************************/ S16 sctpSockPoll() { - U16 ret = ROK; - U32 timeout; - U32 *timeoutPtr; + uint16_t ret = ROK; + uint32_t timeout; + uint32_t *timeoutPtr; Buffer *egtpBuf; MsgLen egtpBufLen; CmInetAddr egtpFromAddr; @@ -431,7 +430,7 @@ S16 sctpSockPoll() { if((ret = processPolling(&f1PollParams, &f1Params.sockFd, timeoutPtr, &memInfo)) != ROK) { - DU_LOG("\nSCTP : Failed to RecvMsg for F1 at CU\n"); + DU_LOG("\nERROR --> SCTP : Failed to RecvMsg for F1 at CU\n"); } /* Receiving EGTP data */ @@ -439,13 +438,13 @@ S16 sctpSockPoll() ret = cmInetRecvMsg(&(egtpCb.recvTptSrvr.sockFd), &egtpFromAddr, &memInfo, &egtpBuf, &egtpBufLen, CM_INET_NO_FLAG); if(ret == ROK && egtpBuf != NULLP) { - DU_LOG("\nEGTP : Received message \n"); - SPrntMsg(egtpBuf, 0 ,0); + DU_LOG("\nINFO --> EGTP : Received message \n"); + ODU_PRINT_MSG(egtpBuf, 0 ,0); cuEgtpHdlRecvMsg(egtpBuf); } }; - RETVALUE(ret); + return (ret); }/* End of sctpSockPoll() */ /******************************************************************* @@ -471,9 +470,9 @@ S16 sctpSockPoll() * * ****************************************************************/ -S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, U32 *timeoutPtr, CmInetMemInfo *memInfo) +S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, uint32_t *timeoutPtr, CmInetMemInfo *memInfo) { - U16 ret = ROK; + uint16_t ret = ROK; CM_INET_FD_SET(sockFd, &pollParams->readFd); ret = cmInetSelect(&pollParams->readFd, NULLP, timeoutPtr, &pollParams->numFd); if(CM_INET_FD_ISSET(sockFd, &pollParams->readFd)) @@ -491,21 +490,21 @@ S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, U32 *timeou ret = sctpNtfyHdlr(&pollParams->ntfy); if(ret != ROK) { - DU_LOG("\nSCTP : Failed to process sctp notify msg\n"); + DU_LOG("\nERROR --> SCTP : Failed to process sctp notify msg\n"); } } else if(connUp & (pollParams->port == f1Params.destPort)) { F1APMsgHdlr(pollParams->mBuf); - SPutMsg(pollParams->mBuf); + ODU_PUT_MSG_BUF(pollParams->mBuf); } else { - SPutMsg(pollParams->mBuf); + ODU_PUT_MSG_BUF(pollParams->mBuf); } } } - RETVALUE(ROK); + return ROK; }/* End of sctpSockPoll() */ /******************************************************************* @@ -526,7 +525,7 @@ S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, U32 *timeou * ****************************************************************/ S16 sctpSend(Buffer *mBuf) { - U8 ret; + uint8_t ret; MsgLen len; /* number of actually sent octets */ CmInetMemInfo memInfo; @@ -537,11 +536,11 @@ S16 sctpSend(Buffer *mBuf) if(ret != ROK && ret != RWOULDBLOCK) { - DU_LOG("\nSCTP : Send message failed"); - RETVALUE(RFAILED); + DU_LOG("\nERROR --> SCTP : Send message failed"); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* End of sctpSend */ /**********************************************************************