Correctly initialize RLC when using phy-test mode

When using phy-test mode, the RNTI for PDCP/RLC initialization would be
0, incorrectly initializing these layers, fixed in this commit.

Additionally, in this commit, we only trigger the initialization in
cases where the UE context is initialized (before, the RNTI might be 0
in other cases as well).

openair2/RRC/NR/rrc_gNB_nsa.c

@@ -339,8 +339,6 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
                               sizeof(X2AP_ENDC_SGNB_ADDITION_REQ_ACK(msg).rrc_buffer));
     X2AP_ENDC_SGNB_ADDITION_REQ_ACK(msg).rrc_buffer_size = (enc_rval.encoded+7)>>3;
     itti_send_msg_to_task(TASK_X2AP, ENB_MODULE_ID_TO_INSTANCE(0), msg); //Check right id instead of hardcoding
-  } else if (get_softmodem_params()->do_ra || get_softmodem_params()->sa) {
-    PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, rrc->module_id, GNB_FLAG_YES, ue_context_p->ue_id_rnti, 0, 0,rrc->module_id);
   }
 
   rrc->Nb_ue++;
@@ -374,35 +372,36 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
   }
 
   if(m == NULL){
+    PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, rrc->module_id, GNB_FLAG_YES, ue_context_p->ue_id_rnti, 0, 0, rrc->module_id);
     LOG_W(RRC, "Calling RRC PDCP/RLC ASN1 request functions for protocol context %p with module_id %d, rnti %x, frame %d, subframe %d eNB_index %d \n", &ctxt,
                                                                                                                                                         ctxt.module_id,
                                                                                                                                                         ctxt.rnti,
                                                                                                                                                         ctxt.frame,
                                                                                                                                                         ctxt.subframe,
                                                                                                                                                         ctxt.eNB_index);
-  }
-
-  nr_rrc_pdcp_config_asn1_req(&ctxt,
-                              get_softmodem_params()->sa ? ue_context_p->ue_context.rb_config->srb_ToAddModList : (NR_SRB_ToAddModList_t *) NULL,
-                              ue_context_p->ue_context.rb_config->drb_ToAddModList ,
-                              ue_context_p->ue_context.rb_config->drb_ToReleaseList,
-                              (ue_context_p->ue_context.integrity_algorithm << 4) | ue_context_p->ue_context.ciphering_algorithm,
-                              NULL,          /* kRRCenc - unused */
-                              NULL,          /* kRRCint - unused */
-                              kUPenc,        /* kUPenc  */
-                              kUPint,        /* kUPint */
-                              NULL,
-                              NULL,
-                              ue_context_p->ue_context.secondaryCellGroup->rlc_BearerToAddModList);
-
-  nr_rrc_rlc_config_asn1_req (&ctxt,
-                              get_softmodem_params()->sa ? ue_context_p->ue_context.rb_config->srb_ToAddModList : (NR_SRB_ToAddModList_t *) NULL,
-                              ue_context_p->ue_context.rb_config->drb_ToAddModList,
-                              ue_context_p->ue_context.rb_config->drb_ToReleaseList,
-                              (LTE_PMCH_InfoList_r9_t *) NULL,
-                              ue_context_p->ue_context.secondaryCellGroup->rlc_BearerToAddModList);
 
-  LOG_D(RRC, "%s:%d: done RRC PDCP/RLC ASN1 request for UE rnti %x\n", __FUNCTION__, __LINE__, ctxt.rnti);
+    nr_rrc_pdcp_config_asn1_req(&ctxt,
+                                get_softmodem_params()->sa ? ue_context_p->ue_context.rb_config->srb_ToAddModList : (NR_SRB_ToAddModList_t *) NULL,
+                                ue_context_p->ue_context.rb_config->drb_ToAddModList ,
+                                ue_context_p->ue_context.rb_config->drb_ToReleaseList,
+                                (ue_context_p->ue_context.integrity_algorithm << 4) | ue_context_p->ue_context.ciphering_algorithm,
+                                NULL,          /* kRRCenc - unused */
+                                NULL,          /* kRRCint - unused */
+                                kUPenc,        /* kUPenc  */
+                                kUPint,        /* kUPint */
+                                NULL,
+                                NULL,
+                                ue_context_p->ue_context.secondaryCellGroup->rlc_BearerToAddModList);
+
+    nr_rrc_rlc_config_asn1_req (&ctxt,
+                                get_softmodem_params()->sa ? ue_context_p->ue_context.rb_config->srb_ToAddModList : (NR_SRB_ToAddModList_t *) NULL,
+                                ue_context_p->ue_context.rb_config->drb_ToAddModList,
+                                ue_context_p->ue_context.rb_config->drb_ToReleaseList,
+                                (LTE_PMCH_InfoList_r9_t *) NULL,
+                                ue_context_p->ue_context.secondaryCellGroup->rlc_BearerToAddModList);
+
+    LOG_D(RRC, "%s:%d: done RRC PDCP/RLC ASN1 request for UE rnti %x\n", __FUNCTION__, __LINE__, ctxt.rnti);
+  }
 
 }