X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_inet.x;h=6a5048fa11e8b34f59f701e15b0b812506f3e65f;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=f6eeeebfd408254ee6473f01e105c82c89726759;hpb=1616921700a3c7541f1df6dd2678f9ee4d8e933b;p=o-du%2Fl2.git diff --git a/src/cm/cm_inet.x b/src/cm/cm_inet.x index f6eeeebfd..6a5048fa1 100644 --- a/src/cm/cm_inet.x +++ b/src/cm/cm_inet.x @@ -109,7 +109,7 @@ typedef CmIpAddr6 CmInetIpAddr6; /* 16 byte IPV6 address */ typedef struct cmInetIpAddrTbl { - U16 count; /* Number of addresses in table */ + uint16_t count; /* Number of addresses in table */ CmInetIpAddr netAddr[CM_INET_IPV4_NUM_ADDR]; /* Address table */ }CmInetIpAddrTbl; @@ -118,14 +118,14 @@ typedef CmInetIpAddrTbl CmInetIpv4AddrArr; #ifdef IPV6_SUPPORTED typedef struct cmInetIpv6AddrArr { - U16 count; /* Number of addresses in array */ + uint16_t count; /* Number of addresses in array */ CmInetIpAddr6 netAddr[CM_INET_IPV6_NUM_ADDR]; /* Address array */ }CmInetIpv6AddrArr; #endif /* IPV6_SUPPORTED */ typedef struct cmInetIpAddrArr { - U8 type; + uint8_t type; union { CmInetIpv4AddrArr ipv4AddrArr; @@ -140,8 +140,8 @@ typedef struct cmInetIpAddrArr /* Adding a type for socket Address */ typedef struct cmInetCmnSockAddr { - U32 type; - U32 len; + uint32_t type; + uint32_t len; union { struct sockaddr_in addr; @@ -173,11 +173,11 @@ typedef struct pollfd CmInetPollFd; typedef struct cmInetFd /* trillium socket file descriptor */ { CmInetFdType fd; /* socket descriptor */ - U8 blocking; /* true if socket is blocking */ - U8 type; /* socket type (stream|datagram) */ + uint8_t blocking; /* true if socket is blocking */ + uint8_t type; /* socket type (stream|datagram) */ #ifdef IPV6_SUPPORTED - U8 protType; /* indicates whether IPv4 or IPv6 socket */ + uint8_t protType; /* indicates whether IPv4 or IPv6 socket */ #endif /* IPV6_SUPPORTED */ }CmInetFd; @@ -187,20 +187,20 @@ typedef fd_set CmInetFdSet; /* socket file descriptor set */ /* IPV4 Address */ typedef struct cmInetIpv4Addr { - U16 port; + uint16_t port; CmInetIpAddr address; } CmInetIpv4Addr; /* IPV6 Address */ typedef struct cmInetIpv6Addr { - U16 port; + uint16_t port; CmInetIpAddr6 ipv6NetAddr; } CmInetIpv6Addr; typedef struct CmInetAddr /* Internet address */ { - U8 type; /* type of address present in the union */ + uint8_t type; /* type of address present in the union */ union { CmInetIpv4Addr ipv4Addr; /* IPV4 Address */ @@ -211,13 +211,13 @@ typedef struct CmInetAddr /* Internet address */ typedef struct cmInetMCastInf6 /* multicast interface information */ { CmInetIpAddr6 mCastAddr; /* multicast address */ - U32 localInf; /* local interface */ + uint32_t localInf; /* local interface */ } CmInetMCastInf6; #else /* IPV4 Address */ typedef struct cmInetAddr1 { - U16 port; + uint16_t port; CmInetIpAddr address; } CmInetAddr; typedef CmInetAddr CmInetIpv4Addr; @@ -239,7 +239,7 @@ typedef struct cmInetMCastInf /* multicast information */ used here for cmInetConvertStrToIpAddr */ typedef struct cmInetNetAddr { - U8 type; /* type of network address */ + uint8_t type; /* type of network address */ union { CmInetIpAddr ipv4NetAddr; /* IP network address */ @@ -253,7 +253,7 @@ typedef struct cmInetNetAddr #ifdef CM_LKSCTP typedef struct cmInetNetAddrLst { - U8 count; + uint8_t count; CmInetNetAddr addrs[CM_INET_NUM_NET_ADDR]; } CmInetNetAddrLst; #endif @@ -263,7 +263,7 @@ typedef struct cmInetNetAddrLst typedef struct cmInetLocalInf { Bool intfPrsnt; /* bool to indicate if this is a valid loc intf */ - U32 localIf; /* interface index IPv4(32 bit) or IPv6(32 bit) */ + uint32_t localIf; /* interface index IPv4(32 bit) or IPv6(32 bit) */ CmInetNetAddr localIfAddr; /* interface address */ }CmInetLocalInf; #endif /* LOCAL_INTF */ @@ -282,38 +282,38 @@ typedef struct icmp6_filter CmInetIcmp6Filter; /* structure to hold TLV of each HBH option */ typedef struct cmInetIpv6HBHHdr { - U8 type; - U8 length; - U8 *value; + uint8_t type; + uint8_t length; + uint8_t *value; } CmInetIpv6HBHHdr; /* structure to hold TLV of each Destination option */ typedef struct cmInetIpv6DestOptsHdr { - U8 type; - U8 length; - U8 *value; + uint8_t type; + uint8_t length; + uint8_t *value; } CmInetIpv6DestOptsHdr; /* structure to hold IPV6 addresses of the Route header */ typedef struct cmInetIpv6RtHdr { - U8 numAddrs; - U32 slMap; + uint8_t numAddrs; + uint32_t slMap; CmInetIpAddr6 *ipv6Addrs; } CmInetIpv6RtHdr; /* array of all HBH options */ typedef struct cmInetIpv6HBHHdrArr { - U8 numHBHOpts; + uint8_t numHBHOpts; CmInetIpv6HBHHdr *hbhOpts; } CmInetIpv6HBHHdrArr; /* array of all Destination options */ typedef struct cmInetIpv6DestOptsArr { - U8 numDestOpts; + uint8_t numDestOpts; CmInetIpv6DestOptsHdr *destOpts; } CmInetIpv6DestOptsArr; @@ -331,17 +331,17 @@ typedef struct cmInetIpv6ExtHdr /* structure for type 0 Route Header */ typedef struct cmInetIpv6RtHdr0 { - U8 ip6r0_nextHdr; - U8 ip6r0_hdrExtLen; - U8 ip6r0_type; - U8 ip6r0_segLeft; - U32 ip6r0_resrvAndSLmap; /* first byte reserved, last 3 srtict/loose map */ + uint8_t ip6r0_nextHdr; + uint8_t ip6r0_hdrExtLen; + uint8_t ip6r0_type; + uint8_t ip6r0_segLeft; + uint32_t ip6r0_resrvAndSLmap; /* first byte reserved, last 3 srtict/loose map */ } CmInetIpv6RtHdr0; #endif /* IPV6_OPTS_SUPPORTED */ typedef struct cmInetIpv6HdrParm { - TknU8 ttl; + TknUInt8 ttl; CmInetNetAddr srcAddr6;/* used to set src addr on sending pkt(IPv6) */ #ifdef IPV6_OPTS_SUPPORTED CmInetIpv6ExtHdr ipv6ExtHdr; @@ -351,10 +351,10 @@ typedef struct cmInetIpv6HdrParm typedef struct cmInetIpv4HdrParm { - TknU8 proto; /* Protocol value */ - TknU8 dfBit; /* Don't fragment flag */ - TknU8 tos; /* Type of Service */ - TknU8 ttl; /* Time to Live */ + TknUInt8 proto; /* Protocol value */ + TknUInt8 dfBit; /* Don't fragment flag */ + TknUInt8 tos; /* Type of Service */ + TknUInt8 ttl; /* Time to Live */ /* added new field */ #ifdef IPV4_OPTS_SUPPORTED TknStr64 ipv4HdrOpt; /* IPV4 hdr opt */ @@ -362,7 +362,7 @@ typedef struct cmInetIpv4HdrParm } CmInetIpv4HdrParm; typedef struct cmInetIpHdrParm { - U8 type; + uint8_t type; union { CmInetIpv4HdrParm hdrParmIpv4; /* IPv4 header parameters */ @@ -378,7 +378,7 @@ typedef struct cmInetIpHdrParm typedef struct cmInetFdSetInfo { Bool initDone; /* Initialisation done */ - U32 numFds; /* Number of file descriptors scanned */ + uint32_t numFds; /* Number of file descriptors scanned */ } CmInetFdSetInfo; #else #if (defined(SUNOS) || defined(SS_LINUX) || defined(SS_VW) || defined(HPOS)) @@ -386,9 +386,9 @@ typedef struct cmInetFdSetInfo { Bool initDone; /* Initialisation done */ Bool bigEndian; /* Big endian architecture */ - U16 arIdx; /* Current index in fd_set array */ - U32 numArElems; /* Number of array elements */ - U8 ar[256]; /* Array of bit positions */ + uint16_t arIdx; /* Current index in fd_set array */ + uint32_t numArElems; /* Number of array elements */ + uint8_t ar[256]; /* Array of bit positions */ } CmInetFdSetInfo; #endif /* SUNOS || SS_LINUX || SS_VW */ #endif /* WIN32 */ @@ -397,70 +397,70 @@ typedef struct cmInetFdSetInfo #ifdef CM_LKSCTP typedef struct cmInetSctpSndRcvInfo { - U16 stream; - U16 ssn; - U16 flags; - U32 ppid; - U32 context; - U32 timetolive; - U32 tsn; - U32 cumtsn; - U32 assocId; + uint16_t stream; + uint16_t ssn; + uint16_t flags; + uint32_t ppid; + uint32_t context; + uint32_t timetolive; + uint32_t tsn; + uint32_t cumtsn; + uint32_t assocId; } CmInetSctpSndRcvInfo; typedef struct cmInetSctpNotification { struct { - U16 nType; - U16 nFlags; - U32 nLen; + uint16_t nType; + uint16_t nFlags; + uint32_t nLen; } header; union { struct { - U16 state; - U16 error; - U16 outStreams; - U16 inStreams; - U32 assocId; - U8 *info; + uint16_t state; + uint16_t error; + uint16_t outStreams; + uint16_t inStreams; + uint32_t assocId; + uint8_t *info; }assocChange; struct { CmInetNetAddr addr; S32 state; S32 error; - U32 assocId; + uint32_t assocId; }paddrChange; struct { - U16 error; - U32 assocId; - U8 *data; + uint16_t error; + uint32_t assocId; + uint8_t *data; }remoteErr; struct { - U32 error; + uint32_t error; CmInetSctpSndRcvInfo info; - U32 assocId; - U8 *data; + uint32_t assocId; + uint8_t *data; }sndFailed; struct { - U32 assocId; + uint32_t assocId; }shutdownEvt; struct { - U32 adaptationInd; - U32 assocId; + uint32_t adaptationInd; + uint32_t assocId; }adaptationEvt; struct { - U32 indication; - U32 assocId; + uint32_t indication; + uint32_t assocId; }pdapiEvt; }u; }CmInetSctpNotification; @@ -468,7 +468,7 @@ typedef struct cmInetSctpNotification typedef struct cmInetSockLinger { Bool enable; - U32 lingerTime; + uint32_t lingerTime; } CmInetSockLinger; typedef struct cmInetSctpSockEvent @@ -485,51 +485,51 @@ typedef struct cmInetSctpSockEvent typedef struct cmInetSctpPeerAddrParams { - U32 assocId; + uint32_t assocId; struct { Bool addrPres; CmInetNetAddr addr; - U16 port; + uint16_t port; }s; - U32 pathMaxRxt; - U32 pathMtu; - U32 sackDelay; - U8 pmtudFlag; - U8 sackDelayFlag; - U8 hbEnblFlag; - U32 hbInterval; + uint32_t pathMaxRxt; + uint32_t pathMtu; + uint32_t sackDelay; + uint8_t pmtudFlag; + uint8_t sackDelayFlag; + uint8_t hbEnblFlag; + uint32_t hbInterval; } CmInetSctpPeerAddrParams; typedef struct cmInetSctpPrimAddr { - U32 assocId; + uint32_t assocId; CmInetNetAddr addr; - U16 port; + uint16_t port; }CmInetSctpPrimAddr; typedef struct cmInetSctpPeerAddrInfo { - U32 assocId; + uint32_t assocId; CmInetNetAddr addr; - U16 port; + uint16_t port; Bool isActive; - U32 cwnd; - U32 srtt; - U32 rto; - U32 mtu; + uint32_t cwnd; + uint32_t srtt; + uint32_t rto; + uint32_t mtu; }CmInetSctpPeerAddrInfo; typedef struct cmInetSctpStatus { - U32 assocId; + uint32_t assocId; S32 state; - U32 rwnd; - U16 unackdata; - U16 penddata; - U16 instrms; - U16 outstrms; - U32 fragPoint; + uint32_t rwnd; + uint16_t unackdata; + uint16_t penddata; + uint16_t instrms; + uint16_t outstrms; + uint32_t fragPoint; CmInetSctpPeerAddrInfo primary; }CmInetSctpStatus; @@ -537,28 +537,28 @@ typedef struct cmInetSctpStatus HBeat value Max retransmissions (Init, Path, Association)*/ typedef struct cmInetSctpRtoInfo { - U32 assocId; - U32 rtoInitial; - U32 rtoMax; - U32 rtoMin; + uint32_t assocId; + uint32_t rtoInitial; + uint32_t rtoMax; + uint32_t rtoMin; }CmInetSctpRtoInfo; typedef struct cmInetSctpInitMsg { - U16 maxInitReTx; - U16 maxInitTimeout; - U16 maxInstreams; - U16 numOstreams; + uint16_t maxInitReTx; + uint16_t maxInitTimeout; + uint16_t maxInstreams; + uint16_t numOstreams; }CmInetSctpInitMsg; typedef struct cmInetSctpAssocParams { - U32 assocId; - U16 assocMaxReTx; - U16 numberOfPeerDest; - U32 peerRwnd; - U32 localRwnd; - U32 cookieLife; + uint32_t assocId; + uint16_t assocMaxReTx; + uint16_t numberOfPeerDest; + uint32_t peerRwnd; + uint32_t localRwnd; + uint32_t cookieLife; }CmInetSctpAssocParams; #endif @@ -606,13 +606,13 @@ typedef struct addrinfo CmInetAddrInfo; #ifdef CM_INET2 #ifdef IPV6_SUPPORTED -EXTERN S16 cmInetSocket ARGS((U8 type, CmInetFd *sockFd, U8 protocol, - U8 family)); +EXTERN S16 cmInetSocket ARGS((uint8_t type, CmInetFd *sockFd, uint8_t protocol, + uint8_t family)); #else -EXTERN S16 cmInetSocket ARGS((U8 type, CmInetFd *sockFd, U8 protocol)); +EXTERN S16 cmInetSocket ARGS((uint8_t type, CmInetFd *sockFd, uint8_t protocol)); #endif /* IPV6_SUPPORTED */ #else /* CM_INET2 */ -EXTERN S16 cmInetSocket ARGS((U8 type, CmInetFd *sockFd)); +EXTERN S16 cmInetSocket ARGS((uint8_t type, CmInetFd *sockFd)); #endif /* CM_INET2 */ /* cm_inet_x_001.main_22 1. Added new interface - cmInetFlushRecvBuf() @@ -667,18 +667,18 @@ EXTERN S16 cmInetSendMsg ARGS((CmInetFd *sockFd, CmInetAddr *dstAddr, #endif /* IPV6_OPTS_SUPPORTED */ EXTERN S16 cmInetPeek ARGS((CmInetFd *sockFd, CmInetAddr *fromAddr, CmInetMemInfo *info, MsgLen dataPos, - MsgLen dataLen, U8 *data)); + MsgLen dataLen, uint8_t *data)); /* cm_inet_x_001.main_26: Added new function declaration cmInetPeekNew() */ EXTERN S16 cmInetPeekNew ARGS((CmInetFd *sockFd, CmInetAddr *fromAddr, CmInetMemInfo *info, MsgLen dataPos, - MsgLen dataLen, U8 *data)); + MsgLen dataLen, uint8_t *data)); EXTERN S16 cmInetClose ARGS((CmInetFd *sockFd)); EXTERN S16 cmInetShutdown ARGS((CmInetFd *sockFd, S32 howTo)); EXTERN S16 cmInetSelect ARGS((CmInetFdSet *readFdS, CmInetFdSet *writeFdS, - U32 *mSecTimeout, S16 *numFdS)); -EXTERN S16 cmInetSetOpt ARGS((CmInetFd *sockFd, U32 level, U32 type, + uint32_t *mSecTimeout, S16 *numFdS)); +EXTERN S16 cmInetSetOpt ARGS((CmInetFd *sockFd, uint32_t level, uint32_t type, Ptr value)); -EXTERN S16 cmInetGetNumRead ARGS((CmInetFd *sockFd, U32 *dataLen)); +EXTERN S16 cmInetGetNumRead ARGS((CmInetFd *sockFd, uint32_t *dataLen)); #ifndef SS_PS EXTERN S16 cmInetGetHostByName ARGS((S8 *hostName, CmInetIpAddrTbl *addrTbl)); EXTERN S16 cmInetGetIpNodeByName ARGS((S8 *hostName, CmInetIpAddrArr *addrArr)); @@ -702,21 +702,21 @@ EXTERN S16 cmInetInit ARGS((Void)); EXTERN S16 cmInetDeInit ARGS((Void)); EXTERN S16 cmInetGetSockName ARGS((CmInetFd *sockFd, CmInetAddr *locAddr)); -EXTERN S16 cmInetConvertStrToIpAddr ARGS((U16 len, U8 *val, +EXTERN S16 cmInetConvertStrToIpAddr ARGS((uint16_t len, uint8_t *val, CmInetNetAddr *address)); -EXTERN S16 cmInetAsciiToIpv4 ARGS((U8 numBytes, U8 *ipv4Addr, - U16 len, U8 *val)); +EXTERN S16 cmInetAsciiToIpv4 ARGS((uint8_t numBytes, uint8_t *ipv4Addr, + uint16_t len, uint8_t *val)); /* cm_inet_x_001.main_29 Poll Implementation Changes */ -EXTERN S16 cmInetPoll ARGS((CmInetPollFd *pollFdArr,U32 idx,S16 *numFdS,U32 timeout)); -EXTERN S16 cmInetPollSetFd ARGS((CmInetFd *sockFd,CmInetPollFd *pollFdArr,S16 idx, U16 eventMask)); -EXTERN S16 cmInetPollFdIsSet ARGS((CmInetPollFd *pollFdArr, S16 idx, U16 eventMask)); -EXTERN S16 cmInetPollClearFdREvent ARGS((CmInetPollFd *pollFdArr, S16 idx, U16 eventMask)); -EXTERN S16 cmInetPollClearFdEvent ARGS((CmInetPollFd *pollFdArr,S16 idx, U16 eventMask)); +EXTERN S16 cmInetPoll ARGS((CmInetPollFd *pollFdArr,uint32_t idx,S16 *numFdS,uint32_t timeout)); +EXTERN S16 cmInetPollSetFd ARGS((CmInetFd *sockFd,CmInetPollFd *pollFdArr,S16 idx, uint16_t eventMask)); +EXTERN S16 cmInetPollFdIsSet ARGS((CmInetPollFd *pollFdArr, S16 idx, uint16_t eventMask)); +EXTERN S16 cmInetPollClearFdREvent ARGS((CmInetPollFd *pollFdArr, S16 idx, uint16_t eventMask)); +EXTERN S16 cmInetPollClearFdEvent ARGS((CmInetPollFd *pollFdArr,S16 idx, uint16_t eventMask)); EXTERN S16 cmInetPollDelFd ARGS((CmInetPollFd *pollFdArr, S16 delIdx, S16 crntIdx)); EXTERN S16 cmInetPollInitFdArr ARGS((CmInetPollFd *pollFdArr)); -EXTERN S16 cmInetNtop ARGS((U8 type,Void *address,S8 *asciiAddr,U32 len)); +EXTERN S16 cmInetNtop ARGS((uint8_t type,Void *address,S8 *asciiAddr,uint32_t len)); @@ -731,25 +731,25 @@ EXTERN Void cmInetFreeAddrInfo ARGS((CmInetAddrInfo *res)); #ifdef CM_LKSCTP EXTERN S16 cmInetSctpBindx ARGS((CmInetFd *sockFd, CmInetNetAddrLst *addrLst, - U16 port)); + uint16_t port)); EXTERN S16 cmInetSctpConnectx ARGS((CmInetFd *sockFd, CmInetNetAddr *primAddr, CmInetNetAddrLst *addrLst, - U16 port)); -EXTERN S16 cmInetSctpPeelOff ARGS((CmInetFd *sockFd, U32 assocId, + uint16_t port)); +EXTERN S16 cmInetSctpPeelOff ARGS((CmInetFd *sockFd, uint32_t assocId, CmInetFdType *assocFd)); EXTERN S16 cmInetSctpSendMsg ARGS((CmInetFd *sockFd, CmInetNetAddr *dstAddr, - U16 port, CmInetMemInfo *info, - Buffer *mBuf, MsgLen *len, U16 strmId, - Bool unorderFlg, U16 ttl, U32 ppId, - U32 context)); + uint16_t port, CmInetMemInfo *info, + Buffer *mBuf, MsgLen *len, uint16_t strmId, + Bool unorderFlg, uint16_t ttl, uint32_t ppId, + uint32_t context)); EXTERN S16 cmInetSctpRecvMsg ARGS((CmInetFd *sockFd, CmInetNetAddr *srcAddr, - U16 *port, CmInetMemInfo *info, + uint16_t *port, CmInetMemInfo *info, Buffer **mBuf, MsgLen *len, - CmInetSctpSndRcvInfo *sinfo, U32 *flag, + CmInetSctpSndRcvInfo *sinfo, uint32_t *flag, CmInetSctpNotification *ntfy)); -EXTERN S16 cmInetSctpGetPAddrs ARGS((CmInetFd *sockFd, U32 assocId, +EXTERN S16 cmInetSctpGetPAddrs ARGS((CmInetFd *sockFd, uint32_t assocId, CmInetNetAddrLst *addrlst)); -EXTERN S16 cmInetGetOpt ARGS((CmInetFd *sockFd, U32 level, U32 type, +EXTERN S16 cmInetGetOpt ARGS((CmInetFd *sockFd, uint32_t level, uint32_t type, Ptr value)); /*cm_inet_x_001.main_25: Added new funcion */