X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=RIC-E2-TERMINATION%2FsctpThread.h;h=10c6d90c4a0970ff5dd4dbdfe11696ef0f26a74e;hb=e90818c3c36f5dde87661c6c85e8bcc3d3e903de;hp=f6b97527e719435a18d20b934cd9559c4a948f5c;hpb=6680c3b3a845af93ffa8dc1ec4b11efe7250c38a;p=ric-plt%2Fe2.git diff --git a/RIC-E2-TERMINATION/sctpThread.h b/RIC-E2-TERMINATION/sctpThread.h index f6b9752..10c6d90 100644 --- a/RIC-E2-TERMINATION/sctpThread.h +++ b/RIC-E2-TERMINATION/sctpThread.h @@ -84,11 +84,9 @@ #include "cxxopts.hpp" //#include "config-cpp/include/config-cpp/config-cpp.h" -#ifdef __TRACING__ -#include "openTracing.h" -#endif #include "mapWrapper.h" +#include "statCollector.h" #include "base64.h" @@ -108,12 +106,13 @@ namespace expr = boost::log::expressions; #define MAXEVENTS 128 -#define RECEIVE_SCTP_BUFFER_SIZE (8 * 1024) +#define RECEIVE_SCTP_BUFFER_SIZE (128 * 1024) #define RECEIVE_XAPP_BUFFER_SIZE RECEIVE_SCTP_BUFFER_SIZE typedef mapWrapper Sctp_Map_t; + #define VOLUME_URL_SIZE 256 #define KA_MESSAGE_SIZE 2048 @@ -147,8 +146,6 @@ typedef struct ConnectedCU { char portNumber[NI_MAXSERV] {}; char enodbName[MAX_ENODB_NAME_SIZE] {}; char asnData[RECEIVE_SCTP_BUFFER_SIZE] {}; - int rcvMsgs = 0; - int sentMesgs = 0; size_t asnLength = 0; int mtype = 0; bool isConnected = false; @@ -162,9 +159,9 @@ typedef struct RmrMessagesBuffer { int ka_message_len = 0; void *rmrCtx = nullptr; rmr_mbuf_t *sendMessage= nullptr; - rmr_mbuf_t *sendBufferedMessages[MAX_RMR_BUFF_ARRY] {}; + //rmr_mbuf_t *sendBufferedMessages[MAX_RMR_BUFF_ARRY] {}; rmr_mbuf_t *rcvMessage= nullptr; - rmr_mbuf_t *rcvBufferedMessages[MAX_RMR_BUFF_ARRY] {}; + //rmr_mbuf_t *rcvBufferedMessages[MAX_RMR_BUFF_ARRY] {}; } RmrMessagesBuffer_t; typedef struct formatedMessage { @@ -182,6 +179,7 @@ typedef struct ReportingMessages { long outLen = 0; unsigned char base64Data[RECEIVE_SCTP_BUFFER_SIZE * 2] {}; char buffer[RECEIVE_SCTP_BUFFER_SIZE * 8] {}; + StatCollector *statCollector = nullptr; } ReportingMessages_t; cxxopts::ParseResult parse(int argc, char *argv[], sctp_params_t &pSctpParams); @@ -320,6 +318,7 @@ int sendDirectionalSctpMsg(RmrMessagesBuffer_t &messagBuffer, * @param rmrMessageBuffer */ void asnInitiatingRequest(E2AP_PDU_t *pdu, + Sctp_Map_t *sctpMap, ReportingMessages_t &message, RmrMessagesBuffer_t &rmrMessageBuffer); /** @@ -330,6 +329,7 @@ void asnInitiatingRequest(E2AP_PDU_t *pdu, * @param rmrMessageBuffer */ void asnSuccsesfulMsg(E2AP_PDU_t *pdu, + Sctp_Map_t *sctpMap, ReportingMessages_t &message, RmrMessagesBuffer_t &rmrMessageBuffer); /** @@ -340,6 +340,7 @@ void asnSuccsesfulMsg(E2AP_PDU_t *pdu, * @param rmrMessageBuffer */ void asnUnSuccsesfulMsg(E2AP_PDU_t *pdu, + Sctp_Map_t *sctpMap, ReportingMessages_t &message, RmrMessagesBuffer_t &rmrMessageBuffer);