SIM-116: Update list of performance metrics in E2 setup request for oransim

[sim/e2-interface.git] / e2sim / src / base / e2sim.cpp

diff --git a/e2sim/src/base/e2sim.cpp b/e2sim/src/base/e2sim.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 1f74389..45927e5
--- a/e2sim/src/base/e2sim.cpp
+++ b/e2sim/src/base/e2sim.cpp
@@ -1,6 +1,7 @@
 /*****************************************************************************
 #                                                                            *
 # Copyright 2020 AT&T Intellectual Property                                  *
+# Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved.      *
 #                                                                            *
 # Licensed under the Apache License, Version 2.0 (the "License");            *
 # you may not use this file except in compliance with the License.           *
@@ -28,20 +29,31 @@
 #include "e2sim_sctp.hpp"
 #include "e2ap_message_handler.hpp"
 #include "encode_e2apv1.hpp"
+#include "RANfunctionOID.h"
 
 using namespace std;
 
 int client_fd = 0;
 
+std::unordered_map<long, OCTET_STRING_t*> E2Sim::getRegistered_ran_functions() {
+  return ran_functions_registered;
+}
+
 void E2Sim::register_subscription_callback(long func_id, SubscriptionCallback cb) {
-  printf("%%%%about to register callback for subscription for func_id %d\n", func_id);
+  fprintf(stderr,"%%%%about to register callback for subscription for func_id %d\n", func_id);
   subscription_callbacks[func_id] = cb;
   
 }
 
 SubscriptionCallback E2Sim::get_subscription_callback(long func_id) {
-  printf("%%%%we are getting the subscription callback for func id %d\n", func_id);
-  SubscriptionCallback cb = subscription_callbacks[func_id];
+  fprintf(stderr, "%%%%we are getting the subscription callback for func id %d\n", func_id);
+  SubscriptionCallback cb;
+
+  try {
+    cb = subscription_callbacks.at(func_id);
+  } catch(const std::out_of_range& e) {
+    throw std::out_of_range("Function ID is not registered");
+  }
   return cb;
 
 }
@@ -65,8 +77,9 @@ void E2Sim::encode_and_send_sctp_data(E2AP_PDU_t* pdu)
 
   data.len = e2ap_asn1c_encode_pdu(pdu, &buf);
   memcpy(data.buffer, buf, min(data.len, MAX_SCTP_BUFFER));
-
-  sctp_send_data(client_fd, data);
+  if (buf) free(buf);
+  
+    sctp_send_data(client_fd, data);
 }
 
 
@@ -126,6 +139,11 @@ int E2Sim::run_loop(int argc, char* argv[]){
   printf("client_fd value is %d\n", client_fd);
   
   std::vector<encoding::ran_func_info> all_funcs;
+  RANfunctionOID_t *ranFunctionOIDe = (RANfunctionOID_t*)calloc(1,sizeof(RANfunctionOID_t));
+  uint8_t *buf = (uint8_t*)"OID123";
+  ranFunctionOIDe->buf = (uint8_t*)calloc(1,strlen((char*)buf)+1);
+  memcpy(ranFunctionOIDe->buf, buf, strlen((char*)buf)+1);
+  ranFunctionOIDe->size = strlen((char*)buf);
 
   //Loop through RAN function definitions that are registered
 
@@ -136,11 +154,12 @@ int E2Sim::run_loop(int argc, char* argv[]){
     next_func.ranFunctionId = elem.first;
     next_func.ranFunctionDesc = elem.second;
     next_func.ranFunctionRev = (long)2;
+    next_func.ranFunctionOId = ranFunctionOIDe;
+
     all_funcs.push_back(next_func);
   }
     
   printf("about to call setup request encode\n");
-  
   generate_e2apv1_setup_request_parameterized(pdu_setup, all_funcs);
 
   printf("After generating e2setup req\n");
@@ -154,8 +173,8 @@ int E2Sim::run_loop(int argc, char* argv[]){
   
   sctp_buffer_t data;
 
-  char *error_buf = (char*)calloc(300, sizeof(char));
-  size_t errlen;
+  char error_buf[300] = {0, };
+  size_t errlen = 0;
 
   asn_check_constraints(&asn_DEF_E2AP_PDU, pdu_setup, error_buf, &errlen);
   printf("error length %d\n", errlen);
@@ -175,6 +194,35 @@ int E2Sim::run_loop(int argc, char* argv[]){
     LOG_E("[SCTP] Unable to send E2-SETUP-REQUEST to peer");
   }
 
+  buffer_size = MAX_SCTP_BUFFER;
+  memset(buffer, '\0', sizeof(buffer));
+  E2AP_PDU_t* pdu = (E2AP_PDU_t*)calloc(1,sizeof(E2AP_PDU));
+
+  LOG_D("about to call E2ResetRequest encode\n");
+
+  encoding::generate_e2apv2_reset_request(pdu);
+
+  LOG_D("[E2AP] Created E2ResetRequest");
+
+  e2ap_asn1c_print_pdu(pdu);
+
+  sctp_buffer_t resetdata;
+
+  error_buf[300] = {0, };
+   errlen = 0;
+
+  asn_check_constraints(&asn_DEF_E2AP_PDU, pdu, error_buf, &errlen);
+  printf("error length %d\n", errlen);
+  printf("error buf %s\n", error_buf);
+  er = asn_encode_to_buffer(nullptr, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2AP_PDU, pdu, buffer, buffer_size);
+
+  resetdata.len = er.encoded;
+  fprintf(stderr, "er encoded is %d\n", er.encoded);
+
+  memcpy(resetdata.buffer, buffer, er.encoded);
+
+  LOG_I("Test to delete ReSet code");
+
   sctp_buffer_t recv_buf;
 
   LOG_I("[SCTP] Waiting for SCTP data");