sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add optional function for TAI or ECGI(#399)

This commit is contained in:
Sukchan Lee 2020-04-09 10:52:21 -04:00
parent 5f7d1c5d90
commit a1569e5d86
4 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/diameter/gx/message.h
View File

@ -99,7 +99,9 @@ extern struct dict_object *ogs_diam_gx_pre_emption_capability;
extern struct dict_object *ogs_diam_gx_pre_emption_vulnerability;
extern struct dict_object *ogs_diam_gx_apn_aggregate_max_bitrate_ul;
extern struct dict_object *ogs_diam_gx_apn_aggregate_max_bitrate_dl;
#define OGS_DIAM_GX_3GPP_USER_LOCATION_INFO_TYPE_TAI_AND_ECGI 130
#define OGS_DIAM_GX_3GPP_USER_LOCATION_INFO_TYPE_TAI 128
#define OGS_DIAM_GX_3GPP_USER_LOCATION_INFO_TYPE_ECGI 129
#define OGS_DIAM_GX_3GPP_USER_LOCATION_INFO_TYPE_TAI_AND_ECGI 130
extern struct dict_object *ogs_diam_gx_3gpp_user_location_info;
extern struct dict_object *ogs_diam_gx_called_station_id;
extern struct dict_object *ogs_diam_gx_default_eps_bearer_qos;

3
src/pgw/pgw-context.h
View File

@ -159,7 +159,8 @@ typedef struct pgw_sess_s {
pgw_ue_ip_t* ipv4;
pgw_ue_ip_t* ipv6;
/* User-Lication-Info */
/* User Location Information */
int uli_type;
ogs_tai_t tai;
ogs_e_cgi_t e_cgi;

31
src/pgw/pgw-fd-path.c
View File

@ -383,28 +383,23 @@ void pgw_gx_send_ccr(pgw_sess_t *sess, ogs_gtp_xact_t *xact,
ogs_assert(ret == 0);
/* Set 3GPP-User-Location-Info */
if (message->create_session_request.
user_location_information.presence) {
struct ogs_diam_gx_uli_t {
uint8_t type;
ogs_tai_t tai;
ogs_e_cgi_t e_cgi;
} ogs_diam_gx_uli;
if (sess->uli_type) {
ogs_gtp_tlv_uli_t *user_location_information =
&message->create_session_request.user_location_information;
uint8_t uli_buf[OGS_GTP_MAX_ULI_LEN];
memset(&ogs_diam_gx_uli, 0, sizeof(ogs_diam_gx_uli));
ogs_diam_gx_uli.type =
OGS_DIAM_GX_3GPP_USER_LOCATION_INFO_TYPE_TAI_AND_ECGI;
memcpy(&ogs_diam_gx_uli.tai.plmn_id, &sess->tai.plmn_id,
sizeof(sess->tai.plmn_id));
ogs_diam_gx_uli.tai.tac = htons(sess->tai.tac);
memcpy(&ogs_diam_gx_uli.e_cgi.plmn_id, &sess->e_cgi.plmn_id,
sizeof(sess->e_cgi.plmn_id));
ogs_diam_gx_uli.e_cgi.cell_id = htonl(sess->e_cgi.cell_id);
ogs_assert(user_location_information->data);
ogs_assert(user_location_information->len);
memcpy(&uli_buf, user_location_information->data,
user_location_information->len);
/* Update Gx ULI Type */
uli_buf[0] = sess->uli_type;
ret = fd_msg_avp_new(ogs_diam_gx_3gpp_user_location_info, 0, &avp);
ogs_assert(ret == 0);
val.os.data = (uint8_t*)&ogs_diam_gx_uli;
val.os.len = sizeof(ogs_diam_gx_uli);
val.os.data = (uint8_t *)&uli_buf;
val.os.len = user_location_information->len;
ret = fd_msg_avp_setvalue(avp, &val);
ogs_assert(ret == 0);
ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);

23
src/pgw/pgw-s5c-handler.c
View File

@ -167,11 +167,24 @@ void pgw_s5c_handle_create_session_request(
if (req->user_location_information.presence) {
decoded = ogs_gtp_parse_uli(&uli, &req->user_location_information);
ogs_assert(req->user_location_information.len == decoded);
memcpy(&sess->tai.plmn_id, &uli.tai.plmn_id, sizeof(uli.tai.plmn_id));
sess->tai.tac = uli.tai.tac;
memcpy(&sess->e_cgi.plmn_id, &uli.e_cgi.plmn_id,
sizeof(uli.e_cgi.plmn_id));
sess->e_cgi.cell_id = uli.e_cgi.cell_id;
if (uli.flags.tai && uli.flags.e_cgi)
sess->uli_type =
OGS_DIAM_GX_3GPP_USER_LOCATION_INFO_TYPE_TAI_AND_ECGI;
else if (uli.flags.tai)
sess->uli_type = OGS_DIAM_GX_3GPP_USER_LOCATION_INFO_TYPE_TAI;
else if (uli.flags.e_cgi)
sess->uli_type = OGS_DIAM_GX_3GPP_USER_LOCATION_INFO_TYPE_ECGI;
if (uli.flags.tai) {
memcpy(&sess->tai.plmn_id, &uli.tai.plmn_id, sizeof(uli.tai.plmn_id));
sess->tai.tac = uli.tai.tac;
}
if (uli.flags.e_cgi) {
memcpy(&sess->e_cgi.plmn_id, &uli.e_cgi.plmn_id,
sizeof(uli.e_cgi.plmn_id));
sess->e_cgi.cell_id = uli.e_cgi.cell_id;
}
}
pgw_gx_send_ccr(sess, xact, gtpbuf,