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

fix identation

This commit is contained in:
Sukchan Lee 2019-06-30 20:46:15 +09:00
parent db348156e2
commit 8e53e82913
6 changed files with 57 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/mme/mme-context.c
View File

@ -102,6 +102,8 @@ void mme_context_init()
self.imsi_ue_hash = ogs_hash_make();
self.guti_ue_hash = ogs_hash_make();
ogs_list_init(&self.mme_ue_list);
/* Paging retry timer: 2 secs */
self.t3413_value = ogs_time_from_sec(2);
/* Client timer to connect to server: 3 secs */
@ -1834,28 +1836,23 @@ unsigned int enb_ue_count()
return ogs_hash_count(self.mme_ue_s1ap_id_hash);
}
int enb_ue_remove(enb_ue_t *enb_ue)
void enb_ue_remove(enb_ue_t *enb_ue)
{
int rv;
ogs_assert(self.mme_ue_s1ap_id_hash);
ogs_assert(enb_ue);
ogs_assert(enb_ue->enb);
/* De-associate S1 with NAS/EMM */
rv = enb_ue_deassociate(enb_ue);
ogs_assert(rv == OGS_OK);
enb_ue_deassociate(enb_ue);
ogs_list_remove(&enb_ue->enb->enb_ue_list, enb_ue);
ogs_hash_set(self.mme_ue_s1ap_id_hash, &enb_ue->mme_ue_s1ap_id,
sizeof(enb_ue->mme_ue_s1ap_id), NULL);
ogs_pool_free(&enb_ue_pool, enb_ue);
return OGS_OK;
}
int enb_ue_remove_in_enb(mme_enb_t *enb)
void enb_ue_remove_in_enb(mme_enb_t *enb)
{
enb_ue_t *enb_ue = NULL, *next_enb_ue = NULL;
@ -1867,11 +1864,9 @@ int enb_ue_remove_in_enb(mme_enb_t *enb)
enb_ue = next_enb_ue;
}
return OGS_OK;
}
int enb_ue_switch_to_enb(enb_ue_t *enb_ue, mme_enb_t *new_enb)
void enb_ue_switch_to_enb(enb_ue_t *enb_ue, mme_enb_t *new_enb)
{
ogs_assert(enb_ue);
ogs_assert(enb_ue->enb);
@ -1885,8 +1880,6 @@ int enb_ue_switch_to_enb(enb_ue_t *enb_ue, mme_enb_t *new_enb)
/* Switch to enb */
enb_ue->enb = new_enb;
return OGS_OK;
}
enb_ue_t *enb_ue_find_by_enb_ue_s1ap_id(
@ -2019,16 +2012,19 @@ mme_ue_t *mme_ue_add(enb_ue_t *enb_ue)
ogs_fsm_create(&mme_ue->sm, emm_state_initial, emm_state_final);
ogs_fsm_init(&mme_ue->sm, &e);
ogs_list_add(&self.mme_ue_list, mme_ue);
return mme_ue;
}
int mme_ue_remove(mme_ue_t *mme_ue)
void mme_ue_remove(mme_ue_t *mme_ue)
{
int rv;
mme_event_t e;
ogs_assert(mme_ue);
ogs_list_remove(&self.mme_ue_list, mme_ue);
e.mme_ue = mme_ue;
ogs_fsm_fini(&mme_ue->sm, &e);
ogs_fsm_delete(&mme_ue->sm);
@ -2057,28 +2053,20 @@ int mme_ue_remove(mme_ue_t *mme_ue)
/* Delete All Timers */
ogs_timer_delete(mme_ue->t3413);
rv = mme_ue_deassociate(mme_ue);
ogs_assert(rv == OGS_OK);
mme_ue_deassociate(mme_ue);
mme_sess_remove_all(mme_ue);
mme_pdn_remove_all(mme_ue);
ogs_pool_free(&mme_ue_pool, mme_ue);
return OGS_OK;
}
int mme_ue_remove_all()
void mme_ue_remove_all()
{
ogs_hash_index_t *hi = NULL;
mme_ue_t *mme_ue = NULL;
mme_ue_t *mme_ue = NULL, *next = NULL;;
for (hi = mme_ue_first(); hi; hi = mme_ue_next(hi)) {
mme_ue = mme_ue_this(hi);
ogs_list_for_each_safe(&self.mme_ue_list, next, mme_ue)
mme_ue_remove(mme_ue);
}
return OGS_OK;
}
mme_ue_t *mme_ue_find_by_imsi_bcd(char *imsi_bcd)
@ -2113,23 +2101,6 @@ mme_ue_t *mme_ue_find_by_teid(uint32_t teid)
return ogs_pool_find(&mme_ue_pool, teid);
}
ogs_hash_index_t *mme_ue_first()
{
ogs_assert(self.imsi_ue_hash);
return ogs_hash_first(self.imsi_ue_hash);
}
ogs_hash_index_t *mme_ue_next(ogs_hash_index_t *hi)
{
return ogs_hash_next(hi);
}
mme_ue_t *mme_ue_this(ogs_hash_index_t *hi)
{
ogs_assert(hi);
return ogs_hash_this_val(hi);
}
mme_ue_t *mme_ue_find_by_message(nas_message_t *message)
{
mme_ue_t *mme_ue = NULL;
@ -2300,34 +2271,28 @@ int mme_ue_clear_indirect_tunnel(mme_ue_t *mme_ue)
return OGS_OK;
}
int mme_ue_associate_enb_ue(mme_ue_t *mme_ue, enb_ue_t *enb_ue)
void mme_ue_associate_enb_ue(mme_ue_t *mme_ue, enb_ue_t *enb_ue)
{
ogs_assert(mme_ue);
ogs_assert(enb_ue);
mme_ue->enb_ue = enb_ue;
enb_ue->mme_ue = mme_ue;
return OGS_OK;
}
int enb_ue_deassociate(enb_ue_t *enb_ue)
void enb_ue_deassociate(enb_ue_t *enb_ue)
{
ogs_assert(enb_ue);
enb_ue->mme_ue = NULL;
return OGS_OK;
}
int mme_ue_deassociate(mme_ue_t *mme_ue)
void mme_ue_deassociate(mme_ue_t *mme_ue)
{
ogs_assert(mme_ue);
mme_ue->enb_ue = NULL;
return OGS_OK;
}
int source_ue_associate_target_ue(
void source_ue_associate_target_ue(
enb_ue_t *source_ue, enb_ue_t *target_ue)
{
mme_ue_t *mme_ue = NULL;
@ -2340,11 +2305,9 @@ int source_ue_associate_target_ue(
target_ue->mme_ue = mme_ue;
target_ue->source_ue = source_ue;
source_ue->target_ue = target_ue;
return OGS_OK;
}
int source_ue_deassociate_target_ue(enb_ue_t *enb_ue)
void source_ue_deassociate_target_ue(enb_ue_t *enb_ue)
{
enb_ue_t *source_ue = NULL;
enb_ue_t *target_ue = NULL;
@ -2367,8 +2330,6 @@ int source_ue_deassociate_target_ue(enb_ue_t *enb_ue)
source_ue->target_ue = NULL;
target_ue->source_ue = NULL;
}
return OGS_OK;
}
mme_sess_t *mme_sess_add(mme_ue_t *mme_ue, uint8_t pti)
@ -2395,7 +2356,7 @@ mme_sess_t *mme_sess_add(mme_ue_t *mme_ue, uint8_t pti)
return sess;
}
int mme_sess_remove(mme_sess_t *sess)
void mme_sess_remove(mme_sess_t *sess)
{
ogs_assert(sess);
ogs_assert(sess->mme_ue);
@ -2408,11 +2369,9 @@ int mme_sess_remove(mme_sess_t *sess)
TLV_CLEAR_DATA(&sess->pgw_pco);
ogs_pool_free(&mme_sess_pool, sess);
return OGS_OK;
}
int mme_sess_remove_all(mme_ue_t *mme_ue)
void mme_sess_remove_all(mme_ue_t *mme_ue)
{
mme_sess_t *sess = NULL, *next_sess = NULL;
@ -2424,8 +2383,6 @@ int mme_sess_remove_all(mme_ue_t *mme_ue)
sess = next_sess;
}
return OGS_OK;
}
mme_sess_t *mme_sess_find_by_pti(mme_ue_t *mme_ue, uint8_t pti)
@ -2521,7 +2478,7 @@ mme_bearer_t *mme_bearer_add(mme_sess_t *sess)
return bearer;
}
int mme_bearer_remove(mme_bearer_t *bearer)
void mme_bearer_remove(mme_bearer_t *bearer)
{
mme_event_t e;
@ -2537,11 +2494,9 @@ int mme_bearer_remove(mme_bearer_t *bearer)
TLV_CLEAR_DATA(&bearer->tft);
ogs_pool_free(&mme_bearer_pool, bearer);
return OGS_OK;
}
int mme_bearer_remove_all(mme_sess_t *sess)
void mme_bearer_remove_all(mme_sess_t *sess)
{
mme_bearer_t *bearer = NULL, *next_bearer = NULL;
@ -2555,8 +2510,6 @@ int mme_bearer_remove_all(mme_sess_t *sess)
bearer = next_bearer;
}
return OGS_OK;
}
mme_bearer_t *mme_bearer_find_by_sess_ebi(mme_sess_t *sess, uint8_t ebi)
@ -2727,7 +2680,7 @@ int mme_bearer_set_inactive(mme_ue_t *mme_ue)
return OGS_OK;
}
int mme_pdn_remove_all(mme_ue_t *mme_ue)
void mme_pdn_remove_all(mme_ue_t *mme_ue)
{
s6a_subscription_data_t *subscription_data = NULL;
@ -2736,8 +2689,6 @@ int mme_pdn_remove_all(mme_ue_t *mme_ue)
ogs_assert(subscription_data);
subscription_data->num_of_pdn = 0;
return OGS_OK;
}
pdn_t *mme_pdn_find_by_apn(mme_ue_t *mme_ue, char *apn)

