From d02507e90ad4a1e02a323ab31e2a0fe09b746834 Mon Sep 17 00:00:00 2001 From: Kenny Barlee Date: Fri, 17 Dec 2021 02:37:36 +0000 Subject: [PATCH] print cellID in hex for consistency (#1292) --- src/mme/emm-build.c | 4 ++-- src/mme/emm-handler.c | 12 ++++++------ src/mme/s1ap-handler.c | 8 ++++---- src/sgwc/s11-handler.c | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/mme/emm-build.c b/src/mme/emm-build.c index 4c404bdd7..93980c467 100644 --- a/src/mme/emm-build.c +++ b/src/mme/emm-build.c @@ -61,7 +61,7 @@ ogs_pkbuf_t *emm_build_attach_accept( ogs_debug(" TAI[PLMN_ID:%06x,TAC:%d]", ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id), mme_ue->tai.tac); - ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:%d]", + ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:0x%x]", ogs_plmn_id_hexdump(&mme_ue->e_cgi.plmn_id), mme_ue->e_cgi.cell_id); served_tai_index = mme_find_served_tai(&mme_ue->tai); @@ -430,7 +430,7 @@ ogs_pkbuf_t *emm_build_tau_accept(mme_ue_t *mme_ue) ogs_debug(" TAI[PLMN_ID:%06x,TAC:%d]", ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id), mme_ue->tai.tac); - ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:%d]", + ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:0x%x]", ogs_plmn_id_hexdump(&mme_ue->e_cgi.plmn_id), mme_ue->e_cgi.cell_id); served_tai_index = mme_find_served_tai(&mme_ue->tai); diff --git a/src/mme/emm-handler.c b/src/mme/emm-handler.c index 84c57d18a..54216bea4 100644 --- a/src/mme/emm-handler.c +++ b/src/mme/emm-handler.c @@ -90,12 +90,12 @@ int emm_handle_attach_request(mme_ue_t *mme_ue, ogs_debug(" OLD TAI[PLMN_ID:%06x,TAC:%d]", ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id), mme_ue->tai.tac); - ogs_debug(" OLD E_CGI[PLMN_ID:%06x,CELL_ID:%d]", + ogs_debug(" OLD E_CGI[PLMN_ID:%06x,CELL_ID:0x%x]", ogs_plmn_id_hexdump(&mme_ue->e_cgi.plmn_id), mme_ue->e_cgi.cell_id); ogs_debug(" TAI[PLMN_ID:%06x,TAC:%d]", ogs_plmn_id_hexdump(&enb_ue->saved.tai.plmn_id), enb_ue->saved.tai.tac); - ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:%d]", + ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:0x%x]", ogs_plmn_id_hexdump(&enb_ue->saved.e_cgi.plmn_id), enb_ue->saved.e_cgi.cell_id); @@ -483,12 +483,12 @@ int emm_handle_tau_request(mme_ue_t *mme_ue, ogs_debug(" OLD TAI[PLMN_ID:%06x,TAC:%d]", ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id), mme_ue->tai.tac); - ogs_debug(" OLD E_CGI[PLMN_ID:%06x,CELL_ID:%d]", + ogs_debug(" OLD E_CGI[PLMN_ID:%06x,CELL_ID:0x%x]", ogs_plmn_id_hexdump(&mme_ue->e_cgi.plmn_id), mme_ue->e_cgi.cell_id); ogs_debug(" TAI[PLMN_ID:%06x,TAC:%d]", ogs_plmn_id_hexdump(&enb_ue->saved.tai.plmn_id), enb_ue->saved.tai.tac); - ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:%d]", + ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:0x%x]", ogs_plmn_id_hexdump(&enb_ue->saved.e_cgi.plmn_id), enb_ue->saved.e_cgi.cell_id); @@ -601,12 +601,12 @@ int emm_handle_extended_service_request(mme_ue_t *mme_ue, ogs_debug(" OLD TAI[PLMN_ID:%06x,TAC:%d]", ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id), mme_ue->tai.tac); - ogs_debug(" OLD E_CGI[PLMN_ID:%06x,CELL_ID:%d]", + ogs_debug(" OLD E_CGI[PLMN_ID:%06x,CELL_ID:0x%x]", ogs_plmn_id_hexdump(&mme_ue->e_cgi.plmn_id), mme_ue->e_cgi.cell_id); ogs_debug(" TAI[PLMN_ID:%06x,TAC:%d]", ogs_plmn_id_hexdump(&enb_ue->saved.tai.plmn_id), enb_ue->saved.tai.tac); - ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:%d]", + ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:0x%x]", ogs_plmn_id_hexdump(&enb_ue->saved.e_cgi.plmn_id), enb_ue->saved.e_cgi.cell_id); diff --git a/src/mme/s1ap-handler.c b/src/mme/s1ap-handler.c index eefa1346d..91e471603 100644 --- a/src/mme/s1ap-handler.c +++ b/src/mme/s1ap-handler.c @@ -1767,7 +1767,7 @@ void s1ap_handle_path_switch_request( ogs_info(" OLD TAI[PLMN_ID:%06x,TAC:%d]", ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id), mme_ue->tai.tac); - ogs_info(" OLD E_CGI[PLMN_ID:%06x,CELL_ID:%d]", + ogs_info(" OLD E_CGI[PLMN_ID:%06x,CELL_ID:0x%x]", ogs_plmn_id_hexdump(&mme_ue->e_cgi.plmn_id), mme_ue->e_cgi.cell_id); @@ -1794,7 +1794,7 @@ void s1ap_handle_path_switch_request( ogs_info(" TAI[PLMN_ID:%06x,TAC:%d]", ogs_plmn_id_hexdump(&enb_ue->saved.tai.plmn_id), enb_ue->saved.tai.tac); - ogs_info(" E_CGI[PLMN_ID:%06x,CELL_ID:%d]", + ogs_info(" E_CGI[PLMN_ID:%06x,CELL_ID:0x%x]", ogs_plmn_id_hexdump(&enb_ue->saved.e_cgi.plmn_id), enb_ue->saved.e_cgi.cell_id); @@ -2787,13 +2787,13 @@ void s1ap_handle_handover_notification( ogs_debug(" OLD TAI[PLMN_ID:%06x,TAC:%d]", ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id), mme_ue->tai.tac); - ogs_debug(" OLD E_CGI[PLMN_ID:%06x,CELL_ID:%d]", + ogs_debug(" OLD E_CGI[PLMN_ID:%06x,CELL_ID:0x%x]", ogs_plmn_id_hexdump(&mme_ue->e_cgi.plmn_id), mme_ue->e_cgi.cell_id); ogs_debug(" TAI[PLMN_ID:%06x,TAC:%d]", ogs_plmn_id_hexdump(&target_ue->saved.tai.plmn_id), target_ue->saved.tai.tac); - ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:%d]", + ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:0x%x]", ogs_plmn_id_hexdump(&target_ue->saved.e_cgi.plmn_id), target_ue->saved.e_cgi.cell_id); diff --git a/src/sgwc/s11-handler.c b/src/sgwc/s11-handler.c index f31b1b0d2..7a5a64cee 100644 --- a/src/sgwc/s11-handler.c +++ b/src/sgwc/s11-handler.c @@ -213,7 +213,7 @@ void sgwc_s11_handle_create_session_request( ogs_debug(" TAI[PLMN_ID:%06x,TAC:%d]", ogs_plmn_id_hexdump(&sgwc_ue->e_tai.plmn_id), sgwc_ue->e_tai.tac); - ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:%d]", + ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:0x%x]", ogs_plmn_id_hexdump(&sgwc_ue->e_cgi.plmn_id), sgwc_ue->e_cgi.cell_id); @@ -368,7 +368,7 @@ void sgwc_s11_handle_modify_bearer_request( ogs_debug(" TAI[PLMN_ID:%06x,TAC:%d]", ogs_plmn_id_hexdump(&sgwc_ue->e_tai.plmn_id), sgwc_ue->e_tai.tac); - ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:%d]", + ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:0x%x]", ogs_plmn_id_hexdump(&sgwc_ue->e_cgi.plmn_id), sgwc_ue->e_cgi.cell_id); } @@ -639,7 +639,7 @@ void sgwc_s11_handle_create_bearer_response( ogs_debug(" TAI[PLMN_ID:%06x,TAC:%d]", ogs_plmn_id_hexdump(&sgwc_ue->e_tai.plmn_id), sgwc_ue->e_tai.tac); - ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:%d]", + ogs_debug(" E_CGI[PLMN_ID:%06x,CELL_ID:0x%x]", ogs_plmn_id_hexdump(&sgwc_ue->e_cgi.plmn_id), sgwc_ue->e_cgi.cell_id);