S1AP encode success

openair2/RRC/LITE/defs.h

@@ -372,6 +372,7 @@ typedef struct eNB_RRC_UE_s {
   SRB_INFO                           Srb0;
   SRB_INFO_TABLE_ENTRY               Srb1;
   SRB_INFO_TABLE_ENTRY               Srb2;
+  SRB_INFO_TABLE_ENTRY               Srb1bis;
   MeasConfig_t*                      measConfig;
   HANDOVER_INFO*                     handover_info;
 

openair2/RRC/LITE/proto_NB_IoT.h

@@ -30,6 +30,7 @@
  *  @{
  */
 
+#include "RRC/LITE/defs.h"
 #include "RRC/LITE/defs_NB_IoT.h"
 #include "pdcp.h"
 #include "rlc.h"
@@ -484,7 +485,7 @@ rrc_eNB_generate_dedicatedRRCConnectionReconfiguration_NB_IoT(
 
 void rrc_eNB_process_RRCConnectionSetupComplete_NB_IoT(
   const protocol_ctxt_t* const ctxt_pP,
-  rrc_eNB_ue_context_NB_IoT_t*         ue_context_pP,
+  rrc_eNB_ue_context_t*         ue_context_pP,
   RRCConnectionSetupComplete_NB_r13_IEs_t * rrcConnectionSetupComplete_NB
 );
 

openair2/RRC/LITE/rrc_eNB.c

@@ -1124,10 +1124,10 @@ rrc_eNB_process_RRCConnectionSetupComplete(
 
   if (EPC_MODE_ENABLED == 1) {
     // Forward message to S1AP layer
-    rrc_eNB_send_S1AP_NAS_FIRST_REQ(
+    /*rrc_eNB_send_S1AP_NAS_FIRST_REQ(
       ctxt_pP,
       ue_context_pP,
-      rrcConnectionSetupComplete);
+      rrcConnectionSetupComplete);*/
   } else
 #endif
   {
@@ -1144,7 +1144,7 @@ rrc_eNB_process_RRCConnectionSetupComplete(
 //-----------------------------------------------------------------------------
 void rrc_eNB_process_RRCConnectionSetupComplete_NB_IoT(
   const protocol_ctxt_t* const ctxt_pP,
-  rrc_eNB_ue_context_NB_IoT_t*         ue_context_pP,
+  rrc_eNB_ue_context_t*         ue_context_pP,
   RRCConnectionSetupComplete_NB_r13_IEs_t * rrcConnectionSetupComplete_NB
 )
 //-----------------------------------------------------------------------------
@@ -1163,11 +1163,11 @@ void rrc_eNB_process_RRCConnectionSetupComplete_NB_IoT(
 
   if (EPC_MODE_ENABLED == 1) {
     // Forward message to S1AP layer we don't have S1AP functions for the moment
-    //printf("*********************Get into S1AP*********************\n");
-    //rrc_eNB_send_S1AP_NAS_FIRST_REQ(
-    //  ctxt_pP,
-    //  ue_context_pP,
-    //  rrcConnectionSetupComplete_NB);
+    printf("*********************Get into S1AP*********************\n");
+    rrc_eNB_send_S1AP_NAS_FIRST_REQ(
+      ctxt_pP,
+      ue_context_pP,
+      rrcConnectionSetupComplete_NB);
 
   } else
 #endif

openair2/RRC/LITE/rrc_eNB_S1AP.c

@@ -624,7 +624,7 @@ void
 rrc_eNB_send_S1AP_NAS_FIRST_REQ(
   const protocol_ctxt_t* const ctxt_pP,
   rrc_eNB_ue_context_t*          const ue_context_pP,
-  RRCConnectionSetupComplete_r8_IEs_t* rrcConnectionSetupComplete
+  RRCConnectionSetupComplete_NB_r13_IEs_t* rrcConnectionSetupComplete
 )
 //------------------------------------------------------------------------------
 {
@@ -661,8 +661,8 @@ rrc_eNB_send_S1AP_NAS_FIRST_REQ(
     S1AP_NAS_FIRST_REQ (message_p).establishment_cause = ue_context_pP->ue_context.establishment_cause;
 
     /* Forward NAS message */S1AP_NAS_FIRST_REQ (message_p).nas_pdu.buffer =
-    rrcConnectionSetupComplete->dedicatedInfoNAS.buf;
-    S1AP_NAS_FIRST_REQ (message_p).nas_pdu.length = rrcConnectionSetupComplete->dedicatedInfoNAS.size;
+    rrcConnectionSetupComplete->dedicatedInfoNAS_r13.buf;
+    S1AP_NAS_FIRST_REQ (message_p).nas_pdu.length = rrcConnectionSetupComplete->dedicatedInfoNAS_r13.size;
 
     /* Fill UE identities with available information */
     {
@@ -682,9 +682,9 @@ rrc_eNB_send_S1AP_NAS_FIRST_REQ(
             ue_context_pP->ue_context.rnti);
       }
 
-      if (rrcConnectionSetupComplete->registeredMME != NULL) {
+      if (rrcConnectionSetupComplete->registeredMME_r13 != NULL) {
         /* Fill GUMMEI */
-        struct RegisteredMME *r_mme = rrcConnectionSetupComplete->registeredMME;
+        struct RegisteredMME *r_mme = rrcConnectionSetupComplete->registeredMME_r13;
         //int selected_plmn_identity = rrcConnectionSetupComplete->selectedPLMN_Identity;
 
         S1AP_NAS_FIRST_REQ (message_p).ue_identity.presenceMask |= UE_IDENTITIES_gummei;

openair2/RRC/LITE/rrc_eNB_S1AP.h

@@ -128,7 +128,7 @@ void
 rrc_eNB_send_S1AP_NAS_FIRST_REQ(
   const protocol_ctxt_t* const ctxt_pP,
   rrc_eNB_ue_context_t*          const ue_context_pP,
-  RRCConnectionSetupComplete_r8_IEs_t* rrcConnectionSetupComplete
+  RRCConnectionSetupComplete_NB_r13_IEs_t* rrcConnectionSetupComplete
 );