sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add log message

This commit is contained in:
Sukchan Lee 2018-01-13 21:19:43 +09:00
parent 4417578210
commit 63562dd63a
6 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mme/esm_sm.c
View File

@ -80,7 +80,7 @@ void esm_state_inactive(fsm_t *s, event_t *e)
case NAS_ESM_INFORMATION_RESPONSE:
{
d_trace(3, "[NAS] ESM information response : "
"UE[%s] --> ESM[%d]\n",
"UE[%s] --> ESM[PTI:%d]\n",
mme_ue->imsi_bcd, sess->pti);
rv = esm_handle_information_response(
sess, &message->esm.esm_information_response);
@ -94,7 +94,7 @@ void esm_state_inactive(fsm_t *s, event_t *e)
case NAS_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_ACCEPT:
{
d_trace(3, "[NAS] Activate default EPS bearer "
"context accept : UE[%s] --> ESM[%d]\n",
"context accept : UE[%s] --> ESM[EBI:%d]\n",
mme_ue->imsi_bcd, bearer->ebi);
if (MME_HAVE_ENB_S1U_PATH(bearer))
@ -110,7 +110,7 @@ void esm_state_inactive(fsm_t *s, event_t *e)
case NAS_ACTIVATE_DEDICATED_EPS_BEARER_CONTEXT_ACCEPT:
{
d_trace(3, "[NAS] Activate dedicated EPS bearer "
"context accept : UE[%s] --> ESM[%d]\n",
"context accept : UE[%s] --> ESM[EBI:%d]\n",
mme_ue->imsi_bcd, bearer->ebi);
if (MME_HAVE_ENB_S1U_PATH(bearer))

50
src/mme/mme_context.c
View File

@ -2481,36 +2481,21 @@ mme_bearer_t* mme_bearer_find_or_add_by_message(
d_assert(mme_ue, return NULL,);
d_assert(message, return NULL,);
if (message->esm.h.message_type == NAS_PDN_DISCONNECT_REQUEST)
{
nas_pdn_disconnect_request_t *pdn_disconnect_request =
&message->esm.pdn_disconnect_request;
nas_linked_eps_bearer_identity_t *linked_eps_bearer_identity =
&pdn_disconnect_request->linked_eps_bearer_identity;
bearer = mme_bearer_find_by_ue_ebi(mme_ue,
linked_eps_bearer_identity->eps_bearer_identity);
d_assert(bearer, return NULL,
"Invalid pti(%d) and ebi(%d)\n", pti, ebi);
sess = bearer->sess;
d_assert(sess, return NULL, "Null param");
sess->pti = pti;
return bearer;
}
pti = message->esm.h.procedure_transaction_identity;
ebi = message->esm.h.eps_bearer_identity;
d_trace(3, "mme_bearer_find_or_add_by_message() [PTI:%d, EBI:%d]\n",
pti, ebi);
if (ebi != NAS_EPS_BEARER_IDENTITY_UNASSIGNED)
{
bearer = mme_bearer_find_by_ue_ebi(mme_ue, ebi);
d_assert(bearer, return NULL,);
d_assert(bearer, return NULL, "No Bearer : [EBI:%d]", ebi);
return bearer;
}
d_assert(pti != NAS_PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED,
return NULL, );
return NULL, "Invalid param : [PTI:%d, EBI:%d]", pti, ebi);
if (message->esm.h.message_type == NAS_PDN_CONNECTIVITY_REQUEST)
{
@ -2528,16 +2513,35 @@ mme_bearer_t* mme_bearer_find_or_add_by_message(
else
sess->pti = pti;
d_assert(sess, return NULL,);
d_assert(sess, return NULL, "No Session : [PTI:%d]", pti);
}
else if (message->esm.h.message_type == NAS_PDN_DISCONNECT_REQUEST)
{
nas_pdn_disconnect_request_t *pdn_disconnect_request =
&message->esm.pdn_disconnect_request;
nas_linked_eps_bearer_identity_t *linked_eps_bearer_identity =
&pdn_disconnect_request->linked_eps_bearer_identity;
bearer = mme_bearer_find_by_ue_ebi(mme_ue,
linked_eps_bearer_identity->eps_bearer_identity);
d_assert(bearer, return NULL,
"No Bearer : [Linked-EBI:%d, PTI:%d, EBI:%d]",
linked_eps_bearer_identity->eps_bearer_identity,
pti, ebi);
sess = bearer->sess;
d_assert(sess, return NULL, "No Session : [PTI:%d]", pti);
sess->pti = pti;
return bearer;
}
else
{
sess = mme_sess_find_by_pti(mme_ue, pti);
d_assert(sess, return NULL,);
d_assert(sess, return NULL, "No Session : [PTI:%d]", pti);
}
bearer = mme_default_bearer_in_sess(sess);
d_assert(bearer, return NULL,);
d_assert(bearer, return NULL, "No Bearer : [EBI:%d]", ebi);
return bearer;
}

20
src/mme/mme_sm.c
View File

@ -172,8 +172,9 @@ void mme_state_operational(fsm_t *s, event_t *e)
enb = mme_enb_find_by_addr(addr);
core_free(addr);
d_assert(enb, break, "No eNB context");
d_assert(FSM_STATE(&enb->sm), break, "No S1AP State Machine");
d_assert(enb, pkbuf_free(pkbuf); break, "No eNB context");
d_assert(FSM_STATE(&enb->sm), pkbuf_free(pkbuf); break,
"No S1AP State Machine");
d_assert(s1ap_decode_pdu(&message, pkbuf) == CORE_OK,
pkbuf_free(pkbuf); break, "Can't decode S1AP_PDU");
@ -199,7 +200,7 @@ void mme_state_operational(fsm_t *s, event_t *e)
d_assert(pkbuf, break,);
timer = event_get_param3(e);
d_assert(timer, pkbuf_free(pkbuf);break,);
d_assert(timer, pkbuf_free(pkbuf); break,);
rv = s1ap_send_to_enb(enb, pkbuf);
d_assert(rv == CORE_OK, pkbuf_free(pkbuf),);
@ -228,7 +229,7 @@ void mme_state_operational(fsm_t *s, event_t *e)
if (!mme_ue)
{
mme_ue = mme_ue_add(enb_ue);
d_assert(mme_ue, break, "Null param");
d_assert(mme_ue, pkbuf_free(pkbuf); break, "Null param");
}
else
{
@ -248,15 +249,15 @@ void mme_state_operational(fsm_t *s, event_t *e)
h.ciphered = 0;
d_assert(
nas_security_decode(mme_ue, h, pkbuf) == CORE_OK,
pkbuf_free(pkbuf);return,
pkbuf_free(pkbuf); return,
"nas_security_decode failed");
}
}
mme_ue_associate_enb_ue(mme_ue, enb_ue);
}
d_assert(mme_ue, pkbuf_free(pkbuf);break, "No MME UE context");
d_assert(FSM_STATE(&mme_ue->sm), pkbuf_free(pkbuf);break,
d_assert(mme_ue, pkbuf_free(pkbuf); break, "No MME UE context");
d_assert(FSM_STATE(&mme_ue->sm), pkbuf_free(pkbuf); break,
"No EMM State Machine");
/* Set event */
@ -270,7 +271,6 @@ void mme_state_operational(fsm_t *s, event_t *e)
}
pkbuf_free(pkbuf);
break;
}
case MME_EVT_EMM_T3413:
@ -299,7 +299,7 @@ void mme_state_operational(fsm_t *s, event_t *e)
pkbuf_free(pkbuf); break, "Can't decode NAS_ESM");
bearer = mme_bearer_find_or_add_by_message(mme_ue, &message);
d_assert(bearer, break, "No Bearer context");
d_assert(bearer, pkbuf_free(pkbuf); break, "No Bearer context");
event_set_param1(e, (c_uintptr_t)bearer->index);
event_set_param3(e, (c_uintptr_t)&message);
@ -308,7 +308,7 @@ void mme_state_operational(fsm_t *s, event_t *e)
if (FSM_CHECK(&bearer->sm, esm_state_session_exception))
{
mme_sess_t *sess = bearer->sess;
d_assert(sess, break, "Null param");
d_assert(sess, pkbuf_free(pkbuf); break, "Null param");
mme_sess_remove(sess);
}
else if (FSM_CHECK(&bearer->sm, esm_state_bearer_exception))

