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

Clarify configuration for multiple APN [#597,#598]

This commit is contained in:
Sukchan Lee 2020-10-07 09:22:10 -04:00
parent b925189c4a
commit 0eb68eefe2
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configs/open5gs/smf.yaml.in
View File

@ -86,44 +86,32 @@ logger:
# <PDN Configuration with UE Pool>
#
# o IPv4 Pool
# $ sudo ip addr add 10.45.0.1/16 dev ogstun
#
# pdn:
# addr: 10.45.0.1/16
#
# o IPv4/IPv6 Pool
# $ sudo ip addr add 10.45.0.1/16 dev ogstun
# $ sudo ip addr add cafe:1::1/64 dev ogstun
#
# pdn:
# - addr: 10.45.0.1/16
# - addr: cafe:1::1/64
#
#
# o Specific APN(e.g 'ims') uses 10.46.0.1/16, cafe:2::1/64
# All other APNs use 10.45.0.1/16, cafe:1::1/64
# $ sudo ip addr add 10.45.0.1/16 dev ogstun
# $ sudo ip addr add 10.46.0.1/16 dev ogstun
# $ sudo ip addr add cafe:1::1/64 dev ogstun
# $ sudo ip addr add cafe:2::1/64 dev ogstun
#
# o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, cafe:2::1/64
# pdn:
# - addr: 10.45.0.1/16
# apn: internet
# - addr: cafe:1::1/64
# apn: internet
# - addr: 10.46.0.1/16
# apn: ims
# - addr: cafe:2::1/64
# apn: ims
#
# o Multiple Devices (default: ogstun)
# $ sudo ip addr add 10.45.0.1/16 dev ogstun
# $ sudo ip addr add cafe:1::1/64 dev ogstun2
# $ sudo ip addr add 10.46.0.1/16 dev ogstun3
# $ sudo ip addr add cafe:2::1/64 dev ogstun3
#
# pdn:
# - addr: 10.45.0.1/16
# apn: internet
# - addr: cafe:1::1/64
# apn: internet
# dev: ogstun2
# - addr: 10.46.0.1/16
# apn: ims

6
configs/open5gs/upf.yaml.in
View File

@ -74,7 +74,7 @@ logger:
# - addr: cafe:1::1/64
#
#
# o Specific APN(e.g 'ims') uses 10.46.0.1/16, cafe:2::1/64
# o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, cafe:2::1/64
# All other APNs use 10.45.0.1/16, cafe:1::1/64
# $ sudo ip addr add 10.45.0.1/16 dev ogstun
# $ sudo ip addr add 10.46.0.1/16 dev ogstun
@ -83,7 +83,9 @@ logger:
#
# pdn:
# - addr: 10.45.0.1/16
# apn: internet
# - addr: cafe:1::1/64
# apn: internet
# - addr: 10.46.0.1/16
# apn: ims
# - addr: cafe:2::1/64
@ -97,7 +99,9 @@ logger:
#
# pdn:
# - addr: 10.45.0.1/16
# apn: internet
# - addr: cafe:1::1/64
# apn: internet
# dev: ogstun2
# - addr: 10.46.0.1/16
# apn: ims

3
lib/pfcp/context.c
View File

@ -329,7 +329,8 @@ int ogs_pfcp_context_parse_config(const char *local, const char *remote)
mask_or_numbits = (const char *)v;
}
}
} else if (!strcmp(pdn_key, "apn")) {
} else if (!strcmp(pdn_key, "apn") ||
!strcmp(pdn_key, "dnn")) {
apn = ogs_yaml_iter_value(&pdn_iter);
} else if (!strcmp(pdn_key, "dev")) {
dev = ogs_yaml_iter_value(&pdn_iter);