Merge commit 'b67badef' into develop_SA_L3

# Conflicts:
#	common/utils/ocp_itti/intertask_interface.h
#	openair2/RRC/NR/rrc_gNB.c
#	openair3/NGAP/ngap_gNB_nas_procedures.c

common/utils/ocp_itti/intertask_interface.h

@@ -260,6 +260,7 @@ typedef struct IttiMsgText_s {
 #include <openair3/GTPV1-U/gtpv1u_gNB_task.h>
 void *rrc_enb_process_itti_msg(void *);
 #include <openair3/SCTP/sctp_eNB_task.h>
+#include <openair3/S1AP/s1ap_eNB.h>
 #include <openair3/NGAP/ngap_gNB.h>
 
 #ifdef ITTI_SIM

openair2/RRC/NR/rrc_gNB.c

@@ -588,15 +588,6 @@ rrc_gNB_process_RRCReconfigurationComplete(
     uint8_t                             nr_DRB2LCHAN[8];
 
     ue_context_pP->ue_context.ue_reestablishment_timer = 0;
-    //rnti_t rnti = ue_context_pP->ue_id_rnti;
-    //module_id_t module_id = ctxt_pP->module_id;
-
-    // int UE_id_mac = find_UE_id(module_id, rnti);
-
-    // if (UE_id_mac == -1) {
-    //   LOG_E(RRC, "Can't find UE_id(MAC) of UE rnti %x\n", rnti);
-    //   return;
-    // }
 
 #ifndef PHYSIM
     /* Derive the keys from kgnb */
@@ -639,7 +630,6 @@ rrc_gNB_process_RRCReconfigurationComplete(
                             NULL);
 #endif
 
-    /* Loop through DRBs and establish if necessary */
     /* Set the SRB active in UE context */
     if (SRB_configList != NULL) {
       for (int i = 0; (i < SRB_configList->list.count) && (i < 3); i++) {
@@ -665,6 +655,7 @@ rrc_gNB_process_RRCReconfigurationComplete(
       ue_context_pP->ue_context.SRB_configList2[xid] = NULL;
     }
 
+    /* Loop through DRBs and establish if necessary */
     if (DRB_configList != NULL) {
         for (int i = 0; i < DRB_configList->list.count; i++) {
         if (DRB_configList->list.array[i]) {

openair3/NGAP/ngap_gNB_nas_procedures.c

@@ -225,7 +225,11 @@ int ngap_gNB_handle_nas_first_req(
 
     ie->value.choice.UserLocationInformation.present = NGAP_UserLocationInformation_PR_userLocationInformationNR;
 
+<<<<<<< HEAD
     ie->value.choice.UserLocationInformation.choice.userLocationInformationNR = 
+=======
+    ie->value.choice.UserLocationInformation.choice.userLocationInformationNR =
+>>>>>>> b67badef1b2fd390d801e20644b08df0d5880583
         CALLOC(1, sizeof(*ie->value.choice.UserLocationInformation.choice.userLocationInformationNR));
     userinfo_nr_p = ie->value.choice.UserLocationInformation.choice.userLocationInformationNR;