mirror of
https://github.com/open5gs/open5gs.git
synced 2025-11-02 21:13:40 +00:00
This reverts commit 87d9cdf569.
This commit is contained in:
committed by
Sukchan Lee
parent
87d9cdf569
commit
f401e7df14
@@ -760,9 +760,6 @@ typedef struct mme_sess_s {
|
||||
|
||||
ogs_session_t *session;
|
||||
|
||||
uint8_t pdp_type_num;
|
||||
ogs_ip_t pdp_address;
|
||||
|
||||
/* Save Protocol Configuration Options from UE */
|
||||
struct {
|
||||
uint8_t length;
|
||||
|
||||
@@ -156,8 +156,8 @@ static int sess_fill_pdp_context_decoded(mme_sess_t *sess, ogs_gtp1_pdp_context_
|
||||
.receive_npdu_nr = 0,
|
||||
.ul_teic = sess->pgw_s5c_teid,
|
||||
.pdp_type_org = OGS_PDP_EUA_ORG_IETF,
|
||||
.pdp_type_num = {sess->pdp_type_num, },
|
||||
.pdp_address = {sess->pdp_address, },
|
||||
.pdp_type_num = {sess->session->session_type, },
|
||||
.pdp_address = {sess->session->ue_ip, },
|
||||
.ggsn_address_c = sess->pgw_s5c_ip,
|
||||
.trans_id = sess->pti,
|
||||
};
|
||||
|
||||
@@ -238,10 +238,11 @@ static mme_sess_t *mme_ue_session_from_gtp1_pdp_ctx(mme_ue_t *mme_ue, const ogs_
|
||||
}
|
||||
ogs_sess->smf_ip = gtp1_pdp_ctx->ggsn_address_c;
|
||||
ogs_sess->context_identifier = gtp1_pdp_ctx->pdp_ctx_id;
|
||||
ogs_sess->paa.session_type = gtp1_pdp_ctx->pdp_type_num[0];
|
||||
ogs_sess->session_type = gtp1_pdp_ctx->pdp_type_num[0];
|
||||
ogs_sess->ue_ip = gtp1_pdp_ctx->pdp_address[0];
|
||||
/* TODO: sess->paa with gtp1_pdp_ctx->pdp_address[0],
|
||||
using/implementing ogs_gtp2_ip_to_paa ? */
|
||||
ogs_ip_to_paa(>p1_pdp_ctx->pdp_address[0], &ogs_sess->paa);
|
||||
ogs_ip_to_paa(&ogs_sess->ue_ip, &ogs_sess->paa);
|
||||
|
||||
/* 3GPP TS 23.060 section 9.2.1A: "The QoS profiles of the PDP context and EPS bearer are mapped as specified in TS 23.401"
|
||||
* 3GPP TS 23.401 Annex E: "Mapping between EPS and Release 99 QoS parameters"
|
||||
@@ -265,7 +266,7 @@ static mme_sess_t *mme_ue_session_from_gtp1_pdp_ctx(mme_ue_t *mme_ue, const ogs_
|
||||
sess->session = ogs_sess;
|
||||
sess->pgw_s5c_teid = gtp1_pdp_ctx->ul_teic;
|
||||
sess->pgw_s5c_ip = gtp1_pdp_ctx->ggsn_address_c;
|
||||
switch (ogs_sess->paa.session_type) {
|
||||
switch (ogs_sess->session_type) {
|
||||
case OGS_PDU_SESSION_TYPE_IPV4:
|
||||
sess->request_type.type = OGS_NAS_EPS_PDN_TYPE_IPV4;
|
||||
break;
|
||||
|
||||
@@ -381,9 +381,11 @@ void mme_s11_handle_create_session_response(
|
||||
*
|
||||
* Therefore, the code below will be deleted.
|
||||
*/
|
||||
sess->pdp_type_num = session->paa.session_type;
|
||||
#if 0 /* WILL BE DELETED */
|
||||
session->session_type = session->paa.session_type;
|
||||
ogs_assert(OGS_OK ==
|
||||
ogs_paa_to_ip(&session->paa, &sess->pdp_address));
|
||||
ogs_paa_to_ip(&session->paa, &session->ue_ip));
|
||||
#endif
|
||||
}
|
||||
|
||||
/* ePCO */
|
||||
|
||||
Reference in New Issue
Block a user