acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

state name changes detached/attached -> de_registered/registered

This commit is contained in:
Sukchan Lee 2018-01-23 17:18:18 +09:00
parent ed92c30b26
commit b1c61cfcbf
6 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/mme/emm_sm.c
View File

@ -24,7 +24,7 @@ void emm_state_initial(fsm_t *s, event_t *e)
mme_sm_trace(3, e);
FSM_TRAN(s, &emm_state_detached);
FSM_TRAN(s, &emm_state_de_registered);
}
void emm_state_final(fsm_t *s, event_t *e)
@ -34,29 +34,29 @@ void emm_state_final(fsm_t *s, event_t *e)
mme_sm_trace(3, e);
}
static void emm_state_detached_attached(fsm_t *s, event_t *e);
static void common_register_state(fsm_t *s, event_t *e);
void emm_state_detached(fsm_t *s, event_t *e)
void emm_state_de_registered(fsm_t *s, event_t *e)
{
d_assert(s, return, "Null param");
d_assert(e, return, "Null param");
mme_sm_trace(3, e);
emm_state_detached_attached(s, e);
common_register_state(s, e);
}
void emm_state_attached(fsm_t *s, event_t *e)
void emm_state_registered(fsm_t *s, event_t *e)
{
d_assert(s, return, "Null param");
d_assert(e, return, "Null param");
mme_sm_trace(3, e);
emm_state_detached_attached(s, e);
common_register_state(s, e);
}
static void emm_state_detached_attached(fsm_t *s, event_t *e)
static void common_register_state(fsm_t *s, event_t *e)
{
status_t rv;
@ -139,8 +139,7 @@ static void emm_state_detached_attached(fsm_t *s, event_t *e)
&message->emm.identity_response);
if (rv != CORE_OK)
{
d_error("emm_handle_identity_response failed() "
"in emm_state_attched");
d_error("emm_handle_identity_response() failed");
FSM_TRAN(s, emm_state_exception);
return;
}
@ -162,8 +161,7 @@ static void emm_state_detached_attached(fsm_t *s, event_t *e)
mme_ue, &message->emm.attach_request);
if (rv != CORE_OK)
{
d_error("emm_handle_attach_request() failed "
"in emm_state_attached");
d_error("emm_handle_attach_request() failed");
FSM_TRAN(s, emm_state_exception);
return;
}
@ -176,8 +174,7 @@ static void emm_state_detached_attached(fsm_t *s, event_t *e)
mme_ue, &message->emm.tracking_area_update_request);
if (rv != CORE_OK)
{
d_error("emm_handle_tau_request() failed "
"in emm_state_attached");
d_error("emm_handle_tau_request() failed");
FSM_TRAN(s, emm_state_exception);
return;
}
@ -212,7 +209,7 @@ static void emm_state_detached_attached(fsm_t *s, event_t *e)
d_trace(5, " IMSI[%s]\n", mme_ue->imsi_bcd);
emm_handle_detach_request(
mme_ue, &message->emm.detach_request_from_ue);
FSM_TRAN(s, &emm_state_detached);
FSM_TRAN(s, &emm_state_de_registered);
return;
}
default:
@ -292,7 +289,7 @@ static void emm_state_detached_attached(fsm_t *s, event_t *e)
{
rv = nas_send_tau_accept(mme_ue);
d_assert(rv == CORE_OK,, "nas_send_tau_accept() failed");
FSM_TRAN(&mme_ue->sm, &emm_state_attached);
FSM_TRAN(&mme_ue->sm, &emm_state_registered);
}
else
{
@ -476,7 +473,7 @@ void emm_state_security_mode(fsm_t *s, event_t *e)
MME_EPS_TYPE_SERVICE_REQUEST ||
mme_ue->nas_eps.type == MME_EPS_TYPE_TAU_REQUEST)
{
FSM_TRAN(s, &emm_state_attached);
FSM_TRAN(s, &emm_state_registered);
}
else
d_assert(0,, "Invalid NAS_EPS[%d]",
@ -558,7 +555,7 @@ void emm_state_initial_context_setup(fsm_t *s, event_t *e)
FSM_TRAN(s, emm_state_exception);
break;
}
FSM_TRAN(s, &emm_state_attached);
FSM_TRAN(s, &emm_state_registered);
break;
}
case NAS_EMM_STATUS:

8
src/mme/esm_build.c
View File

