Skip to content

Commit

Permalink
[SMF/UPF] Follow-up on Pull open5gs#3137 (Issues open5gs#2975)
Browse files Browse the repository at this point in the history
  • Loading branch information
@acetcom
acetcom committed Apr 14, 2024
1 parent a6830b3 commit f960047
Show file tree
Hide file tree
Showing 25 changed files with 47 additions and 3 deletions.
2 changes: 2 additions & 0 deletions configs/310014.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -193,6 +194,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
2 changes: 2 additions & 0 deletions configs/csfb.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -223,6 +224,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
2 changes: 2 additions & 0 deletions configs/examples/5gc-sepp1-999-70.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -211,6 +212,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.1.7
Expand Down
2 changes: 2 additions & 0 deletions configs/examples/5gc-sepp2-001-01.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ smf:
- subnet: 10.46.0.0/16
gateway: 10.46.0.1
- subnet: 2001:db8:babe::/48
gateway: 2001:db8:babe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -212,6 +213,7 @@ upf:
gateway: 10.46.0.1
dev: ogstun2
- subnet: 2001:db8:babe::/48
gateway: 2001:db8:babe::1
dev: ogstun2
metrics:
server:
Expand Down
2 changes: 2 additions & 0 deletions configs/examples/5gc-sepp3-315-010.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ smf:
- subnet: 10.47.0.0/16
gateway: 10.47.0.1
- subnet: 2001:db8:face::/48
gateway: 2001:db8:face::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -212,6 +213,7 @@ upf:
gateway: 10.47.0.1
dev: ogstun3
- subnet: 2001:db8:face::/48
gateway: 2001:db8:face::1
dev: ogstun3
metrics:
server:
Expand Down
2 changes: 2 additions & 0 deletions configs/examples/5gc-tls-sepp1-999-70.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -212,6 +213,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.1.7
Expand Down
2 changes: 2 additions & 0 deletions configs/examples/5gc-tls-sepp2-001-01.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ smf:
- subnet: 10.46.0.0/16
gateway: 10.46.0.1
- subnet: 2001:db8:babe::/48
gateway: 2001:db8:babe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -213,6 +214,7 @@ upf:
gateway: 10.46.0.1
dev: ogstun2
- subnet: 2001:db8:babe::/48
gateway: 2001:db8:babe::1
dev: ogstun2
metrics:
server:
Expand Down
2 changes: 2 additions & 0 deletions configs/examples/5gc-tls-sepp3-315-010.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ smf:
- subnet: 10.47.0.0/16
gateway: 10.47.0.1
- subnet: 2001:db8:face::/48
gateway: 2001:db8:face::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -213,6 +214,7 @@ upf:
gateway: 10.47.0.1
dev: ogstun3
- subnet: 2001:db8:face::/48
gateway: 2001:db8:face::1
dev: ogstun3
metrics:
server:
Expand Down
2 changes: 2 additions & 0 deletions configs/examples/gnb-001-01-ue-001-01.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -207,6 +208,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
2 changes: 2 additions & 0 deletions configs/examples/gnb-001-01-ue-315-010.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -207,6 +208,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
2 changes: 2 additions & 0 deletions configs/examples/gnb-001-01-ue-999-70.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -202,6 +203,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
2 changes: 2 additions & 0 deletions configs/examples/gnb-315-010-ue-001-01.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -207,6 +208,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
2 changes: 2 additions & 0 deletions configs/examples/gnb-315-010-ue-315-010.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -202,6 +203,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
2 changes: 2 additions & 0 deletions configs/examples/gnb-315-010-ue-999-70.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -207,6 +208,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
2 changes: 2 additions & 0 deletions configs/examples/gnb-999-70-ue-001-01.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -207,6 +208,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
2 changes: 2 additions & 0 deletions configs/examples/gnb-999-70-ue-315-010.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -207,6 +208,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
2 changes: 2 additions & 0 deletions configs/examples/gnb-999-70-ue-999-70.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -202,6 +203,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
2 changes: 2 additions & 0 deletions configs/non3gpp.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -196,6 +197,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
1 change: 1 addition & 0 deletions configs/open5gs/smf.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down
1 change: 1 addition & 0 deletions configs/open5gs/upf.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
2 changes: 2 additions & 0 deletions configs/sample.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -207,6 +208,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
2 changes: 2 additions & 0 deletions configs/slice.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -198,6 +199,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
2 changes: 2 additions & 0 deletions configs/srsenb.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -188,6 +189,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
2 changes: 2 additions & 0 deletions configs/volte.yaml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ smf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
dns:
- 8.8.8.8
- 8.8.4.4
Expand Down Expand Up @@ -191,6 +192,7 @@ upf:
- subnet: 10.45.0.0/16
gateway: 10.45.0.1
- subnet: 2001:db8:cafe::/48
gateway: 2001:db8:cafe::1
metrics:
server:
- address: 127.0.0.7
Expand Down
4 changes: 1 addition & 3 deletions lib/pfcp/context.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2208,9 +2208,7 @@ ogs_pfcp_subnet_t *ogs_pfcp_subnet_add(
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_log_print(OGS_LOG_WARN, " gateway: %s\n\n\n", ipstr);

ogs_free(subnet_string);
}
Expand Down

0 comments on commit f960047

Please sign in to comment.