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

[SMF/UPF] Changes subnet configuration (#2975) 

The way subnet is set up has changed as shown below.

```
<OLD Format>
smf:
  session:
    - subnet: 10.45.0.1/16

<NEW Format>
smf:
  session:
    - subnet: 10.45.0.0/16
      gateway: 10.45.0.1
```

For more information, please refer to Pull Request #2975.
This commit is contained in:
Sukchan Lee 2024-04-13 19:28:36 +09:00
parent 2b6369e9d9
commit a6830b30a0
27 changed files with 202 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configs/310014.yaml.in
View File

@ -109,8 +109,9 @@ smf:
server: server:
- address: 127.0.0.4 - address: 127.0.0.4
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -189,8 +190,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

10
configs/csfb.yaml.in
View File

@ -142,8 +142,9 @@ smf:
server: server:
- address: 127.0.0.4 - address: 127.0.0.4
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -219,8 +220,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

10
configs/examples/5gc-sepp1-999-70.yaml.in
View File

@ -112,8 +112,9 @@ smf:
- address: 127.0.1.4 - address: 127.0.1.4
port: 9090 port: 9090
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -207,8 +208,9 @@ upf:
server: server:
- address: 127.0.1.7 - address: 127.0.1.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.1.7 - address: 127.0.1.7

10
configs/examples/5gc-sepp2-001-01.yaml.in
View File

@ -112,8 +112,9 @@ smf:
- address: 127.0.2.4 - address: 127.0.2.4
port: 9090 port: 9090
session: session:
- subnet: 10.46.0.1/16 - subnet: 10.46.0.0/16
- subnet: 2001:db8:babe::1/48 gateway: 10.46.0.1
- subnet: 2001:db8:babe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -207,9 +208,10 @@ upf:
server: server:
- address: 127.0.2.7 - address: 127.0.2.7
session: session:
- subnet: 10.46.0.1/16 - subnet: 10.46.0.0/16
gateway: 10.46.0.1
dev: ogstun2 dev: ogstun2
- subnet: 2001:db8:babe::1/48 - subnet: 2001:db8:babe::/48
dev: ogstun2 dev: ogstun2
metrics: metrics:
server: server:

10
configs/examples/5gc-sepp3-315-010.yaml.in
View File

@ -112,8 +112,9 @@ smf:
- address: 127.0.3.4 - address: 127.0.3.4
port: 9090 port: 9090
session: session:
- subnet: 10.47.0.1/16 - subnet: 10.47.0.0/16
- subnet: 2001:db8:face::1/48 gateway: 10.47.0.1
- subnet: 2001:db8:face::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -207,9 +208,10 @@ upf:
server: server:
- address: 127.0.3.7 - address: 127.0.3.7
session: session:
- subnet: 10.47.0.1/16 - subnet: 10.47.0.0/16
gateway: 10.47.0.1
dev: ogstun3 dev: ogstun3
- subnet: 2001:db8:face::1/48 - subnet: 2001:db8:face::/48
dev: ogstun3 dev: ogstun3
metrics: metrics:
server: server:

10
configs/examples/5gc-tls-sepp1-999-70.yaml.in
View File

@ -113,8 +113,9 @@ smf:
- address: 127.0.1.4 - address: 127.0.1.4
port: 9090 port: 9090
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -208,8 +209,9 @@ upf:
server: server:
- address: 127.0.1.7 - address: 127.0.1.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.1.7 - address: 127.0.1.7

10
configs/examples/5gc-tls-sepp2-001-01.yaml.in
View File

@ -113,8 +113,9 @@ smf:
- address: 127.0.2.4 - address: 127.0.2.4
port: 9090 port: 9090
session: session:
- subnet: 10.46.0.1/16 - subnet: 10.46.0.0/16
- subnet: 2001:db8:babe::1/48 gateway: 10.46.0.1
- subnet: 2001:db8:babe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -208,9 +209,10 @@ upf:
server: server:
- address: 127.0.2.7 - address: 127.0.2.7
session: session:
- subnet: 10.46.0.1/16 - subnet: 10.46.0.0/16
gateway: 10.46.0.1
dev: ogstun2 dev: ogstun2
- subnet: 2001:db8:babe::1/48 - subnet: 2001:db8:babe::/48
dev: ogstun2 dev: ogstun2
metrics: metrics:
server: server:

10
configs/examples/5gc-tls-sepp3-315-010.yaml.in
View File

@ -113,8 +113,9 @@ smf:
- address: 127.0.3.4 - address: 127.0.3.4
port: 9090 port: 9090
session: session:
- subnet: 10.47.0.1/16 - subnet: 10.47.0.0/16
- subnet: 2001:db8:face::1/48 gateway: 10.47.0.1
- subnet: 2001:db8:face::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -208,9 +209,10 @@ upf:
server: server:
- address: 127.0.3.7 - address: 127.0.3.7
session: session:
- subnet: 10.47.0.1/16 - subnet: 10.47.0.0/16
gateway: 10.47.0.1
dev: ogstun3 dev: ogstun3
- subnet: 2001:db8:face::1/48 - subnet: 2001:db8:face::/48
dev: ogstun3 dev: ogstun3
metrics: metrics:
server: server:

10
configs/examples/gnb-001-01-ue-001-01.yaml.in
View File

@ -118,8 +118,9 @@ smf:
- address: 127.0.0.4 - address: 127.0.0.4
port: 9090 port: 9090
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -203,8 +204,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

10
configs/examples/gnb-001-01-ue-315-010.yaml.in
View File

@ -118,8 +118,9 @@ smf:
- address: 127.0.0.4 - address: 127.0.0.4
port: 9090 port: 9090
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -203,8 +204,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

10
configs/examples/gnb-001-01-ue-999-70.yaml.in
View File

@ -116,8 +116,9 @@ smf:
- address: 127.0.0.4 - address: 127.0.0.4
port: 9090 port: 9090
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -198,8 +199,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

10
configs/examples/gnb-315-010-ue-001-01.yaml.in
View File

@ -118,8 +118,9 @@ smf:
- address: 127.0.0.4 - address: 127.0.0.4
port: 9090 port: 9090
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -203,8 +204,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

10
configs/examples/gnb-315-010-ue-315-010.yaml.in
View File

@ -116,8 +116,9 @@ smf:
- address: 127.0.0.4 - address: 127.0.0.4
port: 9090 port: 9090
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -198,8 +199,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

10
configs/examples/gnb-315-010-ue-999-70.yaml.in
View File

@ -118,8 +118,9 @@ smf:
- address: 127.0.0.4 - address: 127.0.0.4
port: 9090 port: 9090
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -203,8 +204,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

10
configs/examples/gnb-999-70-ue-001-01.yaml.in
View File

@ -118,8 +118,9 @@ smf:
- address: 127.0.0.4 - address: 127.0.0.4
port: 9090 port: 9090
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -203,8 +204,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

10
configs/examples/gnb-999-70-ue-315-010.yaml.in
View File

@ -118,8 +118,9 @@ smf:
- address: 127.0.0.4 - address: 127.0.0.4
port: 9090 port: 9090
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -203,8 +204,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

10
configs/examples/gnb-999-70-ue-999-70.yaml.in
View File

@ -116,8 +116,9 @@ smf:
- address: 127.0.0.4 - address: 127.0.0.4
port: 9090 port: 9090
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -198,8 +199,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

10
configs/non3gpp.yaml.in
View File

@ -110,8 +110,9 @@ smf:
server: server:
- address: 127.0.0.4 - address: 127.0.0.4
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -192,8 +193,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

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

@ -34,8 +34,9 @@ smf:
- address: 127.0.0.4 - address: 127.0.0.4
port: 9090 port: 9090
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -327,23 +328,26 @@ smf:
# o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:db8:babe::1/48 # o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:db8:babe::1/48
# (If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash.) # (If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash.)
# session: # session:
# - subnet: 10.45.0.1/16 # - subnet: 10.45.0.0/16
# gateway: 10.45.0.1
# dnn: internet # dnn: internet
# - subnet: 2001:db8:cafe::1/48 # - subnet: 2001:db8:cafe::/48
# dnn: internet # dnn: internet
# - subnet: 10.46.0.1/16 # - subnet: 10.46.0.0/16
# gateway: 10.46.0.1
# dnn: ims # dnn: ims
# - subnet: 2001:db8:babe::1/48 # - subnet: 2001:db8:babe::/48
# dnn: ims # dnn: ims
# #
# o Pool Range # o Pool Range
# session: # session:
# - subnet: 10.45.0.1/16 # - subnet: 10.45.0.0/16
# gateway: 10.45.0.1
# range: # range:
# - 10.45.0.100-10.45.0.200 # - 10.45.0.100-10.45.0.200
# - 10.45.1.100- # - 10.45.1.100-
# - -10.45.0.200 # - -10.45.0.200
# - subnet: 2001:db8:cafe::1/48 # - subnet: 2001:db8:cafe::/48
# range: # range:
# - 2001:db8:cafe:a0::0-2001:db8:cafe:b0::0 # - 2001:db8:cafe:a0::0-2001:db8:cafe:b0::0
# - 2001:db8:cafe:c0::0-2001:db8:cafe:d0::0 # - 2001:db8:cafe:c0::0-2001:db8:cafe:d0::0

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

@ -18,8 +18,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
@ -70,14 +71,16 @@ upf:
# $ sudo ip addr add 2001:db8:babe::1/48 dev ogstun3 # $ sudo ip addr add 2001:db8:babe::1/48 dev ogstun3
# #
# session: # session:
# - subnet: 10.45.0.1/16 # - subnet: 10.45.0.0/16
# gateway: 10.45.0.1
# dnn: internet # dnn: internet
# - subnet: 2001:db8:cafe::1/48 # - subnet: 2001:db8:cafe::/48
# dnn: internet # dnn: internet
# dev: ogstun2 # dev: ogstun2
# - subnet: 10.46.0.1/16 # - subnet: 10.46.0.0/16
# gateway: 10.46.0.1
# dnn: ims # dnn: ims
# dev: ogstun3 # dev: ogstun3
# - subnet: 2001:db8:babe::1/48 # - subnet: 2001:db8:babe::/48
# dnn: ims # dnn: ims
# dev: ogstun3 # dev: ogstun3

10
configs/sample.yaml.in
View File

@ -118,8 +118,9 @@ smf:
- address: 127.0.0.4 - address: 127.0.0.4
port: 9090 port: 9090
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -203,8 +204,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

10
configs/slice.yaml.in
View File

@ -110,8 +110,9 @@ smf:
server: server:
- address: 127.0.0.4 - address: 127.0.0.4
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -194,8 +195,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

10
configs/srsenb.yaml.in
View File

@ -107,8 +107,9 @@ smf:
server: server:
- address: 127.0.0.4 - address: 127.0.0.4
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -184,8 +185,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

10
configs/volte.yaml.in
View File

@ -107,8 +107,9 @@ smf:
server: server:
- address: 127.0.0.4 - address: 127.0.0.4
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -187,8 +188,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

10
configs/vonr.yaml.in
View File

@ -110,8 +110,9 @@ smf:
server: server:
- address: 127.0.0.4 - address: 127.0.0.4
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@ -193,8 +194,9 @@ upf:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7
session: session:
- subnet: 10.45.0.1/16 - subnet: 10.45.0.0/16
- subnet: 2001:db8:cafe::1/48 gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
metrics: metrics:
server: server:
- address: 127.0.0.7 - address: 127.0.0.7

44
lib/pfcp/context.c
View File

@ -743,6 +743,7 @@ int ogs_pfcp_context_parse_config(const char *local, const char *remote)
do { do {
ogs_pfcp_subnet_t *subnet = NULL; ogs_pfcp_subnet_t *subnet = NULL;
const char *ipstr = NULL; const char *ipstr = NULL;
const char *gateway = NULL;
const char *mask_or_numbits = NULL; const char *mask_or_numbits = NULL;
const char *dnn = NULL; const char *dnn = NULL;
const char *dev = self.tun_ifname; const char *dev = self.tun_ifname;
@ -781,6 +782,8 @@ int ogs_pfcp_context_parse_config(const char *local, const char *remote)
mask_or_numbits = (const char *)v; mask_or_numbits = (const char *)v;
} }
} }
} else if (!strcmp(subnet_key, "gateway")) {
gateway = ogs_yaml_iter_value(&subnet_iter);
} else if (!strcmp(subnet_key, "apn") || } else if (!strcmp(subnet_key, "apn") ||
!strcmp(subnet_key, "dnn")) { !strcmp(subnet_key, "dnn")) {
dnn = ogs_yaml_iter_value(&subnet_iter); dnn = ogs_yaml_iter_value(&subnet_iter);
@ -825,7 +828,7 @@ int ogs_pfcp_context_parse_config(const char *local, const char *remote)
} }
subnet = ogs_pfcp_subnet_add( subnet = ogs_pfcp_subnet_add(
ipstr, mask_or_numbits, dnn, dev); ipstr, mask_or_numbits, gateway, dnn, dev);
ogs_assert(subnet); ogs_assert(subnet);
subnet->num_of_range = num; subnet->num_of_range = num;
@ -2150,7 +2153,7 @@ ogs_pfcp_dev_t *ogs_pfcp_dev_find_by_ifname(const char *ifname)
ogs_pfcp_subnet_t *ogs_pfcp_subnet_add( ogs_pfcp_subnet_t *ogs_pfcp_subnet_add(
const char *ipstr, const char *mask_or_numbits, const char *ipstr, const char *mask_or_numbits,
const char *dnn, const char *ifname) const char *gateway, const char *dnn, const char *ifname)
{ {
int rv; int rv;
ogs_pfcp_dev_t *dev = NULL; ogs_pfcp_dev_t *dev = NULL;
@ -2179,6 +2182,43 @@ ogs_pfcp_subnet_t *ogs_pfcp_subnet_add(
subnet->family = subnet->gw.family; subnet->family = subnet->gw.family;
subnet->prefixlen = atoi(mask_or_numbits); subnet->prefixlen = atoi(mask_or_numbits);
if (memcmp(subnet->gw.sub, subnet->sub.sub,
sizeof(subnet->gw.sub)) != 0) {
char *subnet_string = NULL;
if (subnet->family == AF_INET) {
subnet_string = ogs_ipv4_to_string(subnet->sub.sub[0]);
ogs_assert(subnet_string);
} else if (subnet->family == AF_INET6) {
subnet_string = ogs_ipv6addr_to_string(
(uint8_t*)&subnet->sub.sub[0]);
ogs_assert(subnet_string);
}
ogs_warn("Please change the configuration files of "
"smf.yaml and upf.yaml as below.");
ogs_log_print(OGS_LOG_WARN, "\n<OLD Format>\n");
ogs_log_print(OGS_LOG_WARN, "smf:\n");
ogs_log_print(OGS_LOG_WARN, " session:\n");
ogs_log_print(OGS_LOG_WARN, " - subnet: %s/%s\n",
ipstr, mask_or_numbits);
ogs_log_print(OGS_LOG_WARN, "\n<NEW Format>\n");
ogs_log_print(OGS_LOG_WARN, "smf:\n");
ogs_log_print(OGS_LOG_WARN, " session:\n");
ogs_log_print(OGS_LOG_WARN, " - subnet: %s/%s\n",
subnet_string ? subnet_string : "Unknown", mask_or_numbits);
if (subnet->family == AF_INET)
ogs_log_print(OGS_LOG_WARN, " gateway: %s", ipstr);
ogs_log_print(OGS_LOG_WARN, "\n\n\n");
ogs_free(subnet_string);
}
}
if (gateway) {
rv = ogs_ipsubnet(&subnet->gw, gateway, NULL);
ogs_assert(rv == OGS_OK);
} }
if (dnn) if (dnn)

2
lib/pfcp/context.h
View File

@ -491,7 +491,7 @@ ogs_pfcp_dev_t *ogs_pfcp_dev_find_by_ifname(const char *ifname);
ogs_pfcp_subnet_t *ogs_pfcp_subnet_add( ogs_pfcp_subnet_t *ogs_pfcp_subnet_add(
const char *ipstr, const char *mask_or_numbits, const char *ipstr, const char *mask_or_numbits,
const char *dnn, const char *ifname); const char *gateway, const char *dnn, const char *ifname);
ogs_pfcp_subnet_t *ogs_pfcp_subnet_next(ogs_pfcp_subnet_t *subnet); ogs_pfcp_subnet_t *ogs_pfcp_subnet_next(ogs_pfcp_subnet_t *subnet);
void ogs_pfcp_subnet_remove(ogs_pfcp_subnet_t *subnet); void ogs_pfcp_subnet_remove(ogs_pfcp_subnet_t *subnet);
void ogs_pfcp_subnet_remove_all(void); void ogs_pfcp_subnet_remove_all(void);