@ -26,7 +26,7 @@ status_t esm_build_pdn_connectivity_reject(
mme_ue->imsi_bcd, sess->pti, esm_cause);
memset(&message, 0, sizeof(message));
if (FSM_CHECK(&mme_ue->sm, emm_state_attached))
if (FSM_CHECK(&mme_ue->sm, emm_state_registered))
{
message.h.security_header_type =
NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED;
@ -39,7 +39,7 @@ status_t esm_build_pdn_connectivity_reject(
pdn_connectivity_reject->esm_cause = esm_cause;
if (FSM_CHECK(&mme_ue->sm, emm_state_attached))
if (FSM_CHECK(&mme_ue->sm, emm_state_registered))
{
d_assert(nas_security_encode(pkbuf, mme_ue, &message) == CORE_OK &&
*pkbuf, return CORE_ERROR,);
@ -122,7 +122,7 @@ status_t esm_build_activate_default_bearer_context_request(
mme_ue->imsi_bcd, sess->pti, bearer->ebi);
memset(&message, 0, sizeof(message));
if (FSM_CHECK(&mme_ue->sm, emm_state_attached))
if (FSM_CHECK(&mme_ue->sm, emm_state_registered))
{
message.h.security_header_type =
NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED;
@ -186,7 +186,7 @@ status_t esm_build_activate_default_bearer_context_request(
sess->pgw_pco.data, protocol_configuration_options->length);
}
if (FSM_CHECK(&mme_ue->sm, emm_state_attached))
if (FSM_CHECK(&mme_ue->sm, emm_state_registered))
{
d_assert(nas_security_encode(pkbuf, mme_ue, &message) == CORE_OK &&
*pkbuf, return CORE_ERROR,);

6
src/mme/mme_s11_handler.c
View File

@ -101,7 +101,7 @@ void mme_s11_handle_create_session_response(
rv = nas_send_attach_accept(mme_ue);
d_assert(rv == CORE_OK, return, "nas_send_attach_accept failed");
}
else if (FSM_CHECK(&mme_ue->sm, emm_state_attached))
else if (FSM_CHECK(&mme_ue->sm, emm_state_registered))
{
rv = nas_send_activate_default_bearer_context_request(bearer);
d_assert(rv == CORE_OK, return, "nas send failed");
@ -176,7 +176,7 @@ void mme_s11_handle_delete_session_response(
mme_sess_remove(sess);
}
else if (FSM_CHECK(&mme_ue->sm, emm_state_detached))
else if (FSM_CHECK(&mme_ue->sm, emm_state_de_registered))
{
GTP_COUNTER_CHECK(mme_ue, GTP_COUNTER_DELETE_SESSION,
CLEAR_SGW_S11_PATH(mme_ue);
@ -186,7 +186,7 @@ void mme_s11_handle_delete_session_response(
mme_sess_remove(sess);
}
else if (FSM_CHECK(&mme_ue->sm, emm_state_attached))
else if (FSM_CHECK(&mme_ue->sm, emm_state_registered))
{
mme_bearer_t *bearer = mme_default_bearer_in_sess(sess);
d_assert(bearer, return, "Null param");

2
src/mme/mme_s6a_handler.c
View File

@ -51,7 +51,7 @@ void mme_s6a_handle_ula(mme_ue_t *mme_ue, s6a_ula_message_t *ula_message)
else
d_assert(0,, "Invalid Type(%d)", mme_ue->nas_eps.type);
}
else if (FSM_CHECK(&mme_ue->sm, emm_state_attached))
else if (FSM_CHECK(&mme_ue->sm, emm_state_registered))
{
if (mme_ue->nas_eps.type == MME_EPS_TYPE_TAU_REQUEST)
{

4
src/mme/mme_sm.h
View File

@ -21,12 +21,12 @@ void s1ap_state_exception(fsm_t *s, event_t *e);
void emm_state_initial(fsm_t *s, event_t *e);
void emm_state_final(fsm_t *s, event_t *e);
void emm_state_detached(fsm_t *s, event_t *e);
void emm_state_de_registered(fsm_t *s, event_t *e);
void emm_state_identity(fsm_t *s, event_t *e);
void emm_state_authentication(fsm_t *s, event_t *e);
void emm_state_security_mode(fsm_t *s, event_t *e);
void emm_state_initial_context_setup(fsm_t *s, event_t *e);
void emm_state_attached(fsm_t *s, event_t *e);
void emm_state_registered(fsm_t *s, event_t *e);
void emm_state_exception(fsm_t *s, event_t *e);
void esm_state_initial(fsm_t *s, event_t *e);

2
src/mme/nas_path.c
View File

@ -380,7 +380,7 @@ status_t nas_send_tau_accept(mme_ue_t *mme_ue)
d_assert(mme_ue, return CORE_ERROR, "Null param");
if (FSM_CHECK(&mme_ue->sm, emm_state_attached))
if (FSM_CHECK(&mme_ue->sm, emm_state_registered))
{
enb_ue = mme_ue->enb_ue;