diff --git a/lib/gtp/gtp_xact.c b/lib/gtp/gtp_xact.c index 43d0d4a7bd..fb0fadcc4e 100644 --- a/lib/gtp/gtp_xact.c +++ b/lib/gtp/gtp_xact.c @@ -64,7 +64,7 @@ status_t gtp_xact_final(void) if (pool_used(>p_xact_pool)) d_error("%d not freed in gtp_xact_pool[%d] of GTP Transaction", pool_used(>p_xact_pool), pool_size(>p_xact_pool)); - d_trace(7, "%d not freed in gtp_xact_pool[%d] of GTP Transaction\n", + d_trace(15, "%d not freed in gtp_xact_pool[%d] of GTP Transaction\n", pool_used(>p_xact_pool), pool_size(>p_xact_pool)); index_final(>p_xact_pool); @@ -113,7 +113,7 @@ gtp_xact_t *gtp_xact_local_create( rv = gtp_xact_update_tx(xact, hdesc, pkbuf); d_assert(rv == CORE_OK, return NULL, "Update Tx failed"); - d_trace(7, "[%d] %s Create peer [%s]:%d\n", + d_trace(15, "[%d] %s Create peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", CORE_ADDR(sock_remote_addr(gnode->sock), buf), @@ -157,7 +157,7 @@ gtp_xact_t *gtp_xact_remote_create(gtp_node_t *gnode, c_uint32_t sqn) list_append(xact->org == GTP_LOCAL_ORIGINATOR ? &xact->gnode->local_list : &xact->gnode->remote_list, xact); - d_trace(7, "[%d] %s Create peer [%s]:%d\n", + d_trace(15, "[%d] %s Create peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", CORE_ADDR(sock_remote_addr(gnode->sock), buf), @@ -196,7 +196,7 @@ status_t gtp_xact_update_tx(gtp_xact_t *xact, d_assert(hdesc, return CORE_ERROR, "Null param"); d_assert(pkbuf, return CORE_ERROR, "Null param"); - d_trace(7, "[%d] %s UPD TX-%d peer [%s]:%d\n", + d_trace(15, "[%d] %s UPD TX-%d peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", hdesc->type, @@ -289,7 +289,7 @@ status_t gtp_xact_update_rx(gtp_xact_t *xact, c_uint8_t type) char buf[CORE_ADDRSTRLEN]; gtp_xact_stage_t stage; - d_trace(7, "[%d] %s UPD RX-%d peer [%s]:%d\n", + d_trace(15, "[%d] %s UPD RX-%d peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", type, @@ -494,7 +494,7 @@ status_t gtp_xact_commit(gtp_xact_t *xact) d_assert(xact, return CORE_ERROR, "Null param"); d_assert(xact->gnode, return CORE_ERROR, "Null param"); - d_trace(7, "[%d] %s Commit peer [%s]:%d\n", + d_trace(15, "[%d] %s Commit peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", CORE_ADDR(sock_remote_addr(xact->gnode->sock), buf), @@ -614,7 +614,7 @@ status_t gtp_xact_timeout(index_t index, c_uintptr_t event) if (event == g_response_event) { - d_trace(7, "[%d] %s Response Timeout " + d_trace(15, "[%d] %s Response Timeout " "for step %d type %d peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", @@ -649,7 +649,7 @@ status_t gtp_xact_timeout(index_t index, c_uintptr_t event) } else if (event == g_holding_event) { - d_trace(7, "[%d] %s Holding Timeout " + d_trace(15, "[%d] %s Holding Timeout " "for step %d type %d peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", @@ -664,7 +664,7 @@ status_t gtp_xact_timeout(index_t index, c_uintptr_t event) } else { - d_trace(7, "[%d] %s Delete Transaction " + d_trace(15, "[%d] %s Delete Transaction " "for step %d type %d peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", @@ -697,7 +697,7 @@ status_t gtp_xact_receive( new = gtp_xact_remote_create(gnode, h->sqn); d_assert(new, return CORE_ERROR, "Null param"); - d_trace(7, "[%d] %s Receive peer [%s]:%d\n", + d_trace(15, "[%d] %s Receive peer [%s]:%d\n", new->xid, new->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", CORE_ADDR(sock_remote_addr(gnode->sock), buf), @@ -805,7 +805,7 @@ gtp_xact_t *gtp_xact_find_by_xid( if (xact) { - d_trace(7, "[%d] %s Find peer [%s]:%d\n", + d_trace(15, "[%d] %s Find peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", CORE_ADDR(sock_remote_addr(gnode->sock), buf), @@ -846,7 +846,7 @@ static status_t gtp_xact_delete(gtp_xact_t *xact) d_assert(xact, , "Null param"); d_assert(xact->gnode, , "Null param"); - d_trace(7, "[%d] %s Delete peer [%s]:%d\n", + d_trace(15, "[%d] %s Delete peer [%s]:%d\n", xact->xid, xact->org == GTP_LOCAL_ORIGINATOR ? "LOCAL " : "REMOTE", CORE_ADDR(sock_remote_addr(xact->gnode->sock), buf), diff --git a/src/mme/mme_context.c b/src/mme/mme_context.c index 4ee3b45e6b..5625c1b37e 100644 --- a/src/mme/mme_context.c +++ b/src/mme/mme_context.c @@ -95,7 +95,7 @@ status_t mme_context_final() d_error("%d not freed in M-TMSI pool[%d] in MME-Context", pool_used(&self.m_tmsi), pool_size(&self.m_tmsi)); } - d_trace(5, "%d not freed in M-TMSI pool[%d] in MME-Context\n", + d_trace(7, "%d not freed in M-TMSI pool[%d] in MME-Context\n", pool_used(&self.m_tmsi), pool_size(&self.m_tmsi)); d_assert(self.enb_sock_hash, , "Null param"); @@ -2005,11 +2005,11 @@ mme_ue_t* mme_ue_find_by_message(nas_message_t *message) mme_ue = mme_ue_find_by_imsi_bcd(imsi_bcd); if (mme_ue) { - d_trace(3,"known UE by IMSI[%s]\n", imsi_bcd); + d_trace(7, "known UE by IMSI[%s]\n", imsi_bcd); } else { - d_trace(3,"Unknown UE by IMSI[%s]\n", imsi_bcd); + d_trace(7, "Unknown UE by IMSI[%s]\n", imsi_bcd); } break; } @@ -2027,7 +2027,7 @@ mme_ue_t* mme_ue_find_by_message(nas_message_t *message) mme_ue = mme_ue_find_by_guti(&guti); if (mme_ue) { - d_trace(3, "Known UE by GUTI[G:%d,C:%d,M_TMSI:0x%x]\n", + d_trace(7, "Known UE by GUTI[G:%d,C:%d,M_TMSI:0x%x]\n", guti.mme_gid, guti.mme_code, guti.m_tmsi); @@ -2079,7 +2079,7 @@ mme_ue_t* mme_ue_find_by_message(nas_message_t *message) mme_ue = mme_ue_find_by_guti(&guti); if (mme_ue) { - d_trace(3, "Known UE by GUTI[G:%d,C:%d,M_TMSI:0x%x]\n", + d_trace(7, "Known UE by GUTI[G:%d,C:%d,M_TMSI:0x%x]\n", guti.mme_gid, guti.mme_code, guti.m_tmsi); @@ -2505,7 +2505,7 @@ mme_bearer_t* mme_bearer_find_or_add_by_message( 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", + d_trace(7, "mme_bearer_find_or_add_by_message() [PTI:%d, EBI:%d]\n", pti, ebi); if (ebi != NAS_EPS_BEARER_IDENTITY_UNASSIGNED) @@ -2706,7 +2706,7 @@ status_t mme_m_tmsi_pool_generate() int i, j; int index = 0; - d_trace(3, "M-TMSI Pool try to generate...\n"); + d_trace(7, "M-TMSI Pool try to generate...\n"); for (i = 0; index < MAX_POOL_OF_UE; i++) { mme_m_tmsi_t *m_tmsi = NULL; @@ -2729,7 +2729,7 @@ status_t mme_m_tmsi_pool_generate() index++; } self.m_tmsi.size = index; - d_trace(3, "M-TMSI Pool generate...done\n"); + d_trace(7, "M-TMSI Pool generate...done\n"); return CORE_OK; } diff --git a/src/mme/s1ap_usrsctp.c b/src/mme/s1ap_usrsctp.c index b361118e4a..6429a7df4f 100644 --- a/src/mme/s1ap_usrsctp.c +++ b/src/mme/s1ap_usrsctp.c @@ -97,7 +97,7 @@ status_t sctp_server(sock_id *new, int type, c_sockaddr_t *sa_list) { if (s1ap_usrsctp_bind(*new, addr) == CORE_OK) { - d_trace(3, "sctp_server [%s]:%d\n", + d_trace(7, "sctp_server [%s]:%d\n", CORE_ADDR(addr, buf), CORE_PORT(addr)); break; } @@ -136,7 +136,7 @@ status_t sctp_client(sock_id *new, int type, c_sockaddr_t *sa_list) { if (s1ap_usrsctp_connect(*new, addr) == CORE_OK) { - d_trace(3, "sctp_client [%s]:%d\n", + d_trace(7, "sctp_client [%s]:%d\n", CORE_ADDR(addr, buf), CORE_PORT(addr)); break; } @@ -174,8 +174,8 @@ status_t s1ap_send(sock_id id, pkbuf_t *pkbuf, c_sockaddr_t *addr) (void *)&sndinfo, (socklen_t)sizeof(struct sctp_sndinfo), SCTP_SENDV_SNDINFO, 0); - d_trace(10,"Sent %d->%d bytes\n", pkbuf->len, sent); - d_trace_hex(10, pkbuf->payload, pkbuf->len); + d_trace(50, "[S1AP] Sent %d bytes : ", sent); + d_trace_hex(50, pkbuf->payload, pkbuf->len); if (sent < 0 || sent != pkbuf->len) { d_error("sent : %d, pkbuf->len : %d\n", sent, pkbuf->len); @@ -292,7 +292,7 @@ static status_t s1ap_usrsctp_bind(sock_id id, c_sockaddr_t *sa) return CORE_ERROR; } - d_trace(3, "usrsctp_bind [%s]:%d\n", CORE_ADDR(sa, buf), CORE_PORT(sa)); + d_trace(7, "usrsctp_bind [%s]:%d\n", CORE_ADDR(sa, buf), CORE_PORT(sa)); return CORE_OK; } @@ -315,7 +315,7 @@ static status_t s1ap_usrsctp_connect(sock_id id, c_sockaddr_t *sa) return CORE_ERROR; } - d_trace(3, "usrsctp_connect [%s]:%d\n", CORE_ADDR(sa, buf), CORE_PORT(sa)); + d_trace(7, "usrsctp_connect [%s]:%d\n", CORE_ADDR(sa, buf), CORE_PORT(sa)); return CORE_OK; } @@ -354,7 +354,7 @@ static int s1ap_usrsctp_recv_handler(struct socket *sock, switch(not->sn_header.sn_type) { case SCTP_ASSOC_CHANGE : - d_trace(3, "SCTP_ASSOC_CHANGE" + d_trace(7, "SCTP_ASSOC_CHANGE" "(type:0x%x, flags:0x%x, state:0x%x)\n", not->sn_assoc_change.sac_type, not->sn_assoc_change.sac_flags, diff --git a/src/pgw/pgw_context.c b/src/pgw/pgw_context.c index 80d2a3fb2d..86a0c4b2e7 100644 --- a/src/pgw/pgw_context.c +++ b/src/pgw/pgw_context.c @@ -84,7 +84,7 @@ status_t pgw_context_final() if (index_used(&pgw_sess_pool)) d_error("%d not freed in pgw_sess_pool[%d] in PGW-Context", index_used(&pgw_sess_pool), index_size(&pgw_sess_pool)); - d_trace(5, "%d not freed in pgw_sess_pool[%d] in PGW-Context\n", + d_trace(7, "%d not freed in pgw_sess_pool[%d] in PGW-Context\n", index_used(&pgw_sess_pool), index_size(&pgw_sess_pool)); pgw_dev_remove_all(); @@ -1125,7 +1125,7 @@ pgw_sess_t *pgw_sess_add_by_message(gtp_message_t *message) apn_parse(apn, req->access_point_name.data, req->access_point_name.len); - d_trace(3, "pgw_sess_add_by_message() [APN:%s, PDN:%d, EDI:%d]\n", + d_trace(7, "pgw_sess_add_by_message() [APN:%s, PDN:%d, EDI:%d]\n", apn, req->pdn_type.u8, req->bearer_contexts_to_be_created.eps_bearer_id.u8); @@ -1669,7 +1669,7 @@ status_t pgw_subnet_remove(pgw_subnet_t *subnet) d_warn("%d not freed in ue_ip_pool[%d] in PGW-Context", pool_used(&subnet->pool), pool_size(&subnet->pool)); } - d_trace(5, "%d not freed in ue_ip_pool[%d] in PGW-Context\n", + d_trace(7, "%d not freed in ue_ip_pool[%d] in PGW-Context\n", pool_used(&subnet->pool), pool_size(&subnet->pool)); pool_final(&subnet->pool); diff --git a/src/sgw/sgw_context.c b/src/sgw/sgw_context.c index 0baa805263..3771edfb92 100644 --- a/src/sgw/sgw_context.c +++ b/src/sgw/sgw_context.c @@ -542,8 +542,8 @@ sgw_ue_t *sgw_ue_add_by_message(gtp_message_t *message) return NULL; } - d_trace(3, "sgw_ue_add_by_message() - IMSI "); - d_trace_hex(3, req->imsi.data, req->imsi.len); + d_trace(7, "sgw_ue_add_by_message() - IMSI "); + d_trace_hex(7, req->imsi.data, req->imsi.len); sgw_ue = sgw_ue_find_by_imsi(req->imsi.data, req->imsi.len); if (!sgw_ue)