From: aa7133@att.com <aa7133@att.com>
Date: Wed, 26 Aug 2020 13:19:20 +0000 (+0300)
Subject: 5.4.1 Stop counting HC messages to avoid skiping Term_INIT message umtil E2M send KA
X-Git-Tag: 5.4.8~17
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=de40d1cef93bba8e94b02c8aa8efa771bd5de0a1;p=ric-plt%2Fe2.git

5.4.1 Stop counting HC messages to avoid skiping Term_INIT message umtil E2M send KA

Change-Id: I39bd353efe56e3b155d80e9d4f51905f9941b55b
Signed-off-by: aa7133@att.com <aa7133@att.com>
---

diff --git a/RIC-E2-TERMINATION/TEST/testAsn/sctpClient/sctpClient.cpp b/RIC-E2-TERMINATION/TEST/testAsn/sctpClient/sctpClient.cpp
index 4cf1ade..020867f 100644
--- a/RIC-E2-TERMINATION/TEST/testAsn/sctpClient/sctpClient.cpp
+++ b/RIC-E2-TERMINATION/TEST/testAsn/sctpClient/sctpClient.cpp
@@ -195,7 +195,7 @@ __attribute_warn_unused_result__ cxxopts::ParseResult parse(SctpClient &sctpClie
             ("p,port", "port number", cxxopts::value<int>(sctpClient.rmrPort)->default_value("38200"))
             ("h,help", "Print help");
 
-    auto result = options.parse(argc, argv);
+    auto result = options.parse(argc, (const char **&)argv);
 
     if (result.count("help")) {
         std::cout << options.help({""}) << std::endl;
diff --git a/RIC-E2-TERMINATION/container-tag.yaml b/RIC-E2-TERMINATION/container-tag.yaml
index a21f677..037b389 100644
--- a/RIC-E2-TERMINATION/container-tag.yaml
+++ b/RIC-E2-TERMINATION/container-tag.yaml
@@ -1,3 +1,3 @@
 # The Jenkins job requires a tag to build the Docker image.
 # Global-JJB script assumes this file is in the repo root.
-tag: 5.4.0
+tag: 5.4.1
diff --git a/RIC-E2-TERMINATION/sctpThread.cpp b/RIC-E2-TERMINATION/sctpThread.cpp
index ddcaae2..36f5e34 100644
--- a/RIC-E2-TERMINATION/sctpThread.cpp
+++ b/RIC-E2-TERMINATION/sctpThread.cpp
@@ -482,7 +482,7 @@ cxxopts::ParseResult parse(int argc, char *argv[], sctp_params_t &sctpParams) {
             ("f,file", "config file name", cxxopts::value<std::string>(sctpParams.configFileName)->default_value("config.conf"))
             ("h,help", "Print help");
 
-    auto result = options.parse(argc, argv);
+    auto result = options.parse(argc, (const char **&)argv);
 
     if (result.count("help")) {
         std::cout << options.help({""}) << std::endl;
@@ -671,7 +671,7 @@ void listener(sctp_params_t *params) {
                 }
             } else if (params->rmrListenFd == events[i].data.fd) {
                 // got message from XAPP
-                num_of_XAPP_messages.fetch_add(1, std::memory_order_release);
+                //num_of_XAPP_messages.fetch_add(1, std::memory_order_release);
                 num_of_messages.fetch_add(1, std::memory_order_release);
                 if (mdclog_level_get() >= MDCLOG_DEBUG) {
                     mdclog_write(MDCLOG_DEBUG, "new message from RMR");
@@ -2067,6 +2067,10 @@ int receiveXappMessages(Sctp_Map_t *sctpMap,
         }
     }
 
+    if (rmrMessageBuffer.rcvMessage->mtype != RIC_HEALTH_CHECK_REQ) {
+        num_of_XAPP_messages.fetch_add(1, std::memory_order_release);
+
+    }
     switch (rmrMessageBuffer.rcvMessage->mtype) {
         case RIC_E2_SETUP_RESP : {
             if (PER_FromXML(message, rmrMessageBuffer) != 0) {