maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API/USER: move _user_api_id to nas_user_t

Browse Source
This commit is contained in:
Frédéric Leroy
2017-01-25 13:24:30 +01:00
parent 53fa94785a
commit a99e1a95af
23 changed files with 195 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair3/NAS/UE/EMM/SAP/EmmDeregisteredNoCellAvailable.c
+3 -1
View File
@@ -89,6 +89,8 @@ int EmmDeregisteredNoCellAvailable(nas_user_t *user, const emm_reg_t *evt)
LOG_FUNC_IN;
int rc = RETURNerror;
emm_data_t *emm_data = user->emm_data;
user_api_id_t *user_api_id = user->user_api_id;
assert(emm_fsm_get_status(user) == EMM_DEREGISTERED_NO_CELL_AVAILABLE);
@@ -108,7 +110,7 @@ int EmmDeregisteredNoCellAvailable(nas_user_t *user, const emm_reg_t *evt)
* Notify EMM that the MT is currently searching an operator
* to register to
*/
rc = emm_proc_registration_notify(user->emm_data, NET_REG_STATE_ON);
rc = emm_proc_registration_notify(user_api_id, emm_data, NET_REG_STATE_ON);
if (rc != RETURNok) {
LOG_TRACE(WARNING, "EMM-FSM - "
openair3/NAS/UE/EMM/SAP/EmmDeregisteredPlmnSearch.c
+4 -2
View File
@@ -85,6 +85,8 @@ Description Implements the EPS Mobility Management procedures executed
int EmmDeregisteredPlmnSearch(nas_user_t *user, const emm_reg_t *evt)
{
LOG_FUNC_IN;
emm_data_t *emm_data = user->emm_data;
user_api_id_t *user_api_id = user->user_api_id;
int rc = RETURNerror;
@@ -95,7 +97,7 @@ int EmmDeregisteredPlmnSearch(nas_user_t *user, const emm_reg_t *evt)
/*
* No suitable cell of the selected PLMN has been found to camp on
*/
rc = emm_proc_registration_notify(user->emm_data, NET_REG_STATE_DENIED);
rc = emm_proc_registration_notify(user_api_id, emm_data, NET_REG_STATE_DENIED);
if (rc != RETURNok) {
LOG_TRACE(WARNING, "EMM-FSM - "
@@ -112,7 +114,7 @@ int EmmDeregisteredPlmnSearch(nas_user_t *user, const emm_reg_t *evt)
* may be selected either automatically or manually.
* Or the user manually re-selected a PLMN to register to.
*/
rc = emm_proc_registration_notify(user->emm_data, NET_REG_STATE_ON);
rc = emm_proc_registration_notify(user_api_id, emm_data, NET_REG_STATE_ON);
if (rc != RETURNok) {
LOG_TRACE(WARNING, "EMM-FSM - "
openair3/NAS/UE/EMM/SAP/EmmRegisteredInitiated.c
+4 -2
View File
@@ -83,6 +83,8 @@ int EmmRegisteredInitiated(nas_user_t *user, const emm_reg_t *evt)
LOG_FUNC_IN;
int rc = RETURNerror;
emm_data_t *emm_data = user->emm_data;
user_api_id_t *user_api_id = user->user_api_id;
assert(emm_fsm_get_status(user) == EMM_REGISTERED_INITIATED);
@@ -140,7 +142,7 @@ int EmmRegisteredInitiated(nas_user_t *user, const emm_reg_t *evt)
/*
* Notify EMM that the MT is registered
*/
rc = emm_proc_registration_notify(user->emm_data, NET_REG_STATE_HN);
rc = emm_proc_registration_notify(user_api_id, emm_data, NET_REG_STATE_HN);
if (rc != RETURNok) {
LOG_TRACE(WARNING, "EMM-FSM - "
@@ -167,7 +169,7 @@ int EmmRegisteredInitiated(nas_user_t *user, const emm_reg_t *evt)
/*
* Notify EMM that the MT's registration is denied
*/
rc = emm_proc_registration_notify(user->emm_data, NET_REG_STATE_DENIED);
rc = emm_proc_registration_notify(user_api_id, emm_data, NET_REG_STATE_DENIED);
if (rc != RETURNok) {
LOG_TRACE(WARNING, "EMM-FSM - "