paulmataruso/open5gs
1
0
Fork 0
mirror of https://github.com/open5gs/open5gs.git synced 2025-11-02 21:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use delete bearer request (#358)

Browse Source 
If UE sends bearer resource modification request with 'all TFT are deleted',
PGW initiates 'Delete Bearer Request'.
This commit is contained in:
Sukchan Lee
2020-01-30 01:38:26 +09:00
parent f27699abf5
commit 307cf190c4
2 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -464,8 +464,9 @@ void pgw_s5c_handle_bearer_resource_command(
int16_t decoded;
ogs_gtp_tft_t tft;
int tft_presence = 0;
int qos_presence = 0;
int tft_update = 0;
int tft_delete = 0;
int qos_update = 0;
ogs_assert(xact);
ogs_assert(sess);
@@ -514,7 +515,7 @@ void pgw_s5c_handle_bearer_resource_command(
/* No operation */
} else if (tft.code == OGS_GTP_TFT_CODE_DELETE_EXISTING_TFT) {
pgw_pf_remove_all(bearer);
tft_presence = 1;
tft_delete = 0;
} else if (tft.code ==
OGS_GTP_TFT_CODE_REPLACE_PACKET_FILTERS_IN_EXISTING) {
for (i = 0; i < tft.num_of_packet_filter; i++) {
@@ -529,7 +530,7 @@ void pgw_s5c_handle_bearer_resource_command(
}
}
tft_presence = 1;
tft_update = 1;
}
} else if (tft.code ==
OGS_GTP_TFT_CODE_ADD_PACKET_FILTERS_TO_EXISTING_TFT ||
@@ -551,7 +552,7 @@ void pgw_s5c_handle_bearer_resource_command(
return;
}
tft_presence = 1;
tft_update = 1;
}
} else if (tft.code ==
OGS_GTP_TFT_CODE_DELETE_PACKET_FILTERS_FROM_EXISTING) {
@@ -560,7 +561,10 @@ void pgw_s5c_handle_bearer_resource_command(
if (pf)
pgw_pf_remove(pf);
tft_presence = 1;
if (ogs_list_count(&bearer->pf_list))
tft_update = 1;
else
tft_delete = 1;
}
}
@@ -576,10 +580,10 @@ void pgw_s5c_handle_bearer_resource_command(
bearer->qos.gbr.uplink = flow_qos.ul_gbr;
bearer->qos.gbr.downlink = flow_qos.dl_gbr;
qos_presence = 1;
qos_update = 1;
}
if (tft_presence == 0 && qos_presence == 0) {
if (tft_update == 0 && tft_delete == 0 && qos_update == 0) {
/* No modification */
ogs_gtp_send_error_message(xact, sess ? sess->sgw_s5c_teid : 0,
OGS_GTP_BEARER_RESOURCE_FAILURE_INDICATION_TYPE,
@@ -588,13 +592,20 @@ void pgw_s5c_handle_bearer_resource_command(
}
memset(&h, 0, sizeof(ogs_gtp_header_t));
h.type = OGS_GTP_UPDATE_BEARER_REQUEST_TYPE;
h.teid = sess->sgw_s5c_teid;
pkbuf = pgw_s5c_build_update_bearer_request(
h.type, bearer, cmd->procedure_transaction_id.u8,
tft_presence ? &tft : NULL, qos_presence);
ogs_expect_or_return(pkbuf);
if (tft_delete) {
h.type = OGS_GTP_DELETE_BEARER_REQUEST_TYPE;
pkbuf = pgw_s5c_build_delete_bearer_request(
h.type, bearer, cmd->procedure_transaction_id.u8);
ogs_expect_or_return(pkbuf);
} else {
h.type = OGS_GTP_UPDATE_BEARER_REQUEST_TYPE;
pkbuf = pgw_s5c_build_update_bearer_request(
h.type, bearer, cmd->procedure_transaction_id.u8,
tft_update ? &tft : NULL, qos_update);
ogs_expect_or_return(pkbuf);
}
rv = ogs_gtp_xact_update_tx(xact, &h, pkbuf);
ogs_expect_or_return(rv == OGS_OK);

14
src/sgw/sgw-s5c-handler.c
View File

@@ -522,11 +522,17 @@ void sgw_s5c_handle_delete_bearer_request(ogs_gtp_xact_t *s5c_xact,
pkbuf = ogs_gtp_build_msg(message);
ogs_expect_or_return(pkbuf);
s11_xact = ogs_gtp_xact_local_create(
sgw_ue->gnode, &message->h, pkbuf, timeout, sess);
ogs_expect_or_return(s11_xact);
s11_xact = s5c_xact->assoc_xact;
if (!s11_xact) {
s11_xact = ogs_gtp_xact_local_create(
sgw_ue->gnode, &message->h, pkbuf, timeout, sess);
ogs_expect_or_return(s11_xact);
ogs_gtp_xact_associate(s5c_xact, s11_xact);
ogs_gtp_xact_associate(s5c_xact, s11_xact);
} else {
rv = ogs_gtp_xact_update_tx(s11_xact, &message->h, pkbuf);
ogs_expect_or_return(rv == OGS_OK);
}
rv = ogs_gtp_xact_commit(s11_xact);
ogs_expect(rv == OGS_OK);