From eab29fad9a9c4a86838aad3f41626e6de48d439c Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Sat, 27 Aug 2022 18:43:34 +0900 Subject: [PATCH] Follow up on #1715 * Changed to *4 * Changed snprintf to ogs_snprintf --- src/smf/gx-path.c | 30 +++++++++++++++--------------- src/smf/gy-path.c | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/smf/gx-path.c b/src/smf/gx-path.c index 7735381f7..487868fb3 100644 --- a/src/smf/gx-path.c +++ b/src/smf/gx-path.c @@ -540,21 +540,21 @@ void smf_gx_send_ccr(smf_sess_t *sess, ogs_gtp_xact_t *xact, /* 3GPP-Charging-Characteristics, 3GPP TS 29.061 16.4.7.2 13 */ if (sess->gtp.charging_characteristics.presence && - sess->gtp.charging_characteristics.len > 0) { - uint8_t oct1, oct2; - char digits[5]; - ret = fd_msg_avp_new(ogs_diam_gx_3gpp_charging_characteristics, 0, &avp); - ogs_assert(ret == 0); - oct1 = ((uint8_t*)sess->gtp.charging_characteristics.data)[0]; - oct2 = (sess->gtp.charging_characteristics.len > 1) ? - ((uint8_t*)sess->gtp.charging_characteristics.data)[1] : 0; - snprintf(digits, sizeof(digits), "%02x%02x", oct1, oct2); - val.os.data = (uint8_t*)&digits[0]; - val.os.len = 4; - ret = fd_msg_avp_setvalue(avp, &val); - ogs_assert(ret == 0); - ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp); - ogs_assert(ret == 0); + sess->gtp.charging_characteristics.len > 0) { + uint8_t oct1, oct2; + char digits[5]; + ret = fd_msg_avp_new(ogs_diam_gy_3gpp_charging_characteristics, 0, &avpch2); + ogs_assert(ret == 0); + oct1 = ((uint8_t*)sess->gtp.charging_characteristics.data)[0]; + oct2 = (sess->gtp.charging_characteristics.len > 1) ? + ((uint8_t*)sess->gtp.charging_characteristics.data)[1] : 0; + ogs_snprintf(digits, sizeof(digits), "%02x%02x", oct1, oct2); + val.os.data = (uint8_t*)&digits[0]; + val.os.len = 4; + ret = fd_msg_avp_setvalue(avpch2, &val); + ogs_assert(ret == 0); + ret = fd_msg_avp_add(avpch1, MSG_BRW_LAST_CHILD, avpch2); + ogs_assert(ret == 0); } /* Set Called-Station-Id */ diff --git a/src/smf/gy-path.c b/src/smf/gy-path.c index 65783db42..13746c388 100644 --- a/src/smf/gy-path.c +++ b/src/smf/gy-path.c @@ -441,7 +441,7 @@ static void fill_service_information_ccr(smf_sess_t *sess, oct1 = ((uint8_t*)sess->gtp.charging_characteristics.data)[0]; oct2 = (sess->gtp.charging_characteristics.len > 1) ? ((uint8_t*)sess->gtp.charging_characteristics.data)[1] : 0; - snprintf(digits, sizeof(digits), "%02x%02x", oct1, oct2); + ogs_snprintf(digits, sizeof(digits), "%02x%02x", oct1, oct2); val.os.data = (uint8_t*)&digits[0]; val.os.len = 4; ret = fd_msg_avp_setvalue(avpch2, &val);