From b391cc589d3bfa339e7cb9d091a6b2979c66cf2a Mon Sep 17 00:00:00 2001 From: Eugene Bogush Date: Mon, 22 May 2023 16:37:18 +0300 Subject: [PATCH] relocation of user-location-info on top level --- src/smf/fd-path.c | 6 +++--- src/smf/fd-path.h | 2 +- src/smf/gx-path.c | 2 +- src/smf/gy-path.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/smf/fd-path.c b/src/smf/fd-path.c index 17acea9bc..f239fa6fe 100644 --- a/src/smf/fd-path.c +++ b/src/smf/fd-path.c @@ -69,7 +69,7 @@ void smf_fd_final(void) } /* Append 3GPP-User-Location-Info, 3GPP TS 29.061 16.4.7.2 22 */ -void smf_fd_msg_avp_add_3gpp_uli(smf_sess_t *sess, struct avp *avp) +void smf_fd_msg_avp_add_3gpp_uli(smf_sess_t *sess, struct msg *req) { struct avp *avpch1; union avp_value val; @@ -92,7 +92,7 @@ void smf_fd_msg_avp_add_3gpp_uli(smf_sess_t *sess, struct avp *avp) val.os.len = sess->gtp.user_location_information.len; ret = fd_msg_avp_setvalue(avpch1, &val); ogs_assert(ret == 0); - ret = fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD, avpch1); + ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avpch1); ogs_assert(ret == 0); return; } @@ -149,7 +149,7 @@ void smf_fd_msg_avp_add_3gpp_uli(smf_sess_t *sess, struct avp *avp) val.os.len = uli_len; ret = fd_msg_avp_setvalue(avpch1, &val); ogs_assert(ret == 0); - ret = fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD, avpch1); + ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avpch1); ogs_assert(ret == 0); } diff --git a/src/smf/fd-path.h b/src/smf/fd-path.h index 9346da693..3867e4df4 100644 --- a/src/smf/fd-path.h +++ b/src/smf/fd-path.h @@ -46,7 +46,7 @@ void smf_gy_send_ccr(smf_sess_t *sess, void *xact, void smf_s6b_send_aar(smf_sess_t *sess, ogs_gtp_xact_t *xact); void smf_s6b_send_str(smf_sess_t *sess, ogs_gtp_xact_t *xact, uint32_t cause); -void smf_fd_msg_avp_add_3gpp_uli(smf_sess_t *sess, struct avp *avp); +void smf_fd_msg_avp_add_3gpp_uli(smf_sess_t *sess, struct msg *req); #ifdef __cplusplus } diff --git a/src/smf/gx-path.c b/src/smf/gx-path.c index 3dbc9b277..884abf6ca 100644 --- a/src/smf/gx-path.c +++ b/src/smf/gx-path.c @@ -499,7 +499,7 @@ void smf_gx_send_ccr(smf_sess_t *sess, ogs_gtp_xact_t *xact, ogs_assert(ret == 0); /* 3GPP-User-Location-Info, 3GPP TS 29.061 16.4.7.2 22 */ - smf_fd_msg_avp_add_3gpp_uli(sess, avpch1); + smf_fd_msg_avp_add_3gpp_uli(sess, req); /* Set 3GPP-MS-Timezone */ if (sess->gtp.ue_timezone.presence && diff --git a/src/smf/gy-path.c b/src/smf/gy-path.c index 55f558d00..852e12d1d 100644 --- a/src/smf/gy-path.c +++ b/src/smf/gy-path.c @@ -512,7 +512,7 @@ static void fill_service_information_ccr(smf_sess_t *sess, } /* 3GPP-User-Location-Info, 3GPP TS 29.061 16.4.7.2 22 */ - smf_fd_msg_avp_add_3gpp_uli(sess, avpch1); + smf_fd_msg_avp_add_3gpp_uli(sess, req); if (sess->smf_ue->imeisv_len > 0) { /* User-Equipment-Info, 3GPP TS 32.299 7.1.17 */