From 721f5e212c2a8e0bba431557da0518fbc5f42a2f Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Sun, 25 Sep 2022 19:16:32 +0900 Subject: [PATCH] [GTP] Changes the print message (#1772) --- src/mme/mme-s11-handler.c | 16 ++++++++-------- src/sgwc/s11-handler.c | 14 +++++++------- src/sgwc/s5c-handler.c | 8 ++++---- src/smf/n4-handler.c | 2 +- src/smf/s5c-handler.c | 14 +++++++------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/mme/mme-s11-handler.c b/src/mme/mme-s11-handler.c index e3a06a569..c6febf92b 100644 --- a/src/mme/mme-s11-handler.c +++ b/src/mme/mme-s11-handler.c @@ -220,7 +220,7 @@ void mme_s11_handle_create_session_response( ogs_assert(cause); cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { - ogs_error("GTP Failed [Bearer-CAUSE:%d]", cause_value); + ogs_error("GTP Bearer Cause [VALUE:%d]", cause_value); if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) { ogs_error("[%s] Attach reject", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, @@ -240,7 +240,7 @@ void mme_s11_handle_create_session_response( OGS_GTP2_CAUSE_NEW_PDN_TYPE_DUE_TO_NETWORK_PREFERENCE && cause_value != OGS_GTP2_CAUSE_NEW_PDN_TYPE_DUE_TO_SINGLE_ADDRESS_BEARER_ONLY) { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) { ogs_error("[%s] Attach reject", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, @@ -467,7 +467,7 @@ void mme_s11_handle_modify_bearer_response( ogs_assert(cause); cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); mme_send_delete_session_or_mme_ue_context_release(mme_ue); return; } @@ -548,7 +548,7 @@ void mme_s11_handle_delete_session_response( cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) - ogs_error("GTP Failed [CAUSE:%d] - Ignored", cause_value); + ogs_error("GTP Cause [Value:%d] - Ignored", cause_value); } /******************** @@ -1143,7 +1143,7 @@ void mme_s11_handle_release_access_bearers_response( cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) - ogs_error("GTP Failed [CAUSE:%d, ACTION:%d]", cause_value, action); + ogs_error("GTP Cause [Value:%d, ACTION:%d]", cause_value, action); } /******************** @@ -1455,7 +1455,7 @@ void mme_s11_handle_create_indirect_data_forwarding_tunnel_response( ogs_assert(cause); cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); mme_send_delete_session_or_mme_ue_context_release(mme_ue); return; } @@ -1571,7 +1571,7 @@ void mme_s11_handle_delete_indirect_data_forwarding_tunnel_response( ogs_assert(cause); cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); mme_send_delete_session_or_mme_ue_context_release(mme_ue); return; } @@ -1639,7 +1639,7 @@ void mme_s11_handle_bearer_resource_failure_indication( ogs_assert(cause); cause_value = cause->value; - ogs_warn("GTP Failed [CAUSE:%d] - Ignored", cause_value); + ogs_warn("GTP Cause [Value:%d] - Ignored", cause_value); } else { ogs_error("No Cause"); } diff --git a/src/sgwc/s11-handler.c b/src/sgwc/s11-handler.c index 5fea1f8e5..3629700ba 100644 --- a/src/sgwc/s11-handler.c +++ b/src/sgwc/s11-handler.c @@ -766,7 +766,7 @@ void sgwc_s11_handle_create_bearer_response( ogs_assert(cause); cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); ogs_assert(OGS_OK == sgwc_pfcp_send_bearer_modification_request( bearer, NULL, NULL, @@ -919,7 +919,7 @@ void sgwc_s11_handle_update_bearer_response( ogs_assert(cause); cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { - ogs_error("GTP Failed [Bearer-CAUSE:%d]", cause_value); + ogs_error("GTP Bearer Cause [VALUE:%d]", cause_value); ogs_gtp_send_error_message(s5c_xact, sess ? sess->pgw_s5c_teid : 0, OGS_GTP2_UPDATE_BEARER_RESPONSE_TYPE, cause_value); return; @@ -929,7 +929,7 @@ void sgwc_s11_handle_update_bearer_response( ogs_assert(cause); cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); ogs_gtp_send_error_message(s5c_xact, sess ? sess->pgw_s5c_teid : 0, OGS_GTP2_UPDATE_BEARER_RESPONSE_TYPE, cause_value); return; @@ -1022,7 +1022,7 @@ void sgwc_s11_handle_delete_bearer_response( cause_value = cause->value; if (cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { } else { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); } } else { ogs_error("No Cause"); @@ -1062,13 +1062,13 @@ void sgwc_s11_handle_delete_bearer_response( if (cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { } else { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); } } else { ogs_error("No Cause"); } } else { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); } } else { ogs_error("No Cause"); @@ -1172,7 +1172,7 @@ void sgwc_s11_handle_downlink_data_notification_ack( cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) - ogs_warn("GTP Failed [CAUSE:%d] - PFCP_CAUSE[%d]", + ogs_warn("GTP Cause [Value:%d] - PFCP_CAUSE[%d]", cause_value, pfcp_cause_from_gtp(cause_value)); } else { ogs_error("No Cause"); diff --git a/src/sgwc/s5c-handler.c b/src/sgwc/s5c-handler.c index aea8943ce..1971e33ab 100644 --- a/src/sgwc/s5c-handler.c +++ b/src/sgwc/s5c-handler.c @@ -169,7 +169,7 @@ void sgwc_s5c_handle_create_session_response( ogs_assert(cause); cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { - ogs_error("GTP Failed [Bearer-CAUSE:%d]", cause_value); + ogs_error("GTP Bearer Cause [VALUE:%d]", cause_value); ogs_gtp_send_error_message( s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0, OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value); @@ -186,7 +186,7 @@ void sgwc_s5c_handle_create_session_response( OGS_GTP2_CAUSE_NEW_PDN_TYPE_DUE_TO_NETWORK_PREFERENCE && cause_value != OGS_GTP2_CAUSE_NEW_PDN_TYPE_DUE_TO_SINGLE_ADDRESS_BEARER_ONLY) { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); ogs_gtp_send_error_message( s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0, OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value); @@ -374,7 +374,7 @@ void sgwc_s5c_handle_modify_bearer_response( ogs_assert(cause); cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); if (modify_action == OGS_GTP_MODIFY_IN_PATH_SWITCH_REQUEST) ogs_gtp_send_error_message( s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0, @@ -492,7 +492,7 @@ void sgwc_s5c_handle_delete_session_response( ogs_assert(cause); cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); ogs_gtp_send_error_message( s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0, OGS_GTP2_DELETE_SESSION_RESPONSE_TYPE, cause_value); diff --git a/src/smf/n4-handler.c b/src/smf/n4-handler.c index 96d9fd468..8104156b4 100644 --- a/src/smf/n4-handler.c +++ b/src/smf/n4-handler.c @@ -1063,7 +1063,7 @@ uint8_t smf_epc_n4_handle_session_deletion_response( return OGS_PFCP_CAUSE_MANDATORY_IE_MISSING; } if (rsp->cause.u8 != OGS_PFCP_CAUSE_REQUEST_ACCEPTED) { - ogs_warn("PFCP Cause[%d] : Not Accepted", rsp->cause.u8); + ogs_warn("PFCP Cause [%d] : Not Accepted", rsp->cause.u8); return rsp->cause.u8; } diff --git a/src/smf/s5c-handler.c b/src/smf/s5c-handler.c index 90a1d6d45..c7c7acb75 100644 --- a/src/smf/s5c-handler.c +++ b/src/smf/s5c-handler.c @@ -708,7 +708,7 @@ void smf_s5c_handle_create_bearer_response( ogs_assert(cause); cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { - ogs_error("GTP Failed [Bearer-CAUSE:%d]", cause_value); + ogs_error("GTP Bearer Cause [VALUE:%d]", cause_value); ogs_assert(OGS_OK == smf_epc_pfcp_send_one_bearer_modification_request( bearer, NULL, OGS_PFCP_MODIFY_REMOVE, @@ -721,7 +721,7 @@ void smf_s5c_handle_create_bearer_response( ogs_assert(cause); cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); ogs_assert(OGS_OK == smf_epc_pfcp_send_one_bearer_modification_request( bearer, NULL, OGS_PFCP_MODIFY_REMOVE, @@ -837,7 +837,7 @@ void smf_s5c_handle_update_bearer_response( ogs_assert(cause); cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { - ogs_error("GTP Failed [Bearer-CAUSE:%d]", cause_value); + ogs_error("GTP Bearer Cause [VALUE:%d]", cause_value); return; } @@ -845,7 +845,7 @@ void smf_s5c_handle_update_bearer_response( ogs_assert(cause); cause_value = cause->value; if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); return; } @@ -925,7 +925,7 @@ bool smf_s5c_handle_delete_bearer_response( cause_value = cause->value; if (cause->value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { } else { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); } } else { ogs_error("No Cause"); @@ -965,13 +965,13 @@ bool smf_s5c_handle_delete_bearer_response( if (cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED) { } else { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); } } else { ogs_error("No Cause"); } } else { - ogs_error("GTP Failed [CAUSE:%d]", cause_value); + ogs_error("GTP Cause [Value:%d]", cause_value); } } else { ogs_error("No Cause");