X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=RIC-E2-TERMINATION%2FsctpThread.h;h=637dd17da5832949c9a03d1320cf2457b814f977;hb=16c799b750e66b24ff1ac71f5038c18757fd7028;hp=543c94c74febff4a11804ba54c6085600006afaa;hpb=be92d71ad86a8dfd129f000db99d4cd661633160;p=ric-plt%2Fe2.git diff --git a/RIC-E2-TERMINATION/sctpThread.h b/RIC-E2-TERMINATION/sctpThread.h index 543c94c..637dd17 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" @@ -114,6 +112,7 @@ namespace expr = boost::log::expressions; typedef mapWrapper Sctp_Map_t; + #define VOLUME_URL_SIZE 256 #define KA_MESSAGE_SIZE 2048 @@ -180,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); @@ -209,7 +209,6 @@ void handlepoll_error(struct epoll_event &event, void cleanHashEntry(ConnectedCU_t *peerInfo, Sctp_Map_t *m); -int getSetupRequestMetaData(ReportingMessages_t &message, char *data, char *host, uint16_t &port); /** * @@ -297,24 +296,10 @@ void getRmrContext(sctp_params_t &pSctpParams); * @param messagBuffer * @return */ -int receiveXappMessages(int epoll_fd, - Sctp_Map_t *sctpMap, +int receiveXappMessages(Sctp_Map_t *sctpMap, RmrMessagesBuffer_t &rmrMessageBuffer, struct timespec &ts); -/** - * - * @param rmrMessageBuffer - * @param message - * @param epoll_fd - * @param sctpMap - * @return - */ -int connectToCUandSetUp(RmrMessagesBuffer_t &rmrMessageBuffer, - ReportingMessages_t &message, - int epoll_fd, - Sctp_Map_t *sctpMap); - /** * * @param messagBuffer @@ -344,7 +329,6 @@ void asnInitiatingRequest(E2AP_PDU_t *pdu, */ void asnSuccsesfulMsg(E2AP_PDU_t *pdu, ReportingMessages_t &message, - Sctp_Map_t *sctpMap, RmrMessagesBuffer_t &rmrMessageBuffer); /** * @@ -355,7 +339,6 @@ void asnSuccsesfulMsg(E2AP_PDU_t *pdu, */ void asnUnSuccsesfulMsg(E2AP_PDU_t *pdu, ReportingMessages_t &message, - Sctp_Map_t *sctpMap, RmrMessagesBuffer_t &rmrMessageBuffer); /**