diff --git a/src/mme/esm_handler.c b/src/mme/esm_handler.c index d07d4d85a..69276b586 100644 --- a/src/mme/esm_handler.c +++ b/src/mme/esm_handler.c @@ -10,43 +10,40 @@ #include "esm_build.h" -void esm_handle_pdn_connectivity_request(mme_bearer_t *bearer, +status_t esm_handle_pdn_connectivity_request(mme_bearer_t *bearer, nas_pdn_connectivity_request_t *pdn_connectivity_request) { status_t rv; mme_ue_t *mme_ue = NULL; mme_sess_t *sess = NULL; + c_uint8_t security_protected_required = 0; - d_assert(bearer, return, "Null param"); + d_assert(bearer, return CORE_ERROR, "Null param"); sess = bearer->sess; - d_assert(sess, return, "Null param"); + d_assert(sess, return CORE_ERROR, "Null param"); mme_ue = sess->mme_ue; - d_assert(mme_ue, return, "Null param"); + d_assert(mme_ue, return CORE_ERROR, "Null param"); - d_assert(MME_UE_HAVE_IMSI(mme_ue), return, + d_assert(MME_UE_HAVE_IMSI(mme_ue), return CORE_ERROR, "No IMSI in PDN_CPNNECTIVITY_REQUEST"); - d_assert(SECURITY_CONTEXT_IS_VALID(mme_ue), return, + d_assert(SECURITY_CONTEXT_IS_VALID(mme_ue), return CORE_ERROR, "No Security Context in PDN_CPNNECTIVITY_REQUEST"); + security_protected_required = 0; + if (pdn_connectivity_request->presencemask & + NAS_PDN_CONNECTIVITY_REQUEST_ESM_INFORMATION_TRANSFER_FLAG_PRESENT) + { + nas_esm_information_transfer_flag_t *esm_information_transfer_flag = + &pdn_connectivity_request->esm_information_transfer_flag; + security_protected_required = + esm_information_transfer_flag->security_protected_required; + } + if (pdn_connectivity_request->presencemask & NAS_PDN_CONNECTIVITY_REQUEST_ACCESS_POINT_NAME_PRESENT) { sess->pdn = mme_pdn_find_by_apn(mme_ue, - pdn_connectivity_request->access_point_name.apn); - if (!sess->pdn) - { - if (FSM_CHECK(&mme_ue->sm, emm_state_attached)) - { - nas_send_pdn_connectivity_reject( - sess, ESM_CAUSE_MISSING_OR_UNKNOWN_APN); - FSM_TRAN(&bearer->sm, esm_state_session_exception); - return; - } - else - { - d_assert(0, return, "Invalid EMM State"); - } - } + pdn_connectivity_request->access_point_name.apn); } if (pdn_connectivity_request->presencemask & @@ -58,50 +55,46 @@ void esm_handle_pdn_connectivity_request(mme_bearer_t *bearer, NAS_STORE_DATA(&sess->ue_pco, protocol_configuration_options); } - if (MME_UE_HAVE_APN(mme_ue)) + if (security_protected_required) { - if (FSM_CHECK(&mme_ue->sm, emm_state_attached)) - { - rv = mme_gtp_send_create_session_request(sess); - d_assert(rv == CORE_OK, return, "gtp send failed"); - } - else - { - if (MME_HAVE_SGW_S11_PATH(mme_ue)) - { - rv = nas_send_attach_accept(mme_ue); - d_assert(rv == CORE_OK, return, "nas send failed"); - } - else - { - rv = mme_gtp_send_create_session_request(sess); - d_assert(rv == CORE_OK, return, "gtp send failed"); - } - } + rv = nas_send_esm_information_request(bearer); + d_assert(rv == CORE_OK, return CORE_ERROR, "nas send failed"); } else { - FSM_TRAN(&bearer->sm, esm_state_information); + if (sess->pdn) + { + rv = mme_gtp_send_create_session_request(sess); + d_assert(rv == CORE_OK, return CORE_ERROR, "gtp send failed"); + } + else + { + rv = nas_send_pdn_connectivity_reject( + sess, ESM_CAUSE_MISSING_OR_UNKNOWN_APN); + d_assert(rv == CORE_OK,, "nas send failed"); + + return CORE_ERROR; + } } + + return CORE_OK; } -void esm_handle_information_response(mme_sess_t *sess, +status_t esm_handle_information_response(mme_sess_t *sess, nas_esm_information_response_t *esm_information_response) { status_t rv; mme_ue_t *mme_ue = NULL; - d_assert(sess, return, "Null param"); + d_assert(sess, return CORE_ERROR, "Null param"); mme_ue = sess->mme_ue; - d_assert(mme_ue, return, "Null param"); + d_assert(mme_ue, return CORE_ERROR, "Null param"); if (esm_information_response->presencemask & NAS_ESM_INFORMATION_RESPONSE_ACCESS_POINT_NAME_PRESENT) { sess->pdn = mme_pdn_find_by_apn(mme_ue, esm_information_response->access_point_name.apn); - d_assert(sess->pdn, return, "No PDN Context[APN:%s])", - esm_information_response->access_point_name.apn); } if (esm_information_response->presencemask & @@ -112,9 +105,29 @@ void esm_handle_information_response(mme_sess_t *sess, NAS_STORE_DATA(&sess->ue_pco, protocol_configuration_options); } - rv = mme_gtp_send_create_session_request(sess); - d_assert(rv == CORE_OK, return, - "mme_gtp_send_create_session_request failed"); + if (sess->pdn) + { + if (MME_HAVE_SGW_S11_PATH(mme_ue)) + { + rv = nas_send_attach_accept(mme_ue); + d_assert(rv == CORE_OK, return CORE_ERROR, "nas send failed"); + } + else + { + rv = mme_gtp_send_create_session_request(sess); + d_assert(rv == CORE_OK, return CORE_ERROR, "gtp send failed"); + } + } + else + { + rv = nas_send_pdn_connectivity_reject( + sess, ESM_CAUSE_MISSING_OR_UNKNOWN_APN); + d_assert(rv == CORE_OK,, "nas send failed"); + + return CORE_ERROR; + } + + return CORE_OK; } void esm_handle_activate_default_bearer_accept(mme_bearer_t *bearer) diff --git a/src/mme/esm_handler.h b/src/mme/esm_handler.h index feb463e53..b4ceda75a 100644 --- a/src/mme/esm_handler.h +++ b/src/mme/esm_handler.h @@ -9,9 +9,9 @@ extern "C" { #endif /* __cplusplus */ -CORE_DECLARE(void) esm_handle_pdn_connectivity_request(mme_bearer_t *bearer, +CORE_DECLARE(status_t) esm_handle_pdn_connectivity_request(mme_bearer_t *bearer, nas_pdn_connectivity_request_t *pdn_connectivity_request); -CORE_DECLARE(void) esm_handle_information_response(mme_sess_t *sess, +CORE_DECLARE(status_t) esm_handle_information_response(mme_sess_t *sess, nas_esm_information_response_t *bearer_information_response); CORE_DECLARE(void) esm_handle_activate_default_bearer_accept( mme_bearer_t *bearer); diff --git a/src/mme/esm_sm.c b/src/mme/esm_sm.c index 71a3c581d..c4f809e9a 100644 --- a/src/mme/esm_sm.c +++ b/src/mme/esm_sm.c @@ -67,8 +67,21 @@ void esm_state_inactive(fsm_t *s, event_t *e) { case NAS_PDN_CONNECTIVITY_REQUEST: { - esm_handle_pdn_connectivity_request( + rv = esm_handle_pdn_connectivity_request( bearer, &message->esm.pdn_connectivity_request); + if (rv != CORE_OK) + FSM_TRAN(s, esm_state_session_exception); + break; + } + case NAS_ESM_INFORMATION_RESPONSE: + { + d_trace(3, "[NAS] ESM information response : " + "UE[%s] --> ESM[%d]\n", + mme_ue->imsi_bcd, sess->pti); + rv = esm_handle_information_response( + sess, &message->esm.esm_information_response); + if (rv != CORE_OK) + FSM_TRAN(s, esm_state_session_exception); break; } case NAS_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_ACCEPT: @@ -120,77 +133,6 @@ void esm_state_inactive(fsm_t *s, event_t *e) } } -void esm_state_information(fsm_t *s, event_t *e) -{ - mme_ue_t *mme_ue = NULL; - mme_sess_t *sess = NULL; - mme_bearer_t *bearer = NULL; - - d_assert(s, return, "Null param"); - d_assert(e, return, "Null param"); - - mme_sm_trace(3, e); - - bearer = mme_bearer_find(event_get_param1(e)); - d_assert(bearer, return, "Null param"); - sess = bearer->sess; - d_assert(sess, return, "Null param"); - mme_ue = sess->mme_ue; - d_assert(mme_ue, return, "Null param"); - - switch (event_get(e)) - { - case FSM_ENTRY_SIG: - { - status_t rv; - pkbuf_t *esmbuf = NULL; - - rv = esm_build_information_request(&esmbuf, bearer); - d_assert(rv == CORE_OK && esmbuf, return, - "esm_build failed"); - d_assert(nas_send_to_downlink_nas_transport( - mme_ue, esmbuf) == CORE_OK,,); - break; - } - case FSM_EXIT_SIG: - { - break; - } - case MME_EVT_ESM_MESSAGE: - { - nas_message_t *message = (nas_message_t *)event_get_param3(e); - d_assert(message, break, "Null param"); - - switch(message->esm.h.message_type) - { - case NAS_ESM_INFORMATION_RESPONSE: - { - d_trace(3, "[NAS] ESM information response : " - "UE[%s] --> ESM[%d]\n", - mme_ue->imsi_bcd, sess->pti); - esm_handle_information_response( - sess, &message->esm.esm_information_response); - FSM_TRAN(s, esm_state_inactive); - break; - } - default: - { - d_warn("Not implemented(type:%d)", - message->esm.h.message_type); - break; - } - } - break; - } - - default: - { - d_error("Unknown event %s", mme_event_get_name(e)); - break; - } - } -} - void esm_state_active(fsm_t *s, event_t *e) { status_t rv; @@ -229,9 +171,12 @@ void esm_state_active(fsm_t *s, event_t *e) { case NAS_PDN_CONNECTIVITY_REQUEST: { - esm_handle_pdn_connectivity_request( + rv = esm_handle_pdn_connectivity_request( bearer, &message->esm.pdn_connectivity_request); - FSM_TRAN(s, esm_state_inactive); + if (rv != CORE_OK) + FSM_TRAN(s, esm_state_session_exception); + else + FSM_TRAN(s, esm_state_inactive); break; } case NAS_PDN_DISCONNECT_REQUEST: diff --git a/src/mme/mme_sm.h b/src/mme/mme_sm.h index 09c0c036b..3cd634d72 100644 --- a/src/mme/mme_sm.h +++ b/src/mme/mme_sm.h @@ -32,7 +32,6 @@ void emm_state_exception(fsm_t *s, event_t *e); void esm_state_initial(fsm_t *s, event_t *e); void esm_state_final(fsm_t *s, event_t *e); void esm_state_inactive(fsm_t *s, event_t *e); -void esm_state_information(fsm_t *s, event_t *e); void esm_state_active(fsm_t *s, event_t *e); void esm_state_disconnect(fsm_t *s, event_t *e); void esm_state_session_exception(fsm_t *s, event_t *e); diff --git a/src/mme/nas_path.c b/src/mme/nas_path.c index 0e85768a1..9045c85c8 100644 --- a/src/mme/nas_path.c +++ b/src/mme/nas_path.c @@ -228,6 +228,26 @@ status_t nas_send_pdn_connectivity_reject( return CORE_OK; } +status_t nas_send_esm_information_request(mme_bearer_t *bearer) +{ + status_t rv; + mme_ue_t *mme_ue = NULL; + pkbuf_t *esmbuf = NULL; + + d_assert(bearer, return CORE_ERROR, "Null param"); + mme_ue = bearer->mme_ue; + d_assert(mme_ue, return CORE_ERROR, "Null param"); + + rv = esm_build_information_request(&esmbuf, bearer); + d_assert(rv == CORE_OK && esmbuf, return CORE_ERROR, "esm build error"); + + rv = nas_send_to_downlink_nas_transport(mme_ue, esmbuf); + d_assert(rv == CORE_OK, return CORE_ERROR, + "nas_send_to_downlink_nas_transport"); + + return CORE_OK; +} + status_t nas_send_activate_default_bearer_context_request(mme_bearer_t *bearer) { status_t rv; diff --git a/src/mme/nas_path.h b/src/mme/nas_path.h index 204d3d14a..1062d0454 100644 --- a/src/mme/nas_path.h +++ b/src/mme/nas_path.h @@ -28,6 +28,7 @@ CORE_DECLARE(status_t) nas_send_detach_accept(mme_ue_t *mme_ue); CORE_DECLARE(status_t) nas_send_pdn_connectivity_reject( mme_sess_t *sess, nas_esm_cause_t esm_cause); +CORE_DECLARE(status_t) nas_send_esm_information_request(mme_bearer_t *bearer); CORE_DECLARE(status_t) nas_send_activate_default_bearer_context_request( mme_bearer_t *bearer); CORE_DECLARE(status_t) nas_send_activate_dedicated_bearer_context_request(