From c096cce57189a9cc473481bed3440193630d387b Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Fri, 9 Feb 2018 23:14:30 +0900 Subject: [PATCH] update print-out --- src/mme/emm_build.c | 2 +- src/mme/esm_sm.c | 26 ++++++++++++++------------ src/mme/mme_fd_path.c | 8 ++++---- src/pcrf/pcrf_gx_path.c | 4 ++-- src/pcrf/pcrf_rx_path.c | 4 ++-- src/pgw/pgw_fd_path.c | 4 ++-- 6 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/mme/emm_build.c b/src/mme/emm_build.c index 91b4bf7df..e6ae7ee02 100644 --- a/src/mme/emm_build.c +++ b/src/mme/emm_build.c @@ -57,7 +57,7 @@ status_t emm_build_attach_accept( attach_accept->esm_message_container.length = esmbuf->len; d_trace(5, " %s GUTI[G:%d,C:%d,M_TMSI:0x%x] IMSI:[%s]\n", - mme_ue->guti_present ? "# Present #" : "# Not Present #", + mme_ue->guti_present ? "[V]" : "[N]", mme_ue->guti.mme_gid, mme_ue->guti.mme_code, mme_ue->guti.m_tmsi, mme_ue->imsi_bcd); if (mme_ue->guti_present) diff --git a/src/mme/esm_sm.c b/src/mme/esm_sm.c index e05c70288..ff9468c02 100644 --- a/src/mme/esm_sm.c +++ b/src/mme/esm_sm.c @@ -203,9 +203,9 @@ void esm_state_active(fsm_t *s, event_t *e) } case NAS_PDN_DISCONNECT_REQUEST: { - d_trace(3, "[NAS] PDN disconnect request : " - "UE[%s] --> ESM[EBI:%d]\n", - mme_ue->imsi_bcd, bearer->ebi); + d_trace(3, "[ESM] PDN disconnect request\n"); + d_trace(5, " IMSI[%s] PTI[%d] EBI[%d]\n", + mme_ue->imsi_bcd, sess->pti, bearer->ebi); if (MME_HAVE_SGW_S1U_PATH(sess)) { rv = mme_gtp_send_delete_session_request(sess); @@ -223,9 +223,9 @@ void esm_state_active(fsm_t *s, event_t *e) } case NAS_MODIFY_EPS_BEARER_CONTEXT_ACCEPT: { - d_trace(3, "[NAS] Modify EPS bearer context accept : " - "UE[%s] --> ESM[EBI:%d] in ACTIVE state\n", - mme_ue->imsi_bcd, bearer->ebi); + d_trace(3, "[ESM] Modify EPS bearer context accept\n"); + d_trace(5, " IMSI[%s] PTI[%d] EBI[%d]\n", + mme_ue->imsi_bcd, sess->pti, bearer->ebi); rv = mme_gtp_send_update_bearer_response(bearer); d_assert(rv == CORE_OK, return, @@ -234,9 +234,10 @@ void esm_state_active(fsm_t *s, event_t *e) } case NAS_DEACTIVATE_EPS_BEARER_CONTEXT_ACCEPT: { - d_trace(3, "[NAS] Deactivate EPS bearer context accept : " - "UE[%s] --> ESM[EBI:%d] in ACTIVE state\n", - mme_ue->imsi_bcd, bearer->ebi); + d_trace(3, "[ESM] [A] Deactivate EPS bearer " + "context accept\n"); + d_trace(5, " IMSI[%s] PTI[%d] EBI[%d]\n", + mme_ue->imsi_bcd, sess->pti, bearer->ebi); rv = mme_gtp_send_delete_bearer_response(bearer); d_assert(rv == CORE_OK, return, "mme_gtp_send_delete_session_request error"); @@ -298,9 +299,10 @@ void esm_state_pdn_will_disconnect(fsm_t *s, event_t *e) { case NAS_DEACTIVATE_EPS_BEARER_CONTEXT_ACCEPT: { - d_trace(3, "[NAS] Deactivate EPS bearer context accept : " - "UE[%s] --> ESM[EBI:%d] in PDN WILL DISCONNECT state\n", - mme_ue->imsi_bcd, bearer->ebi); + d_trace(3, "[ESM] [D] Deactivate EPS bearer " + "context accept\n"); + d_trace(5, " IMSI[%s] PTI[%d] EBI[%d]\n", + mme_ue->imsi_bcd, sess->pti, bearer->ebi); FSM_TRAN(s, esm_state_pdn_did_disconnect); break; } diff --git a/src/mme/mme_fd_path.c b/src/mme/mme_fd_path.c index 522def6bf..2caf16089 100644 --- a/src/mme/mme_fd_path.c +++ b/src/mme/mme_fd_path.c @@ -270,7 +270,7 @@ static void mme_s6a_aia_cb(void *data, struct msg **msg) { ret = fd_msg_avp_hdr(avp, &hdr); d_assert(ret == 0, return,); - d_trace(5, " From '%.*s' ", + d_trace(5, " From '%.*s'\n", (int)hdr->avp_value->os.len, hdr->avp_value->os.data); } else @@ -286,7 +286,7 @@ static void mme_s6a_aia_cb(void *data, struct msg **msg) { ret = fd_msg_avp_hdr(avp, &hdr); d_assert(ret == 0, return,); - d_trace(5, "('%.*s') ", + d_trace(5, " ('%.*s')\n", (int)hdr->avp_value->os.len, hdr->avp_value->os.data); } else @@ -668,7 +668,7 @@ static void mme_s6a_ula_cb(void *data, struct msg **msg) { ret = fd_msg_avp_hdr(avp, &hdr); d_assert(ret == 0, return,); - d_trace(5, " From '%.*s' ", + d_trace(5, " From '%.*s'\n", (int)hdr->avp_value->os.len, hdr->avp_value->os.data); } else @@ -684,7 +684,7 @@ static void mme_s6a_ula_cb(void *data, struct msg **msg) { ret = fd_msg_avp_hdr(avp, &hdr); d_assert(ret == 0, return,); - d_trace(5, "('%.*s') ", + d_trace(5, " ('%.*s')\n", (int)hdr->avp_value->os.len, hdr->avp_value->os.data); } else diff --git a/src/pcrf/pcrf_gx_path.c b/src/pcrf/pcrf_gx_path.c index aa75541fc..3e099fcd4 100644 --- a/src/pcrf/pcrf_gx_path.c +++ b/src/pcrf/pcrf_gx_path.c @@ -1097,7 +1097,7 @@ static void pcrf_gx_raa_cb(void *data, struct msg **msg) { ret = fd_msg_avp_hdr(avp, &hdr); d_assert(ret == 0, return,); - d_trace(5, " From '%.*s' ", + d_trace(5, " From '%.*s'\n", (int)hdr->avp_value->os.len, hdr->avp_value->os.data); } else @@ -1113,7 +1113,7 @@ static void pcrf_gx_raa_cb(void *data, struct msg **msg) { ret = fd_msg_avp_hdr(avp, &hdr); d_assert(ret == 0, return,); - d_trace(5, "('%.*s') ", + d_trace(5, " ('%.*s')\n", (int)hdr->avp_value->os.len, hdr->avp_value->os.data); } else diff --git a/src/pcrf/pcrf_rx_path.c b/src/pcrf/pcrf_rx_path.c index 6827a632f..f7c220694 100644 --- a/src/pcrf/pcrf_rx_path.c +++ b/src/pcrf/pcrf_rx_path.c @@ -606,7 +606,7 @@ static void pcrf_rx_asa_cb(void *data, struct msg **msg) { ret = fd_msg_avp_hdr(avp, &hdr); d_assert(ret == 0, return,); - d_trace(5, " From '%.*s' ", + d_trace(5, " From '%.*s'\n", (int)hdr->avp_value->os.len, hdr->avp_value->os.data); } else @@ -621,7 +621,7 @@ static void pcrf_rx_asa_cb(void *data, struct msg **msg) { ret = fd_msg_avp_hdr(avp, &hdr); d_assert(ret == 0, return,); - d_trace(5, "('%.*s') ", + d_trace(5, " ('%.*s')\n", (int)hdr->avp_value->os.len, hdr->avp_value->os.data); } else diff --git a/src/pgw/pgw_fd_path.c b/src/pgw/pgw_fd_path.c index d3c81463d..6e939af3d 100644 --- a/src/pgw/pgw_fd_path.c +++ b/src/pgw/pgw_fd_path.c @@ -531,7 +531,7 @@ static void pgw_gx_cca_cb(void *data, struct msg **msg) { ret = fd_msg_avp_hdr(avp, &hdr); d_assert(ret == 0, return,); - d_trace(5, " From '%.*s' ", + d_trace(5, " From '%.*s'\n", (int)hdr->avp_value->os.len, hdr->avp_value->os.data); } else @@ -547,7 +547,7 @@ static void pgw_gx_cca_cb(void *data, struct msg **msg) { ret = fd_msg_avp_hdr(avp, &hdr); d_assert(ret == 0, return,); - d_trace(5, "('%.*s') ", + d_trace(5, " ('%.*s')\n", (int)hdr->avp_value->os.len, hdr->avp_value->os.data); } else