From ebddb2ad9ffe54f5fca3ccbec477fdcdba9cc78d Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Fri, 2 Feb 2018 21:09:37 +0900 Subject: [PATCH] rename it --- src/mme/emm_sm.c | 4 ++-- src/mme/esm_handler.c | 2 +- src/mme/mme_context.h | 4 ++-- src/mme/mme_path.c | 4 ++-- src/mme/mme_s11_handler.c | 2 +- src/mme/s1ap_handler.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mme/emm_sm.c b/src/mme/emm_sm.c index 20504ce10..45f523659 100644 --- a/src/mme/emm_sm.c +++ b/src/mme/emm_sm.c @@ -272,7 +272,7 @@ static void common_register_state(fsm_t *s, event_t *e) } else { - if (MME_HAVE_SGW_S11_PATH(mme_ue)) + if (SESSION_CONTEXT_IS_VALID(mme_ue)) { rv = mme_gtp_send_delete_all_sessions(mme_ue); d_assert(rv == CORE_OK,, @@ -295,7 +295,7 @@ static void common_register_state(fsm_t *s, event_t *e) } else { - if (MME_HAVE_SGW_S11_PATH(mme_ue)) + if (SESSION_CONTEXT_IS_VALID(mme_ue)) { mme_s6a_send_air(mme_ue, NULL); FSM_TRAN(&mme_ue->sm, &emm_state_authentication); diff --git a/src/mme/esm_handler.c b/src/mme/esm_handler.c index 66113d39c..693d86199 100644 --- a/src/mme/esm_handler.c +++ b/src/mme/esm_handler.c @@ -131,7 +131,7 @@ status_t esm_handle_information_response(mme_sess_t *sess, if (sess->pdn) { d_trace(5, " APN[%s]\n", sess->pdn->apn); - if (MME_HAVE_SGW_S11_PATH(mme_ue)) + if (SESSION_CONTEXT_IS_VALID(mme_ue)) { rv = nas_send_attach_accept(mme_ue); d_assert(rv == CORE_OK, return CORE_ERROR, "nas send failed"); diff --git a/src/mme/mme_context.h b/src/mme/mme_context.h index b9127e9db..47cbcde61 100644 --- a/src/mme/mme_context.h +++ b/src/mme/mme_context.h @@ -381,10 +381,10 @@ struct _mme_ue_t { ((__sESS) && (mme_bearer_first(__sESS)) && \ ((mme_default_bearer_in_sess(__sESS)->sgw_s1u_teid))) -#define MME_HAVE_SGW_S11_PATH(__mME) \ +#define SESSION_CONTEXT_IS_VALID(__mME) \ ((__mME) && ((__mME)->sgw_s11_teid)) -#define CLEAR_SGW_S11_PATH(__mME) \ +#define CLEAR_SESSION_CONTEXT(__mME) \ do { \ d_assert((__mME), break, "Null param"); \ (__mME)->sgw_s11_teid = 0; \ diff --git a/src/mme/mme_path.c b/src/mme/mme_path.c index e354f37cd..e937e086c 100644 --- a/src/mme/mme_path.c +++ b/src/mme/mme_path.c @@ -11,7 +11,7 @@ status_t mme_send_detach_accept(mme_ue_t *mme_ue) d_assert(mme_ue, return CORE_ERROR,); - if (MME_HAVE_SGW_S11_PATH(mme_ue)) + if (SESSION_CONTEXT_IS_VALID(mme_ue)) { rv = mme_gtp_send_delete_all_sessions(mme_ue); d_assert(rv == CORE_OK,, @@ -33,7 +33,7 @@ status_t mme_send_ue_context_release_command(mme_ue_t *mme_ue, enb_ue_t *enb_ue) d_assert(enb_ue, return CORE_ERROR,); - if (MME_HAVE_SGW_S11_PATH(mme_ue)) + if (SESSION_CONTEXT_IS_VALID(mme_ue)) { rv = mme_gtp_send_delete_all_sessions(mme_ue); d_assert(rv == CORE_OK,, diff --git a/src/mme/mme_s11_handler.c b/src/mme/mme_s11_handler.c index ca8203d66..87791a1e3 100644 --- a/src/mme/mme_s11_handler.c +++ b/src/mme/mme_s11_handler.c @@ -236,7 +236,7 @@ void mme_s11_handle_delete_session_response( cleanup: if (mme_sess_count(mme_ue) == 1) /* Last Session */ - CLEAR_SGW_S11_PATH(mme_ue); + CLEAR_SESSION_CONTEXT(mme_ue); mme_sess_remove(sess); } diff --git a/src/mme/s1ap_handler.c b/src/mme/s1ap_handler.c index ccffa658b..5617dea53 100644 --- a/src/mme/s1ap_handler.c +++ b/src/mme/s1ap_handler.c @@ -684,7 +684,7 @@ void s1ap_handle_ue_context_release_complete( d_assert(rv == CORE_OK,, "enb_ue_removeI() failed"); d_assert(mme_ue,,); - if (MME_HAVE_SGW_S11_PATH(mme_ue)) + if (SESSION_CONTEXT_IS_VALID(mme_ue)) { rv = mme_gtp_send_delete_indirect_data_forwarding_tunnel_request(mme_ue); d_assert(rv == CORE_OK,, "mme_gtp_send_delete_indirect_data_"