UE/EMM: move _usim_data to nas_user_t

openair3/NAS/UE/EMM/emm_main.h

@@ -77,7 +77,7 @@ void emm_main_cleanup(emm_data_t *emm_data);
 const imsi_t *emm_main_get_imsi(emm_data_t *emm_data);
 
 /* User's getter of the subscriber dialing number */
-const msisdn_t *emm_main_get_msisdn(void);
+const msisdn_t *emm_main_get_msisdn(nas_user_t *user);
 
 /* User's getter/setter for network selection */
 int emm_main_set_plmn_selection_mode(nas_user_t *user, int mode, int format,

openair3/NAS/UE/nas_proc.c

@@ -299,11 +299,11 @@ int nas_proc_get_imsi(emm_data_t *emm_data, char *imsi_str)
  **      Others:    None                                       **
  **                                                                        **
  ***************************************************************************/
-int nas_proc_get_msisdn(char *msisdn_str, int *ton_npi)
+int nas_proc_get_msisdn(nas_user_t *user, char *msisdn_str, int *ton_npi)
 {
   LOG_FUNC_IN;
 
-  const msisdn_t *msisdn = emm_main_get_msisdn();
+  const msisdn_t *msisdn = emm_main_get_msisdn(user);
 
   if (msisdn != NULL) {
     union {

openair3/NAS/UE/nas_proc.h

@@ -77,7 +77,7 @@ int nas_proc_disable_s1_mode(nas_user_t *user);
 int nas_proc_get_eps(nas_user_t *user, int *stat);
 
 int nas_proc_get_imsi(emm_data_t *emm_data, char *imsi_str);
-int nas_proc_get_msisdn(char *msisdn_str, int *ton_npi);
+int nas_proc_get_msisdn(nas_user_t *user, char *msisdn_str, int *ton_npi);
 
 int nas_proc_get_signal_quality(nas_user_t *user, int *rsrq, int *rsrp);
 

openair3/NAS/UE/nas_user.c

@@ -2587,7 +2587,7 @@ static int _nas_user_proc_cnum(nas_user_t *user, const at_command_t *data)
     }
 
     /* Get the International Mobile Subscriber Identity (IMSI) */
-    ret_code = nas_proc_get_msisdn(cnum->number, &cnum->type);
+    ret_code = nas_proc_get_msisdn(user, cnum->number, &cnum->type);
 
     if (ret_code != RETURNok) {
       LOG_TRACE(ERROR, "USR-MAIN  - Failed to get MS dialing number");

openair3/NAS/UE/user_defs.h

@@ -51,6 +51,7 @@ Description NAS type definition to manage a user equipment
 #include "EMM/emm_fsm_defs.h"
 #include "EMM/emmData.h"
 #include "EMM/IdleMode_defs.h"
+#include "API/USIM/usim_api.h"
 
 typedef struct {
   int fd;
@@ -61,6 +62,7 @@ typedef struct {
   emm_fsm_state_t emm_fsm_status; // Current EPS Mobility Management status
   emm_data_t *emm_data; // EPS mobility management data
   emm_plmn_list_t *emm_plmn_list; // list of PLMN identities
+  usim_data_t usim_data; // USIM application data
 } nas_user_t;
 
 #endif