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

rollback implicit S1 release

This commit is contained in:
Sukchan Lee 2018-02-02 04:26:01 +09:00
parent cb7132a2fa
commit 34986be707
4 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mme/mme_event.c
View File

@ -24,8 +24,6 @@ char* mme_event_get_name(event_t *e)
return "MME_EVT_S1AP_LO_ACCEPT";
case MME_EVT_S1AP_LO_CONNREFUSED:
return "MME_EVT_S1AP_LO_CONNREFUSED";
case MME_EVT_S1AP_S1_HOLDING_TIMER:
return "MME_EVT_S1AP_S1_HOLDING_TIMER";
case MME_EVT_EMM_MESSAGE:
return "MME_EVT_EMM_MESSAGE";

1
src/mme/mme_event.h
View File

@ -17,7 +17,6 @@ typedef enum {
MME_EVT_S1AP_DELAYED_SEND,
MME_EVT_S1AP_LO_ACCEPT,
MME_EVT_S1AP_LO_CONNREFUSED,
MME_EVT_S1AP_S1_HOLDING_TIMER,
MME_EVT_EMM_MESSAGE,
MME_EVT_EMM_T3413,

43
src/mme/mme_sm.c
View File

@ -212,38 +212,6 @@ void mme_state_operational(fsm_t *s, event_t *e)
tm_delete(timer);
break;
}
case MME_EVT_S1AP_S1_HOLDING_TIMER:
{
enb_ue_t *enb_ue = NULL;
mme_ue_t *mme_ue = NULL;
d_assert(0, break, "Deprecated");
enb_ue = enb_ue_find(event_get_param1(e));
d_assert(enb_ue, break, "No ENB UE context");
d_warn("Implicit S1 release");
d_warn(" ENB_UE_S1AP_ID[%d] MME_UE_S1AP_ID[%d]",
enb_ue->enb_ue_s1ap_id, enb_ue->mme_ue_s1ap_id);
mme_ue = enb_ue->mme_ue;
d_assert(mme_ue, break, "No MME UE context");
d_warn("Associated NAS/EMM");
d_warn(" GUTI[G:%d,C:%d,M_TMSI:0x%x] IMSI[%s]",
mme_ue->guti.mme_gid,
mme_ue->guti.mme_code,
mme_ue->guti.m_tmsi,
MME_UE_HAVE_IMSI(mme_ue) ? mme_ue->imsi_bcd : "Unknown");
if (mme_ue->enb_ue)
d_warn(" ENB_UE_S1AP_ID[%d] MME_UE_S1AP_ID[%d]",
mme_ue->enb_ue->enb_ue_s1ap_id,
mme_ue->enb_ue->mme_ue_s1ap_id);
else
d_warn(" No Associated S1");
rv = enb_ue_remove(enb_ue);
d_assert(rv == CORE_OK,,);
break;
}
case MME_EVT_EMM_MESSAGE:
{
nas_message_t message;
@ -295,13 +263,22 @@ void mme_state_operational(fsm_t *s, event_t *e)
* to older S1 context. */
if (mme_ue->enb_ue)
{
#if NOT_WORKING
d_trace(5, "OLD ENB_UE_S1AP_ID[%d] MME_UE_S1AP_ID[%d]\n",
mme_ue->enb_ue->enb_ue_s1ap_id,
mme_ue->enb_ue->mme_ue_s1ap_id);
rv = s1ap_send_ue_context_release_command(mme_ue->enb_ue,
S1ap_Cause_PR_nas, S1ap_CauseNas_normal_release,
S1AP_UE_CTX_REL_NO_ACTION, 0);
d_assert(rv == CORE_OK, return, "s1ap send error");
d_assert(rv == CORE_OK,, "s1ap send error");
#else
d_warn("Implicit S1 release");
d_warn(" ENB_UE_S1AP_ID[%d] MME_UE_S1AP_ID[%d]",
mme_ue->enb_ue->enb_ue_s1ap_id,
mme_ue->enb_ue->mme_ue_s1ap_id);
rv = enb_ue_remove(mme_ue->enb_ue);
d_assert(rv == CORE_OK,,);
#endif
}
mme_ue_associate_enb_ue(mme_ue, enb_ue);
}

9
src/mme/s1ap_handler.c
View File

@ -163,6 +163,7 @@ void s1ap_handle_initial_ue_message(mme_enb_t *enb, s1ap_message_t *message)
* to older S1 context. */
if (mme_ue->enb_ue)
{
#if NOT_WORKING
d_trace(5, "OLD ENB_UE_S1AP_ID[%d] MME_UE_S1AP_ID[%d]\n",
mme_ue->enb_ue->enb_ue_s1ap_id,
mme_ue->enb_ue->mme_ue_s1ap_id);
@ -170,6 +171,14 @@ void s1ap_handle_initial_ue_message(mme_enb_t *enb, s1ap_message_t *message)
S1ap_Cause_PR_nas, S1ap_CauseNas_normal_release,
S1AP_UE_CTX_REL_NO_ACTION, 0);
d_assert(rv == CORE_OK, return, "s1ap send error");
#else
d_warn("Implicit S1 release");
d_warn(" ENB_UE_S1AP_ID[%d] MME_UE_S1AP_ID[%d]",
mme_ue->enb_ue->enb_ue_s1ap_id,
mme_ue->enb_ue->mme_ue_s1ap_id);
rv = enb_ue_remove(mme_ue->enb_ue);
d_assert(rv == CORE_OK,,);
#endif
}
mme_ue_associate_enb_ue(mme_ue, enb_ue);
}