NAS First REQ: Forward selected PLMN Identity

openair2/COMMON/s1ap_messages_types.h

@@ -376,6 +376,10 @@ typedef struct s1ap_nas_first_req_s {
   /* UE id for initial connection to S1AP */
   uint16_t ue_initial_id;
 
+  /* the chosen PLMN identity as index, see TS 36.331 6.2.2 RRC Connection
+   * Setup Complete. This index here is zero-based, unlike the standard! */
+  int selected_plmn_identity;
+
   /* Establishment cause as sent by UE */
   rrc_establishment_cause_t establishment_cause;
 

openair2/RRC/LTE/rrc_eNB_S1AP.c

@@ -757,6 +757,7 @@ rrc_eNB_send_S1AP_NAS_FIRST_REQ(
 
       /* selected_plmn_identity: IE is 1-based, convert to 0-based (C array) */
       int selected_plmn_identity = rrcConnectionSetupComplete->selectedPLMN_Identity - 1;
+      S1AP_NAS_FIRST_REQ(message_p).selected_plmn_identity = selected_plmn_identity;
 
       if (rrcConnectionSetupComplete->registeredMME != NULL) {
         /* Fill GUMMEI */