assign enb_ue_s1ap_id as a part of enb_ue_add function (#326)

This commit is contained in:
Spencer Sevilla 2019-12-12 20:46:22 -08:00 committed by Sukchan Lee
parent 324f3d158f
commit 66f839592f
4 changed files with 5 additions and 7 deletions

View File

@ -2003,7 +2003,7 @@ int mme_enb_sock_type(ogs_sock_t *sock)
}
/** enb_ue_context handling function */
enb_ue_t *enb_ue_add(mme_enb_t *enb)
enb_ue_t *enb_ue_add(mme_enb_t *enb, S1AP_ENB_UE_S1AP_ID_t enb_ue_s1ap_id)
{
enb_ue_t *enb_ue = NULL;
@ -2014,7 +2014,7 @@ enb_ue_t *enb_ue_add(mme_enb_t *enb)
ogs_assert(enb_ue);
memset(enb_ue, 0, sizeof *enb_ue);
enb_ue->enb_ue_s1ap_id = INVALID_UE_S1AP_ID;
enb_ue->enb_ue_s1ap_id = enb_ue_s1ap_id;
enb_ue->mme_ue_s1ap_id = OGS_NEXT_ID(self.mme_ue_s1ap_id, 1, 0xffffffff);
/*

View File

@ -666,7 +666,7 @@ mme_enb_t *mme_enb_find_by_enb_id(uint32_t enb_id);
int mme_enb_set_enb_id(mme_enb_t *enb, uint32_t enb_id);
int mme_enb_sock_type(ogs_sock_t *sock);
enb_ue_t *enb_ue_add(mme_enb_t *enb);
enb_ue_t *enb_ue_add(mme_enb_t *enb, S1AP_ENB_UE_S1AP_ID_t enb_ue_s1ap_id);
unsigned int enb_ue_count(void);
void enb_ue_remove(enb_ue_t *enb_ue);
void enb_ue_remove_in_enb(mme_enb_t *enb);

View File

@ -226,11 +226,9 @@ void s1ap_handle_initial_ue_message(mme_enb_t *enb, ogs_s1ap_message_t *message)
ogs_assert(ENB_UE_S1AP_ID);
enb_ue = enb_ue_find_by_enb_ue_s1ap_id(enb, *ENB_UE_S1AP_ID);
if (!enb_ue) {
enb_ue = enb_ue_add(enb);
enb_ue = enb_ue_add(enb, *ENB_UE_S1AP_ID);
ogs_assert(enb_ue);
enb_ue->enb_ue_s1ap_id = *ENB_UE_S1AP_ID;
/* Find MME_UE if S_TMSI included */
if (S_TMSI) {
served_gummei_t *served_gummei = &mme_self()->served_gummei[0];

View File

@ -447,7 +447,7 @@ void s1ap_send_handover_request(
ogs_assert(source_ue);
ogs_assert(source_ue->target_ue == NULL);
target_ue = enb_ue_add(target_enb);
target_ue = enb_ue_add(target_enb, INVALID_UE_S1AP_ID);
ogs_assert(target_ue);
ogs_debug(" Source : ENB_UE_S1AP_ID[%d] MME_UE_S1AP_ID[%d]",