X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=e2sim%2Fsrc%2Fmessagerouting%2Fe2ap_asn1c_codec.c;fp=e2sim%2Fsrc%2FE2AP%2Fe2ap_asn1c_codec.c;h=111ca9fc68153f50ea4a3f54c044175acf3b9c7b;hb=a9733dbcc47e93a3b2843056f1d587196296c324;hp=5205b16d09e2ec3b08bd929d5908f03d85c526fb;hpb=3ebf932d23dcbec9ed19f4a51f9d00a0a54f5124;p=sim%2Fe2-interface.git

diff --git a/e2sim/src/E2AP/e2ap_asn1c_codec.c b/e2sim/src/messagerouting/e2ap_asn1c_codec.c
similarity index 67%
rename from e2sim/src/E2AP/e2ap_asn1c_codec.c
rename to e2sim/src/messagerouting/e2ap_asn1c_codec.c
index 5205b16..111ca9f 100644
--- a/e2sim/src/E2AP/e2ap_asn1c_codec.c
+++ b/e2sim/src/messagerouting/e2ap_asn1c_codec.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 #                                                                            *
-# Copyright 2019 AT&T Intellectual Property                                  *
+# Copyright 2020 AT&T Intellectual Property                                  *
 # Copyright 2019 Nokia                                                       *
 #                                                                            *
 # Licensed under the Apache License, Version 2.0 (the "License");            *
@@ -18,9 +18,13 @@
 ******************************************************************************/
 #include "e2ap_asn1c_codec.h"
 
+
 void e2ap_asn1c_print_pdu(const E2AP_PDU_t* pdu)
 {
-  xer_fprint(stdout, &asn_DEF_E2AP_PDU, (void *)pdu);
+  printf("before\n");
+  //  xer_fprint(stdout, &asn_DEF_E2AP_PDU, (void *)pdu);
+  xer_fprint(stdout, &asn_DEF_E2AP_PDU, pdu);
+  printf("after\n");
   printf("\n");
 }
 
@@ -38,6 +42,8 @@ E2AP_PDU_t* e2ap_xml_to_pdu(char const* xml_message)
 
   assert(pdu != 0);
 
+  printf("xmlpdu1\n");
+
   uint8_t         buf[MAX_XML_BUFFER];
   asn_dec_rval_t  rval;
   size_t          size;
@@ -46,20 +52,30 @@ E2AP_PDU_t* e2ap_xml_to_pdu(char const* xml_message)
   char XML_path[300];
   char *work_dir = getenv(WORKDIR_ENV);
 
+  printf("xmlpdu2\n");  
+
   strcpy(XML_path, work_dir);
   strcat(XML_path, E2AP_XML_DIR);
   strcat(XML_path, xml_message);
 
+  printf("xmlpdu4\n");  
+
   LOG_D("Generate E2AP PDU from XML file: %s\n", XML_path);
   memset(buf, 0, sizeof(buf));
 
+  printf("xmlpdu3\n");  
+
   f = fopen(XML_path, "r");
   if(!f){
      LOG_E("Unable to open %s. Make sure you have set the Environment Variable E2SIM_DIR, see README", XML_path)
   }
 
+  printf("xmlpdu5\n");  
+
   assert(f);
 
+  printf("xmlpdu6\n");  
+
   size = fread(buf, 1, sizeof(buf), f);
   if(size == 0 || size == sizeof(buf))
   {
@@ -69,13 +85,82 @@ E2AP_PDU_t* e2ap_xml_to_pdu(char const* xml_message)
 
   fclose(f);
 
+  printf("xmlpdu7\n");  
+
   rval = xer_decode(0, &asn_DEF_E2AP_PDU, (void **)&pdu, buf, size);
 
+  printf("xmlpdu8\n");  
+
   assert(rval.code == RC_OK);
 
   return pdu;
 }
 
+
+E2setupRequest_t* smaller_e2ap_xml_to_pdu(char const* xml_message)
+{
+  // E2AP_PDU_t *pdu = new E2AP_PDU_t();
+  E2AP_PDU_t *pdu = calloc(1, sizeof(E2AP_PDU_t));
+
+  //  GlobalE2node_ID_t *globale2nodeid = (GlobalE2node_ID_t*)calloc(1, sizeof(GlobalE2node_ID_t));
+  GlobalE2node_ID_t *globale2nodeid = (GlobalE2node_ID_t*)calloc(1, sizeof(GlobalE2node_ID_t));   
+  E2setupRequest_t *e2setuprequest = (E2setupRequest_t*)calloc(1,sizeof(E2setupRequest_t));
+
+  printf("xmlpdu1\n");
+
+  uint8_t         buf[MAX_XML_BUFFER];
+  asn_dec_rval_t  rval;
+  size_t          size;
+  FILE            *f;
+
+  char XML_path[300];
+  char *work_dir = getenv(WORKDIR_ENV);
+
+  printf("xmlpdu2\n");  
+
+  strcpy(XML_path, work_dir);
+  strcat(XML_path, E2AP_XML_DIR);
+  strcat(XML_path, xml_message);
+
+  printf("xmlpdu4\n");  
+
+  LOG_D("Generate E2AP PDU from XML file: %s\n", XML_path);
+  memset(buf, 0, sizeof(buf));
+
+  printf("xmlpdu3\n");  
+
+  f = fopen(XML_path, "r");
+  if(!f){
+     LOG_E("Unable to open %s. Make sure you have set the Environment Variable E2SIM_DIR, see README", XML_path)
+  }
+
+  printf("xmlpdu5\n");  
+
+  assert(f);
+
+  printf("xmlpdu6\n");  
+
+  size = fread(buf, 1, sizeof(buf), f);
+  if(size == 0 || size == sizeof(buf))
+  {
+    LOG_E("Input too long: %s", XML_path);
+    exit(1);
+  }
+
+  fclose(f);
+
+  printf("xmlpdu7\n");
+
+  rval = xer_decode(0, &asn_DEF_E2setupRequest, (void **)&e2setuprequest, buf, size);
+
+  printf("xmlpdu8\n");  
+
+  assert(rval.code == RC_OK);
+
+  return e2setuprequest;
+}
+
+
 int e2ap_asn1c_encode_pdu(E2AP_PDU_t* pdu, unsigned char **buffer)
 {
   int len;
@@ -123,6 +208,7 @@ int e2ap_asn1c_get_procedureCode(E2AP_PDU_t* pdu)
   switch(pdu->present)
   {
     case E2AP_PDU_PR_initiatingMessage:
+      fprintf(stderr,"initiating message\n");
       procedureCode = pdu->choice.initiatingMessage->procedureCode;
       break;