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

[SMF] Store Selection Mode IE from GTPv1C/2C and append as 3GPP-Selection-Mode AVP in Gy CCR (#1530) 

* [GTPv1C] Make Selection Mode IE uint8

* [SMF] Store Selection Mode in GTPv1C and GTPv2C

* [SMF] Gy CCR: append 3GPP-Selection-Mode AVP
This commit is contained in:
Pau Espin 2022-05-12 15:43:12 +02:00 committed by GitHub
parent 5d478e2488
commit 11d4be1779
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/diameter/gy/message.c
View File

@ -54,6 +54,7 @@ struct dict_object *ogs_diam_gy_pdp_address = NULL;
struct dict_object *ogs_diam_gy_sgsn_address = NULL;
struct dict_object *ogs_diam_gy_ggsn_address = NULL;
struct dict_object *ogs_diam_gy_3gpp_nsapi = NULL;
struct dict_object *ogs_diam_gy_3gpp_selection_mode = NULL;
struct dict_object *ogs_diam_gy_feature_list_id = NULL;
struct dict_object *ogs_diam_gy_feature_list = NULL;
@ -115,6 +116,7 @@ int ogs_diam_gy_init(void)
CHECK_dict_search(DICT_AVP, AVP_BY_NAME_ALL_VENDORS, "SGSN-Address", &ogs_diam_gy_sgsn_address);
CHECK_dict_search(DICT_AVP, AVP_BY_NAME_ALL_VENDORS, "GGSN-Address", &ogs_diam_gy_ggsn_address);
CHECK_dict_search(DICT_AVP, AVP_BY_NAME_ALL_VENDORS, "3GPP-NSAPI", &ogs_diam_gy_3gpp_nsapi);
CHECK_dict_search(DICT_AVP, AVP_BY_NAME_ALL_VENDORS, "3GPP-Selection-Mode", &ogs_diam_gy_3gpp_selection_mode);
CHECK_dict_search(DICT_AVP, AVP_BY_NAME_ALL_VENDORS, "Feature-List-ID", &ogs_diam_gy_feature_list_id);

1
lib/diameter/gy/message.h
View File

@ -105,6 +105,7 @@ extern struct dict_object *ogs_diam_gy_pdp_address;
extern struct dict_object *ogs_diam_gy_sgsn_address;
extern struct dict_object *ogs_diam_gy_ggsn_address;
extern struct dict_object *ogs_diam_gy_3gpp_nsapi;
extern struct dict_object *ogs_diam_gy_3gpp_selection_mode;
extern struct dict_object *ogs_diam_gy_feature_list_id;
extern struct dict_object *ogs_diam_gy_feature_list;
extern struct dict_object *ogs_diam_gy_qos_information;

4
lib/gtp/v1/message.c
View File

@ -21,7 +21,7 @@
/*******************************************************************************
* This file had been created by gtp1-tlv.py script v0.1.0
* Please do not modify this file but regenerate it via script.
* Created on: 2022-02-18 19:21:27.743742 by pespin
* Created on: 2022-05-12 14:42:38.611950 by pespin
* from 29060-g00.docx
******************************************************************************/
@ -150,7 +150,7 @@ ogs_tlv_desc_t ogs_gtp1_tlv_desc_recovery =
ogs_tlv_desc_t ogs_gtp1_tlv_desc_selection_mode =
{
OGS_TV_FIXED_STR,
OGS_TV_UINT8,
"Selection Mode",
OGS_GTP1_SELECTION_MODE_TYPE,
1,

4
lib/gtp/v1/message.h
View File

@ -21,7 +21,7 @@
/*******************************************************************************
* This file had been created by gtp1-tlv.py script v0.1.0
* Please do not modify this file but regenerate it via script.
* Created on: 2022-02-18 19:21:27.730656 by pespin
* Created on: 2022-05-12 14:42:38.599141 by pespin
* from 29060-g00.docx
******************************************************************************/
@ -471,7 +471,7 @@ typedef ogs_tlv_octet_t ogs_gtp1_tlv_map_cause_t;
typedef ogs_tlv_octet_t ogs_gtp1_tlv_p_tmsi_signature_t;
typedef ogs_tlv_octet_t ogs_gtp1_tlv_ms_validated_t;
typedef ogs_tlv_uint8_t ogs_gtp1_tlv_recovery_t;
typedef ogs_tlv_octet_t ogs_gtp1_tlv_selection_mode_t;
typedef ogs_tlv_uint8_t ogs_gtp1_tlv_selection_mode_t;
typedef ogs_tlv_uint32_t ogs_gtp1_tlv_tunnel_endpoint_identifier_data_i_t;
typedef ogs_tlv_uint32_t ogs_gtp1_tlv_tunnel_endpoint_identifier_control_plane_t;
typedef ogs_tlv_octet_t ogs_gtp1_tlv_tunnel_endpoint_identifier_data_ii_t;

1
lib/gtp/v1/support/gtp1-tlv.py
View File

@ -315,6 +315,7 @@ set_c_type("Trace Type", 'uint')
set_c_type("MS Not Reachable Reason", 'uint')
set_c_type("Charging ID", 'uint')
set_c_type("Reordering Required", 'uint')
set_c_type("Selection Mode", 'uint')
msg_list["Echo Request"]["table"] = 12
msg_list["Echo Response"]["table"] = 13

1
src/smf/context.h
View File

@ -318,6 +318,7 @@ typedef struct smf_sess_s {
ogs_tlv_octet_t ue_timezone;
bool create_session_response_apn_ambr;
bool create_session_response_bearer_qos;
uint8_t selection_mode; /* OGS_GTP{1,2}_SELECTION_MODE_*, same in GTPv1C and 2C. */
struct {
uint8_t nsapi;
} v1; /* GTPv1C specific fields */

8
src/smf/gn-handler.c
View File

@ -77,6 +77,10 @@ uint8_t smf_gn_handle_create_pdp_context_request(
ogs_error("No IMSI");
cause_value = OGS_GTP1_CAUSE_MANDATORY_IE_MISSING;
}
if (req->selection_mode.presence == 0) {
ogs_error("No Selection Mode");
cause_value = OGS_GTP1_CAUSE_MANDATORY_IE_MISSING;
}
if (req->tunnel_endpoint_identifier_data_i.presence == 0) {
ogs_error("No TEID");
cause_value = OGS_GTP1_CAUSE_MANDATORY_IE_MISSING;
@ -119,6 +123,10 @@ uint8_t smf_gn_handle_create_pdp_context_request(
/* Store NSAPI */
sess->gtp.v1.nsapi = req->nsapi.u8;
/* Selection Mode, TS 29.060 7.7.12 */
sess->gtp.selection_mode = req->selection_mode.u8 & 0x03;
if (sess->gtp.selection_mode > 2)
sess->gtp.selection_mode = 2;
/* Control Plane(DL) : SGW-S5C */
sess->sgw_s5c_teid = req->tunnel_endpoint_identifier_control_plane.u32;

13
src/smf/gy-path.c
View File

@ -255,6 +255,7 @@ static void fill_service_information_ccr(smf_sess_t *sess,
struct sockaddr_in sin;
struct sockaddr_in6 sin6;
char buf[OGS_PLMNIDSTRLEN];
char digit;
/* Service-Information, TS 32.299 sec 7.2.192 */
ret = fd_msg_avp_new(ogs_diam_gy_service_information, 0, &avp);
@ -373,6 +374,18 @@ static void fill_service_information_ccr(smf_sess_t *sess,
ret = fd_msg_avp_add(avpch1, MSG_BRW_LAST_CHILD, avpch2);
ogs_assert(ret == 0);
/* 3GPP-Selection-Mode, 3GPP TS 29.061 16.4.7.2 12 */
ret = fd_msg_avp_new(ogs_diam_gy_3gpp_selection_mode, 0, &avpch2);
ogs_assert(ret == 0);
ogs_assert(sess->session.name);
digit = sess->gtp.selection_mode + '0';
val.os.data = (uint8_t*)&digit;
val.os.len = 1;
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);
/* 3GPP-SGSN-MCC-MNC */
ret = fd_msg_avp_new(ogs_diam_gy_3gpp_sgsn_mcc_mnc, 0, &avpch2);
ogs_assert(ret == 0);

7
src/smf/s5c-handler.c
View File

@ -166,6 +166,13 @@ uint8_t smf_s5c_handle_create_session_request(
}
}
/* Set Selection Mode, TS 29.274 8.58 */
if (req->selection_mode.presence == 1) {
sess->gtp.selection_mode = req->selection_mode.u8 & 0x03;
if (sess->gtp.selection_mode > 2)
sess->gtp.selection_mode = 2;
}
if (sess->gtp_rat_type == OGS_GTP2_RAT_TYPE_EUTRAN) {
/* User Location Inforation is mandatory only for E-UTRAN */
ogs_assert(req->user_location_information.presence);