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

Handle forcing of IPv4 or IPv6 PDN connect using the Web UI (#415)

This commit is contained in:
Supreeth Herle 2020-04-19 06:05:04 +02:00 committed by GitHub
parent 8323114945
commit 7aae20e04a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/mme/esm-build.c
View File

@ -151,7 +151,56 @@ ogs_pkbuf_t *esm_build_activate_default_bearer_context_request(
ogs_min(access_point_name->length, OGS_MAX_APN_LEN) + 1);
ogs_debug(" APN[%s]", pdn->apn);
/*
* In TS24.301 V15.6.0
* 6.5.1.3 UE requested PDN connectivity procedure accepted by the network
*
* If connectivity with the requested PDN is accepted,
* but with a restriction of IP version (i.e. both an IPv4 address and
* an IPv6 prefix is requested, but only one particular IP version, or
* only single IP version bearers are supported/allowed by the network),
* ESM cause #50 "PDN type IPv4 only allowed",
* #51 "PDN type IPv6 only allowed", or
* #52 "single address bearers only allowed", respectively, shall be
* included in the ACTIVATE DEFAULT EPS BEARER CONTEXT REQUEST message.
*/
pdn_address->pdn_type = pdn->paa.pdn_type;
if (sess->request_type.pdn_type ==
OGS_NAS_PDN_CONNECTIVITY_PDN_TYPE_IPV4V6) {
if (pdn->paa.pdn_type == OGS_GTP_PDN_TYPE_IPV4) {
pdn_address->pdn_type = OGS_GTP_PDN_TYPE_IPV4;
activate_default_eps_bearer_context_request->esm_cause =
ESM_CAUSE_PDN_TYPE_IPV4_ONLY_ALLOWED;
activate_default_eps_bearer_context_request->presencemask |=
OGS_NAS_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REQUEST_ESM_CAUSE_PRESENT;
} else if (pdn->paa.pdn_type == OGS_GTP_PDN_TYPE_IPV6) {
pdn_address->pdn_type = OGS_GTP_PDN_TYPE_IPV6;
activate_default_eps_bearer_context_request->esm_cause =
ESM_CAUSE_PDN_TYPE_IPV6_ONLY_ALLOWED;
activate_default_eps_bearer_context_request->presencemask |=
OGS_NAS_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REQUEST_ESM_CAUSE_PRESENT;
}
} else if (sess->request_type.pdn_type ==
OGS_GTP_PDN_TYPE_IPV4) {
if (pdn->paa.pdn_type == OGS_GTP_PDN_TYPE_IPV6) {
pdn_address->pdn_type = OGS_GTP_PDN_TYPE_IPV6;
activate_default_eps_bearer_context_request->esm_cause =
ESM_CAUSE_PDN_TYPE_IPV6_ONLY_ALLOWED;
activate_default_eps_bearer_context_request->presencemask |=
OGS_NAS_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REQUEST_ESM_CAUSE_PRESENT;
}
} else if (sess->request_type.pdn_type ==
OGS_GTP_PDN_TYPE_IPV6) {
if (pdn->paa.pdn_type == OGS_GTP_PDN_TYPE_IPV4) {
pdn_address->pdn_type = OGS_GTP_PDN_TYPE_IPV4;
activate_default_eps_bearer_context_request->esm_cause =
ESM_CAUSE_PDN_TYPE_IPV4_ONLY_ALLOWED;
activate_default_eps_bearer_context_request->presencemask |=
OGS_NAS_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REQUEST_ESM_CAUSE_PRESENT;
}
}
if (pdn_address->pdn_type == OGS_GTP_PDN_TYPE_IPV4) {
pdn_address->addr = pdn->paa.addr;
pdn_address->length = OGS_NAS_PDN_ADDRESS_IPV4_LEN;
@ -172,34 +221,6 @@ ogs_pkbuf_t *esm_build_activate_default_bearer_context_request(
return NULL;
}
/*
* In TS24.301 V15.6.0
* 6.5.1.3 UE requested PDN connectivity procedure accepted by the network
*
* If connectivity with the requested PDN is accepted,
* but with a restriction of IP version (i.e. both an IPv4 address and
* an IPv6 prefix is requested, but only one particular IP version, or
* only single IP version bearers are supported/allowed by the network),
* ESM cause #50 "PDN type IPv4 only allowed",
* #51 "PDN type IPv6 only allowed", or
* #52 "single address bearers only allowed", respectively, shall be
* included in the ACTIVATE DEFAULT EPS BEARER CONTEXT REQUEST message.
*/
if (sess->request_type.pdn_type ==
OGS_NAS_PDN_CONNECTIVITY_PDN_TYPE_IPV4V6) {
if (pdn_address->pdn_type == OGS_GTP_PDN_TYPE_IPV4) {
activate_default_eps_bearer_context_request->esm_cause =
ESM_CAUSE_PDN_TYPE_IPV4_ONLY_ALLOWED;
activate_default_eps_bearer_context_request->presencemask |=
OGS_NAS_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REQUEST_ESM_CAUSE_PRESENT;
} else if (pdn_address->pdn_type == OGS_GTP_PDN_TYPE_IPV6) {
activate_default_eps_bearer_context_request->esm_cause =
ESM_CAUSE_PDN_TYPE_IPV6_ONLY_ALLOWED;
activate_default_eps_bearer_context_request->presencemask |=
OGS_NAS_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REQUEST_ESM_CAUSE_PRESENT;
}
}
if (pdn->ambr.downlink || pdn->ambr.uplink) {
activate_default_eps_bearer_context_request->presencemask |=
OGS_NAS_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REQUEST_APN_AMBR_PRESENT;