X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=e2sim%2Fe2sm_examples%2Fkpm_e2sm%2Fsrc%2Fkpm%2Fkpm_callbacks.cpp;h=0370984fb63584411b8aee4292f4f29c4c8c51c7;hb=3dacb077c9e7d0c998bb9a76804c95aced032b80;hp=18081f38223a7283a2ef0fb82faea883bfecdeaf;hpb=b5b0ef2a978d37f24fe6eda1613069ed2d355016;p=sim%2Fe2-interface.git

diff --git a/e2sim/e2sm_examples/kpm_e2sm/src/kpm/kpm_callbacks.cpp b/e2sim/e2sm_examples/kpm_e2sm/src/kpm/kpm_callbacks.cpp
old mode 100644
new mode 100755
index 18081f3..0370984
--- a/e2sim/e2sm_examples/kpm_e2sm/src/kpm/kpm_callbacks.cpp
+++ b/e2sim/e2sm_examples/kpm_e2sm/src/kpm/kpm_callbacks.cpp
@@ -50,6 +50,8 @@ extern "C" {
 #include <thread>
 #include <chrono>
 
+#include "viavi_connector.hpp"
+
 using json = nlohmann::json;
 
 using namespace std;
@@ -146,12 +148,19 @@ void get_cell_id(uint8_t *nrcellid_buf, char *cid_return_buf) {
 
 }
 
-void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long actionId) {
+void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long actionId)
+{
+  std::filebuf reports_json;
+  std::streambuf *input_filebuf = &reports_json;
 
-  std::ifstream input("/playpen/src/reports.json");
-  bool x = input.good();
+  std::unique_ptr<viavi::RICTesterReceiver> viavi_connector;
+  if (!reports_json.open("/playpen/src/reports.json", std::ios::in)) {
+    std::cerr << "Can't open reports.json, enabling VIAVI connector instead..." << endl;
+	viavi_connector.reset(new viavi::RICTesterReceiver {3001, nullptr});
+	input_filebuf = viavi_connector->get_data_filebuf();
+  }
 
-  fprintf(stderr, "%s\n", x ? "true" : "false");
+  std::istream input {input_filebuf};
 
   long seqNum = 1;
 
@@ -236,7 +245,7 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
 	  
 	  json::json_pointer p5(std::string("/ueMeasReport/ueMeasReportList/") + std::to_string(i) +"/neighbourCellList");
 	  
-	  uint8_t *crnti_buf = (uint8_t*)calloc(1,2);
+	  uint8_t crnti_buf[3] = {0, };
 
 	  if (ueId.find("Pedestrian") != string::npos) {
 	    std::string ind = ueId.substr(11);
@@ -297,14 +306,14 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
 	    }
 
 
-	    uint8_t *neighbor_cellid_buf = (uint8_t*)calloc(1,5);
+	    uint8_t neighbor_cellid_buf[6] = {0, };
 	    neighbor_cellid_buf[0] = 0x22;
 	    neighbor_cellid_buf[1] = 0x5B;
 	    neighbor_cellid_buf[2] = 0xD6;
 	    neighbor_cellid_buf[3] = nextNbCell;
 	    neighbor_cellid_buf[4] = 0x70;
 	    
-	    char *cid_buf = (char*)calloc(1,24);
+	    char cid_buf[25] = {0, };
 	    get_cell_id(neighbor_cellid_buf,cid_buf);
 	    
 	    
@@ -324,22 +333,22 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
 	  const uint8_t *neighbor_buf = reinterpret_cast<const uint8_t*>(neighbor_str.c_str());
 
 
-	  uint8_t *nrcellid_buf = (uint8_t*)calloc(1,5);
+	  uint8_t nrcellid_buf[6] = {0, };
 	  nrcellid_buf[0] = 0x22;
 	  nrcellid_buf[1] = 0x5B;
 	  nrcellid_buf[2] = 0xD6;
 	  nrcellid_buf[3] = nextCellId;
 	  nrcellid_buf[4] = 0x70;
 
-	  uint8_t *gnbid_buf = (uint8_t*)calloc(1,3);
+	  uint8_t gnbid_buf[4] = {0, };
 	  gnbid_buf[0] = 0x22;
 	  gnbid_buf[1] = 0x5B;
 	  gnbid_buf[2] = 0xD6;
 
-	  uint8_t cuupid_buf[1];
+	  uint8_t cuupid_buf[2] = {0, };
 	  cuupid_buf[0] = 20000;
 
-	  uint8_t duid_buf[1];
+	  uint8_t duid_buf[2] = {0, };
 	  duid_buf[0] = 20000;
 
 	  uint8_t *cuupname_buf = (uint8_t*)"GNBCUUP5";	  
@@ -548,22 +557,22 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
 	  uint8_t *sd_buf = (uint8_t*)"100";
 	  uint8_t *plmnid_buf = (uint8_t*)"747";
 
-	  uint8_t *nrcellid_buf = (uint8_t*)calloc(1,5);
+	  uint8_t nrcellid_buf[6] = {0, };
 	  nrcellid_buf[0] = 0x22;
 	  nrcellid_buf[1] = 0x5B;
 	  nrcellid_buf[2] = 0xD6;
 	  nrcellid_buf[3] = cellid;
 	  nrcellid_buf[4] = 0x70;
 
-	  uint8_t *gnbid_buf = (uint8_t*)calloc(1,3);
+	  uint8_t gnbid_buf[4] = {0, };
 	  gnbid_buf[0] = 0x22;
 	  gnbid_buf[1] = 0x5B;
 	  gnbid_buf[2] = 0xD6;
 
-	  uint8_t cuupid_buf[1];
+	  uint8_t cuupid_buf[2] = {0, };
 	  cuupid_buf[0] = 20000;
 
-	  uint8_t duid_buf[1];
+	  uint8_t duid_buf[2] = {0, };
 	  duid_buf[0] = 20000;
 
 	  uint8_t *cuupname_buf = (uint8_t*)"GNBCUUP5";