39
src/mme/mme-context.h
View File

@ -150,6 +150,8 @@ typedef struct mme_context_s {
/* M-TMSI Pool */
OGS_POOL(m_tmsi, mme_m_tmsi_t);
ogs_list_t mme_ue_list;
ogs_hash_t *enb_sock_hash; /* hash table for ENB Socket */
ogs_hash_t *enb_addr_hash; /* hash table for ENB Address */
ogs_hash_t *enb_id_hash; /* hash table for ENB-ID */
@ -265,6 +267,7 @@ struct enb_ue_s {
};
struct mme_ue_s {
ogs_lnode_t lnode;
ogs_fsm_t sm; /* A state machine */
struct {
@ -605,9 +608,9 @@ int mme_enb_sock_type(ogs_sock_t *sock);
enb_ue_t *enb_ue_add(mme_enb_t *enb);
unsigned int enb_ue_count();
int enb_ue_remove(enb_ue_t *enb_ue);
int enb_ue_remove_in_enb(mme_enb_t *enb);
int enb_ue_switch_to_enb(enb_ue_t *enb_ue, mme_enb_t *new_enb);
void enb_ue_remove(enb_ue_t *enb_ue);
void enb_ue_remove_in_enb(mme_enb_t *enb);
void enb_ue_switch_to_enb(enb_ue_t *enb_ue, mme_enb_t *new_enb);
enb_ue_t *enb_ue_find_by_enb_ue_s1ap_id(
mme_enb_t *enb, uint32_t enb_ue_s1ap_id);
enb_ue_t *enb_ue_find_by_mme_ue_s1ap_id(uint32_t mme_ue_s1ap_id);
@ -615,8 +618,8 @@ enb_ue_t *enb_ue_first_in_enb(mme_enb_t *enb);
enb_ue_t *enb_ue_next_in_enb(enb_ue_t *enb_ue);
mme_ue_t *mme_ue_add(enb_ue_t *enb_ue);
int mme_ue_remove(mme_ue_t *mme_ue);
int mme_ue_remove_all();
void mme_ue_remove(mme_ue_t *mme_ue);
void mme_ue_remove_all();
mme_ue_t *mme_ue_find_by_imsi(uint8_t *imsi, int imsi_len);
mme_ue_t *mme_ue_find_by_imsi_bcd(char *imsi_bcd);
@ -677,21 +680,15 @@ int mme_ue_clear_indirect_tunnel(mme_ue_t *mme_ue);
* ### ENB_UE_REMOVE() ####
* - Delete Indirect Data Forwarding Tunnel Request/Response
*/
int mme_ue_associate_enb_ue(
mme_ue_t *mme_ue, enb_ue_t *enb_ue);
int enb_ue_deassociate(enb_ue_t *enb_ue);
int mme_ue_deassociate(mme_ue_t *mme_ue);
int source_ue_associate_target_ue(
enb_ue_t *source_ue, enb_ue_t *target_ue);
int source_ue_deassociate_target_ue(enb_ue_t *enb_ue);
ogs_hash_index_t *mme_ue_first();
ogs_hash_index_t *mme_ue_next(ogs_hash_index_t *hi);
mme_ue_t *mme_ue_this(ogs_hash_index_t *hi);
void mme_ue_associate_enb_ue(mme_ue_t *mme_ue, enb_ue_t *enb_ue);
void enb_ue_deassociate(enb_ue_t *enb_ue);
void mme_ue_deassociate(mme_ue_t *mme_ue);
void source_ue_associate_target_ue(enb_ue_t *source_ue, enb_ue_t *target_ue);
void source_ue_deassociate_target_ue(enb_ue_t *enb_ue);
mme_sess_t *mme_sess_add(mme_ue_t *mme_ue, uint8_t pti);
int mme_sess_remove(mme_sess_t *sess);
int mme_sess_remove_all(mme_ue_t *mme_ue);
void mme_sess_remove(mme_sess_t *sess);
void mme_sess_remove_all(mme_ue_t *mme_ue);
mme_sess_t *mme_sess_find_by_pti(mme_ue_t *mme_ue, uint8_t pti);
mme_sess_t *mme_sess_find_by_ebi(mme_ue_t *mme_ue, uint8_t ebi);
mme_sess_t *mme_sess_find_by_apn(mme_ue_t *mme_ue, char *apn);
@ -700,8 +697,8 @@ mme_sess_t *mme_sess_next(mme_sess_t *sess);
unsigned int mme_sess_count(mme_ue_t *mme_ue);
mme_bearer_t *mme_bearer_add(mme_sess_t *sess);
int mme_bearer_remove(mme_bearer_t *bearer);
int mme_bearer_remove_all(mme_sess_t *sess);
void mme_bearer_remove(mme_bearer_t *bearer);
void mme_bearer_remove_all(mme_sess_t *sess);
mme_bearer_t *mme_bearer_find_by_sess_ebi(mme_sess_t *sess, uint8_t ebi);
mme_bearer_t *mme_bearer_find_by_ue_ebi(mme_ue_t *mme_ue, uint8_t ebi);
mme_bearer_t *mme_bearer_find_or_add_by_message(
@ -714,7 +711,7 @@ mme_bearer_t *mme_bearer_next(mme_bearer_t *bearer);
int mme_bearer_is_inactive(mme_ue_t *mme_ue);
int mme_bearer_set_inactive(mme_ue_t *mme_ue);
int mme_pdn_remove_all(mme_ue_t *mme_ue);
void mme_pdn_remove_all(mme_ue_t *mme_ue);
pdn_t *mme_pdn_find_by_apn(mme_ue_t *mme_ue, char *apn);
pdn_t *mme_default_pdn(mme_ue_t *mme_ue);

3
src/mme/mme-sm.c
View File

@ -247,8 +247,7 @@ void mme_state_operational(ogs_fsm_t *s, mme_event_t *e)
ogs_debug(" 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);
ogs_assert(rv == OGS_OK);
enb_ue_remove(mme_ue->enb_ue);
}
mme_ue_associate_enb_ue(mme_ue, enb_ue);
}

38
src/mme/s1ap-handler.c
View File

@ -165,7 +165,6 @@ void s1ap_handle_s1_setup_request(mme_enb_t *enb, s1ap_message_t *message)
void s1ap_handle_initial_ue_message(mme_enb_t *enb, s1ap_message_t *message)
{
int rv;
int i;
char buf[OGS_ADDRSTRLEN];
@ -268,8 +267,7 @@ void s1ap_handle_initial_ue_message(mme_enb_t *enb, s1ap_message_t *message)
ogs_debug(" 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);
ogs_assert(rv == OGS_OK);
enb_ue_remove(mme_ue->enb_ue);
}
mme_ue_associate_enb_ue(mme_ue, enb_ue);
}
@ -868,35 +866,23 @@ void s1ap_handle_ue_context_release_complete(
switch (enb_ue->ue_ctx_rel_action) {
case S1AP_UE_CTX_REL_NO_ACTION:
ogs_debug(" No Action");
rv = enb_ue_remove(enb_ue);
ogs_assert(rv == OGS_OK);
enb_ue_remove(enb_ue);
break;
case S1AP_UE_CTX_REL_S1_NORMAL_RELEASE:
ogs_debug(" Action: S1 normal release");
rv = enb_ue_remove(enb_ue);
ogs_assert(rv == OGS_OK);
ogs_assert(mme_ue);
rv = mme_ue_deassociate(mme_ue);
ogs_assert(rv == OGS_OK);
enb_ue_remove(enb_ue);
mme_ue_deassociate(mme_ue);
break;
case S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE:
ogs_debug(" Action: UE context remove()");
rv = enb_ue_remove(enb_ue);
ogs_assert(rv == OGS_OK);
ogs_assert(mme_ue);
rv = mme_ue_remove(mme_ue);
ogs_assert(rv == OGS_OK);
enb_ue_remove(enb_ue);
mme_ue_remove(mme_ue);
break;
case S1AP_UE_CTX_REL_DELETE_INDIRECT_TUNNEL:
ogs_debug(" Action: Delete indirect tunnel");
rv = source_ue_deassociate_target_ue(enb_ue);
ogs_assert(rv == OGS_OK);
rv = enb_ue_remove(enb_ue);
ogs_assert(rv == OGS_OK);
source_ue_deassociate_target_ue(enb_ue);
enb_ue_remove(enb_ue);
ogs_assert(mme_ue);
if (mme_ue_have_indirect_tunnel(mme_ue)) {
@ -1923,8 +1909,7 @@ void s1ap_handle_s1_reset(
case S1AP_ResetType_PR_s1_Interface:
ogs_debug(" S1AP_ResetType_PR_s1_Interface");
rv = enb_ue_remove_in_enb(enb);
ogs_assert(rv == OGS_OK);
enb_ue_remove_in_enb(enb);
break;
case S1AP_ResetType_PR_partOfS1_Interface:
ogs_debug(" S1AP_ResetType_PR_partOfS1_Interface");
@ -1963,10 +1948,9 @@ void s1ap_handle_s1_reset(
continue;
}
rv = enb_ue_remove(enb_ue);
ogs_assert(rv == OGS_OK);
enb_ue_remove(enb_ue);
}
break;
}
default:
ogs_warn("Invalid ResetType[%d]", ResetType->present);
break;

3
src/mme/s1ap-path.c
View File

@ -403,8 +403,7 @@ int s1ap_send_handover_request(
ogs_debug(" Target : ENB_UE_S1AP_ID[Unknown] MME_UE_S1AP_ID[%d]",
target_ue->mme_ue_s1ap_id);
rv = source_ue_associate_target_ue(source_ue, target_ue);
ogs_assert(rv == OGS_OK);
source_ue_associate_target_ue(source_ue, target_ue);
rv = s1ap_build_handover_request(&s1apbuf, mme_ue, target_ue,
enb_ue_s1ap_id, mme_ue_s1ap_id,

4
tests/common/test-packet.c
View File

@ -190,9 +190,7 @@ int testenb_gtpu_send(ogs_socknode_t *node, ogs_pkbuf_t *sendbuf)
ogs_assert(node);
ogs_assert(node->sock);
hi = mme_ue_first();
ogs_assert(hi);
mme_ue = mme_ue_this(hi);
mme_ue = ogs_list_first(&mme_self()->mme_ue_list);
ogs_assert(mme_ue);
sess = mme_sess_first(mme_ue);
ogs_assert(sess);