Merge "Classification of RIC logs [JIRA ID - ODUHIGH-275]"

[o-du/l2.git] / src / ric_stub / ric_stub_sctp.h

diff --git a/src/ric_stub/ric_stub_sctp.h b/src/ric_stub/ric_stub_sctp.h
index 86fb14c..fd72abb 100644 (file)
--- a/src/ric_stub/ric_stub_sctp.h
+++ b/src/ric_stub/ric_stub_sctp.h
@@ -20,62 +20,48 @@
 
 #ifndef __RIC_SCTP_H__
 #define __RIC_SCTP_H__
-
-#include "ric_stub.h"
-#include "cm_inet.h"
-#include "cm_tpt.h"
-
-#include "cm_inet.x"
-#include "cm_tpt.x"
-
 #define MAX_RETRY 5
-#define DU_SCTP_UP 1
-#define DU_SCTP_DOWN 0
 
 /* Global variable declaration */
-U8   socket_type;      /* Socket type */
-Bool nonblocking;      /* Blocking/Non-blocking socket */
-Bool connUp;           /* Is connection up */
-int  assocId;          /* Assoc Id of connected assoc */
+uint8_t   socket_type;      /* Socket type */
+bool      nonblocking;      /* Blocking/Non-blocking socket */
+bool      connUp;           /* Is connection up */
+int       assocId;          /* Assoc Id of connected assoc */
   
-SctpParamsRic sctpCfg;            /* SCTP configurations at DU */
 typedef struct
 {
-   S16           numFds;
-   U16           port;   
-   U32           flag;
-   Buffer        *mBuf;
-   MsgLen        bufLen; 
-   CmInetNetAddr addr;
-   CmInetFdSet      readFd;
+   uint16_t           numFd;
+   uint16_t           port;   
+   uint32_t           flag;
+   Buffer            *mBuf;
+   MsgLen             bufLen; 
+   CmInetNetAddr      addr;
+   CmInetFdSet        readFd;
    CmInetSctpSndRcvInfo   info;
    CmInetSctpNotification ntfy;
 }sctpSockPollParams;
 
 typedef struct
 {
-   U8               itfState;
-   U16              destPort;         /* DU PORTS */
-   U16              srcPort;
-   Bool             bReadFdSet;
-   CmInetFd         sockFd;           /* Socket file descriptor */
-   CmInetAddr       peerAddr;
-   CmInetFd         lstnSockFd;       /* Listening Socket file descriptor */
-   CmInetNetAddrLst destAddrLst;      /* DU Ip address */
-   CmInetNetAddrLst localAddrLst;
-   CmInetNetAddr    destIpNetAddr;    /* DU Ip address */ 
+   uint16_t              destPort;         /* DU PORTS */
+   uint16_t              srcPort;
+   bool                  bReadFdSet;
+   CmInetFd              sockFd;           /* Socket file descriptor */
+   CmInetAddr            peerAddr;
+   CmInetFd              lstnSockFd;       /* Listening Socket file descriptor */
+   CmInetNetAddrLst      destAddrLst;      /* DU Ip address */
+   CmInetNetAddrLst      localAddrLst;
+   CmInetNetAddr         destIpNetAddr;    /* DU Ip address */ 
 }CuSctpDestCb;
 
-EXTERN S16 sctpActvInit();
-EXTERN S16 sctpSend(Buffer *mBuf);
+S16 sctpActvInit();
+S16 sctpSend(Buffer *mBuf);
 S16 sctpCfgReq();
 S16 sctpStartReq();
-S16 fillAddrLst(CmInetNetAddrLst *addrLstPtr, SctpIpAddr *ipAddr);
-S16 fillDestNetAddr(CmInetNetAddr *destAddrPtr, SctpIpAddr *dstIpPtr);
 S16 sctpSetSockOpts(CmInetFd *sock_Fd);
 S16 sctpAccept(CmInetFd *lstnSock_Fd, CmInetAddr *peerAddr, CmInetFd *sock_Fd);
 S16 sctpSockPoll();
-S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, U32 *timeoutPtr, CmInetMemInfo *memInfo);
+S16 processPolling(sctpSockPollParams *pollParams, CmInetFd *sockFd, uint32_t *timeoutPtr, CmInetMemInfo *memInfo);
 
 #endif