acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fix AN-Trusted AVP sent in CCR (#1542) 

AN-Trusted AVP is only relevant for non-3GPP access networks e.g. WLAN.
This commit adds a check for non-3GPP access network in order to include
AN-Trusted AVP in CCR or not.
Also, clears the M bit for AN-trusted AVP as per TS 29.212 version 16.4.0, Table 5.4.0.1
This commit is contained in:
Supreeth Herle 2022-05-19 06:25:49 +02:00 committed by GitHub
parent 12d189af07
commit aba1867902
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/smf/gx-path.c
View File

@ -83,6 +83,7 @@ void smf_gx_send_ccr(smf_sess_t *sess, ogs_gtp_xact_t *xact,
struct msg *req = NULL; struct msg *req = NULL;
struct avp *avp; struct avp *avp;
struct avp *avpch1, *avpch2; struct avp *avpch1, *avpch2;
struct avp_hdr *ahdr;
union avp_value val; union avp_value val;
struct sess_state *sess_data = NULL, *svg; struct sess_state *sess_data = NULL, *svg;
struct session *session = NULL; struct session *session = NULL;
@ -367,6 +368,7 @@ void smf_gx_send_ccr(smf_sess_t *sess, ogs_gtp_xact_t *xact,
val.i32 = OGS_DIAM_GX_IP_CAN_TYPE_3GPP_EPS; val.i32 = OGS_DIAM_GX_IP_CAN_TYPE_3GPP_EPS;
break; break;
case OGS_GTP2_RAT_TYPE_WLAN: case OGS_GTP2_RAT_TYPE_WLAN:
case OGS_GTP2_RAT_TYPE_VIRTUAL:
val.i32 = OGS_DIAM_GX_IP_CAN_TYPE_NON_3GPP_EPS; val.i32 = OGS_DIAM_GX_IP_CAN_TYPE_NON_3GPP_EPS;
break; break;
default: default:
@ -612,13 +614,35 @@ void smf_gx_send_ccr(smf_sess_t *sess, ogs_gtp_xact_t *xact,
ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp); ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
ogs_assert(ret == 0); ogs_assert(ret == 0);
ret = fd_msg_avp_new(ogs_diam_gx_an_trusted, 0, &avp); /*
ogs_assert(ret == 0); * TS 29.274 version 16.11.0, Table 7.2.1-1,
val.u32 = OGS_DIAM_GX_AN_UNTRUSTED; * GTPv2 RAT Type: The ePDG may use the access technology type of the
ret = fd_msg_avp_setvalue (avp, &val); * untrusted non-3GPP access network if it is able to acquire
ogs_assert(ret == 0); * it; otherwise it shall indicate Virtual as the RAT Type.
ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp); * The TWAN shall set the RAT Type value to "WLAN" on the
ogs_assert(ret == 0); * S2a interface.
*/
if (sess->gtp_rat_type == OGS_GTP2_RAT_TYPE_WLAN ||
sess->gtp_rat_type == OGS_GTP2_RAT_TYPE_VIRTUAL) {
ret = fd_msg_avp_new(ogs_diam_gx_an_trusted, 0, &avp);
ogs_assert(ret == 0);
/*
* TS 29.212 version 16.4.0, Table 5.4.0.1,
* AN-Trusted: This AVP shall have the 'M' bit cleared.
*/
ret = fd_msg_avp_hdr(avp, &ahdr);
ogs_assert(ret == 0);
ahdr->avp_flags = ahdr->avp_flags & AVP_FLAG_VENDOR;
/*
* Currently, only Untrusted non-3GPP access via ePDG is supported.
*/
val.u32 = OGS_DIAM_GX_AN_UNTRUSTED;
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);
}
} }
ret = clock_gettime(CLOCK_REALTIME, &sess_data->ts); ret = clock_gettime(CLOCK_REALTIME, &sess_data->ts);