4
test/rx/testpacket.c
View File

@ -1010,7 +1010,7 @@ status_t tests1ap_build_pdn_disconnectivity_request(
{
char *payload[TESTS1AP_MAX_MESSAGE] = {
"000d40380000"
"0500000005c08000 0108000800030001 00001a000b0a2732 423c53040206d206"
"0500000005c00000 0001000800030001 00001a000b0a2732 423c53040206d206"
"006440080055f501 0019d01000434006 0055f5011022",
"",
"",
@ -1151,7 +1151,7 @@ status_t tests1ap_build_activate_default_bearer_accept(
{
char *payload[TESTS1AP_MAX_MESSAGE] = {
"000d40370000"
"0500000005c08000 0107000800030001 00001a000a0927e7 f5bb400b6200c200"
"0500000005c00000 0001000800030001 00001a000a0927e7 f5bb400b6200c200"
"6440080055f50100 19d0100043400600 55f5011022",
"",
"",

4
test/testpacket.c
View File

@ -960,12 +960,12 @@ status_t tests1ap_build_pdn_connectivity_request(
{
char *payload[TESTS1AP_MAX_MESSAGE] = {
"000d40680000"
"0500000005c08000 0107000800030001 00001a003b3a277c 81dab50a0205d011"
"0500000005c00000 0001000800030001 00001a003b3a277c 81dab50a0205d011"
"281208696e746572 6e6574036e673204 6d6e6574271a8080 2110010000108106"
"0000000083060000 0000000d00000a00 006440080055f501 0019d01000434006"
"0055f5011022",
"000d40680000"
"0500000005c08000 0107000800030001 00001a003b3a2710 3fdafa0a0209d011"
"0500000005c00000 0001000800030001 00001a003b3a2710 3fdafa0a0209d011"
"281208706e746572 6e6574036e673204 6d6e6574271a8080 2110010000108106"
"0000000083060000 0000000d00000a00 006440080055f501 0019d01000434006"
"0055f5011022",

9
test/volte_test.c
View File

@ -197,8 +197,7 @@ static void volte_test1(abts_case *tc, void *data)
core_sleep(time_from_msec(300));
/* Send Initial Context Setup Response */
rv = tests1ap_build_initial_context_setup_response(&sendbuf,
16777373, 1, 5, 1);
rv = tests1ap_build_initial_context_setup_response(&sendbuf, 1, 1, 5, 1);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
rv = tests1ap_enb_send(sock, sendbuf);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
@ -221,8 +220,6 @@ static void volte_test1(abts_case *tc, void *data)
rv = tests1ap_enb_send(sock, sendbuf);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
core_sleep(time_from_msec(300));
/* Receive E-RAB Setup Request +
* Activate default EPS bearer context request */
recvbuf = pkbuf_alloc(0, MAX_SDU_LEN);
@ -231,7 +228,7 @@ static void volte_test1(abts_case *tc, void *data)
pkbuf_free(recvbuf);
/* Send E-RAB Setup Response */
rv = tests1ap_build_e_rab_setup_response(&sendbuf, 33554492, 1, 6, 2);
rv = tests1ap_build_e_rab_setup_response(&sendbuf, 1, 1, 6, 2);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
rv = tests1ap_enb_send(sock, sendbuf);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
@ -260,7 +257,7 @@ static void volte_test1(abts_case *tc, void *data)
core_sleep(time_from_msec(300));
/* Send E-RAB Setup Response */
rv = tests1ap_build_e_rab_setup_response(&sendbuf, 33554492, 1, 7, 3);
rv = tests1ap_build_e_rab_setup_response(&sendbuf, 1, 1, 7, 3);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
rv = tests1ap_enb_send(sock, sendbuf);
ABTS_INT_EQUAL(tc, CORE_OK, rv);