Projects
osmocom:nightly
open5gs
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 37
View file
open5gs_2.4.9.202208020002.dsc -> open5gs_2.4.9.202208030002.dsc
Changed
@@ -2,7 +2,7 @@ Source: open5gs Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg Architecture: any -Version: 2.4.9.202208020002 +Version: 2.4.9.202208030002 Maintainer: Harald Welte <laforge@gnumonks.org> Uploaders: Sukchan Lee <acetcom@gmail.com> Homepage: https://open5gs.org @@ -30,8 +30,8 @@ open5gs-udr deb net optional arch=any open5gs-upf deb net optional arch=any Checksums-Sha1: - 0caf34957530b1a29a9152f6f8c669bf06737bb0 11459076 open5gs_2.4.9.202208020002.tar.xz + 60498f2ba8284d8236f3fb89cad356da55bdebb3 11459928 open5gs_2.4.9.202208030002.tar.xz Checksums-Sha256: - 5ef6d49a91468cc069302f943579a1944ae4c1e5e3b857ed855c26e41b155d6e 11459076 open5gs_2.4.9.202208020002.tar.xz + 719d04430684f7b2f73c872820655a419892aa8d17dd494428e064f84bb44755 11459928 open5gs_2.4.9.202208030002.tar.xz Files: - d53b1794d9a9318e5e21bca67e1c7ec7 11459076 open5gs_2.4.9.202208020002.tar.xz + fdd640e24462f2db60bec35402bb8f28 11459928 open5gs_2.4.9.202208030002.tar.xz
View file
open5gs_2.4.9.202208020002.tar.xz/.github/workflows/meson-ci.yml -> open5gs_2.4.9.202208030002.tar.xz/.github/workflows/meson-ci.yml
Changed
@@ -6,11 +6,11 @@ name: Build and Test on MacOS Latest runs-on: macos-latest steps: - - name: Install MongoDB with Package Manager - run: | - brew tap mongodb/brew - brew install mongodb-community - brew services start mongodb-community +# - name: Install MongoDB with Package Manager +# run: | +# brew tap mongodb/brew +# brew install mongodb-community +# brew services start mongodb-community - name: Create the TUN device with the interface name `ogstun`. run: | sudo ifconfig lo0 alias 127.0.0.2 netmask 255.255.255.255 @@ -33,6 +33,7 @@ sudo ifconfig lo0 alias 127.0.0.18 netmask 255.255.255.255 sudo ifconfig lo0 alias 127.0.0.19 netmask 255.255.255.255 sudo ifconfig lo0 alias 127.0.0.20 netmask 255.255.255.255 + sudo ifconfig lo0 alias 127.0.1.10 netmask 255.255.255.255 - name: Install the dependencies for building the source code. run: brew install mongo-c-driver libidn libmicrohttpd nghttp2 bison libusrsctp libtins talloc meson - name: Check out repository code
View file
open5gs_2.4.9.202208020002.tar.xz/configs/open5gs/amf.yaml.in -> open5gs_2.4.9.202208030002.tar.xz/configs/open5gs/amf.yaml.in
Changed
@@ -35,7 +35,7 @@ # - ::0 # port: 7777 # -# o SBI Server(https://<all address avaiable>:443) +# o SBI Server(https://<all address available>:443) # sbi: # - tls: # key: amf.key @@ -85,9 +85,18 @@ # l_onoff: true # l_linger: 10 # +# <NF Service> +# +# o NF Service Name(Default : all NF services available) +# service_name: +# +# o NF Service Name(Only some NF services are available) +# service_name: +# - namf-comm +# # <NGAP Server>> # -# o NGAP Server(all address avaiable) +# o NGAP Server(all address available) # ngap: # # o NGAP Server(0.0.0.0:38412) @@ -104,7 +113,7 @@ # - addr: 127.0.0.5 # port: 38413 # -# o NGAP Server(address avaiable in `eth0` interface) +# o NGAP Server(address available in `eth0` interface) # ngap: # dev: eth0 #
View file
open5gs_2.4.9.202208020002.tar.xz/configs/open5gs/ausf.yaml.in -> open5gs_2.4.9.202208030002.tar.xz/configs/open5gs/ausf.yaml.in
Changed
@@ -35,7 +35,7 @@ # - ::0 # port: 7777 # -# o SBI Server(https://<all address avaiable>:443) +# o SBI Server(https://<all address available>:443) # sbi: # - tls: # key: ausf.key @@ -85,6 +85,15 @@ # l_onoff: true # l_linger: 10 # +# <NF Service> +# +# o NF Service Name(Default : all NF services available) +# service_name: +# +# o NF Service Name(Only some NF services are available) +# service_name: +# - nausf-auth +# ausf: sbi: - addr: 127.0.0.11
View file
open5gs_2.4.9.202208020002.tar.xz/configs/open5gs/bsf.yaml.in -> open5gs_2.4.9.202208030002.tar.xz/configs/open5gs/bsf.yaml.in
Changed
@@ -37,7 +37,7 @@ # - ::0 # port: 7777 # -# o SBI Server(https://<all address avaiable>:443) +# o SBI Server(https://<all address available>:443) # sbi: # - tls: # key: bsf.key @@ -87,6 +87,15 @@ # l_onoff: true # l_linger: 10 # +# <NF Service> +# +# o NF Service Name(Default : all NF services available) +# service_name: +# +# o NF Service Name(Only some NF services are available) +# service_name: +# - nbsf-management +# bsf: sbi: - addr: 127.0.0.15
View file
open5gs_2.4.9.202208020002.tar.xz/configs/open5gs/mme.yaml.in -> open5gs_2.4.9.202208030002.tar.xz/configs/open5gs/mme.yaml.in
Changed
@@ -26,7 +26,7 @@ # # <S1AP Server>> # -# o S1AP Server(all address avaiable) +# o S1AP Server(all address available) # s1ap: # # o S1AP Server(0.0.0.0:36412) @@ -43,7 +43,7 @@ # - addr: 127.0.0.2 # port: 36413 # -# o S1AP Server(address avaiable in `eth0` interface) +# o S1AP Server(address available in `eth0` interface) # s1ap: # dev: eth0 # @@ -86,7 +86,7 @@ # # <GTP-C Server>> # -# o GTP-C Server(all address avaiable) +# o GTP-C Server(all address available) # gtpc: # # o GTP-C Server(127.0.0.2:2123, ::1:2123)
View file
open5gs_2.4.9.202208020002.tar.xz/configs/open5gs/nrf.yaml.in -> open5gs_2.4.9.202208030002.tar.xz/configs/open5gs/nrf.yaml.in
Changed
@@ -38,7 +38,7 @@ # - ::0 # port: 7777 # -# o SBI Server(https://<all address avaiable>:443) +# o SBI Server(https://<all address available>:443) # sbi: # tls: # key: nrf.key @@ -77,6 +77,16 @@ # l_onoff: true # l_linger: 10 # +# <NF Service> +# +# o NF Service Name(Default : all NF services available) +# service_name: +# +# o NF Service Name(Only some NF services are available) +# service_name: +# - nnrf-nfm +# - nnrf-disc +# nrf: sbi: addr:
View file
open5gs_2.4.9.202208020002.tar.xz/configs/open5gs/nssf.yaml.in -> open5gs_2.4.9.202208030002.tar.xz/configs/open5gs/nssf.yaml.in
Changed
@@ -35,7 +35,7 @@ # - ::0 # port: 7777 # -# o SBI Server(https://<all address avaiable>:443) +# o SBI Server(https://<all address available>:443) # sbi: # - tls: # key: nssf.key @@ -85,7 +85,7 @@ # l_onoff: true # l_linger: 10 # -# <List of avaiable Network Slice Instance(NSI)> +# <List of available Network Slice Instance(NSI)> # # o One NSI # - NRFhttp://::1:7777/nnrf-nfm/v1/nf-instances @@ -134,6 +134,16 @@ # so_linger: # l_onoff: true # l_linger: 10 +# +# <NF Service> +# +# o NF Service Name(Default : all NF services available) +# service_name: +# +# o NF Service Name(Only some NF services are available) +# service_name: +# - nnssf-nsselection +# nssf: sbi: - addr: 127.0.0.14
View file
open5gs_2.4.9.202208020002.tar.xz/configs/open5gs/pcf.yaml.in -> open5gs_2.4.9.202208030002.tar.xz/configs/open5gs/pcf.yaml.in
Changed
@@ -37,7 +37,7 @@ # - ::0 # port: 7777 # -# o SBI Server(https://<all address avaiable>:443) +# o SBI Server(https://<all address available>:443) # sbi: # - tls: # key: pcf.key @@ -87,6 +87,17 @@ # l_onoff: true # l_linger: 10 # +# <NF Service> +# +# o NF Service Name(Default : all NF services available) +# service_name: +# +# o NF Service Name(Only some NF services are available) +# service_name: +# - npcf-am-policy-control +# - npcf-smpolicycontrol +# - npcf-policyauthorization +# pcf: sbi: - addr: 127.0.0.13
View file
open5gs_2.4.9.202208020002.tar.xz/configs/open5gs/scp.yaml.in -> open5gs_2.4.9.202208030002.tar.xz/configs/open5gs/scp.yaml.in
Changed
@@ -38,7 +38,7 @@ # - ::0 # port: 7777 # -# o SBI Server(https://<all address avaiable>:443) +# o SBI Server(https://<all address available>:443) # sbi: # - tls: # key: scp.key @@ -103,7 +103,7 @@ # # o delegated: # o auto: (Default) -# Use next-hop SCP if next-hop SCP avaiable. Otherwise NRF is used. +# Use next-hop SCP if next-hop SCP available. Otherwise NRF is used. # => App fails if both next-hop SCP and NRF are unavailable. # o yes: Use next-hop SCP always. # => App fails if no next-hop SCP available.
View file
open5gs_2.4.9.202208020002.tar.xz/configs/open5gs/smf.yaml.in -> open5gs_2.4.9.202208030002.tar.xz/configs/open5gs/smf.yaml.in
Changed
@@ -35,7 +35,7 @@ # - ::0 # port: 7777 # -# o SBI Server(https://<all address avaiable>:443) +# o SBI Server(https://<all address available>:443) # sbi: # - tls: # key: smf.key @@ -85,6 +85,15 @@ # l_onoff: true # l_linger: 10 # +# <NF Service> +# +# o NF Service Name(Default : all NF services available) +# service_name: +# +# o NF Service Name(Only some NF services are available) +# service_name: +# - nsmf-pdusession +# # <PFCP Server> # # o PFCP Server(127.0.0.4:8805, ::1:8805)
View file
open5gs_2.4.9.202208020002.tar.xz/configs/open5gs/udm.yaml.in -> open5gs_2.4.9.202208030002.tar.xz/configs/open5gs/udm.yaml.in
Changed
@@ -35,7 +35,7 @@ # - ::0 # port: 7777 # -# o SBI Server(https://<all address avaiable>:443) +# o SBI Server(https://<all address available>:443) # sbi: # - tls: # key: udm.key @@ -85,6 +85,17 @@ # l_onoff: true # l_linger: 10 # +# <NF Service> +# +# o NF Service Name(Default : all NF services available) +# service_name: +# +# o NF Service Name(Only some NF services are available) +# service_name: +# - nudm-sdm +# - nudm-uecm +# - nudm-ueau +# udm: sbi: - addr: 127.0.0.12
View file
open5gs_2.4.9.202208020002.tar.xz/configs/open5gs/udr.yaml.in -> open5gs_2.4.9.202208030002.tar.xz/configs/open5gs/udr.yaml.in
Changed
@@ -37,7 +37,7 @@ # - ::0 # port: 7777 # -# o SBI Server(https://<all address avaiable>:443) +# o SBI Server(https://<all address available>:443) # sbi: # - tls: # key: udr.key @@ -87,6 +87,15 @@ # l_onoff: true # l_linger: 10 # +# <NF Service> +# +# o NF Service Name(Default : all NF services available) +# service_name: +# +# o NF Service Name(Only some NF services are available) +# service_name: +# - nudr-dr +# udr: sbi: - addr: 127.0.0.20
View file
open5gs_2.4.9.202208020002.tar.xz/debian/changelog -> open5gs_2.4.9.202208030002.tar.xz/debian/changelog
Changed
@@ -1,8 +1,8 @@ -open5gs (2.4.9.202208020002) UNRELEASED; urgency=medium +open5gs (2.4.9.202208030002) UNRELEASED; urgency=medium * Snapshot build - -- Sukchan Lee <acetcom@gmail.com> Tue, 02 Aug 2022 00:09:16 +0000 + -- Sukchan Lee <acetcom@gmail.com> Wed, 03 Aug 2022 00:09:24 +0000 open5gs (2.4.9) unstable; urgency=medium
View file
open5gs_2.4.9.202208020002.tar.xz/debian/control -> open5gs_2.4.9.202208030002.tar.xz/debian/control
Changed
@@ -31,7 +31,7 @@ Package: open5gs-common Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${shlibs:Depends}, ${misc:Depends} Description: 5G Core and EPC (Shared Files) Open5GS is a C-language implementation of 5G Core and EPC @@ -43,7 +43,7 @@ Package: open5gs-mme Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: MME (Mobility Management Entity) @@ -58,7 +58,7 @@ Package: open5gs-sgwc Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: SGW-C (Serving Gateway - Control Plane) @@ -72,7 +72,7 @@ Package: open5gs-smf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: SMF (Session Management Function) @@ -84,7 +84,7 @@ Package: open5gs-amf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: AMF (Access and Mobility Management Function) @@ -96,7 +96,7 @@ Package: open5gs-sgwu Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: SGW-U (Serving Gateway - User Plane) @@ -110,7 +110,7 @@ Package: open5gs-upf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${shlibs:Depends}, ${misc:Depends}, udev, open5gs-common (= ${binary:Version}) @@ -123,7 +123,7 @@ Package: open5gs-hss Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${shlibs:Depends}, ${misc:Depends}, mongodb-org | mongodb, open5gs-common (= ${binary:Version}) @@ -140,7 +140,7 @@ Package: open5gs-pcrf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${shlibs:Depends}, ${misc:Depends}, mongodb-org | mongodb, open5gs-common (= ${binary:Version}) @@ -156,7 +156,7 @@ Package: open5gs-nrf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: NRF (Network Repository Function) @@ -168,7 +168,7 @@ Package: open5gs-ausf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: AUSF (Authentication Server Function) @@ -180,7 +180,7 @@ Package: open5gs-udm Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: UDM (Unified Data Management) @@ -192,7 +192,7 @@ Package: open5gs-pcf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: PCF (Policy Control Function) @@ -204,7 +204,7 @@ Package: open5gs-nssf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: NSSF (Network Slice Selection Function) @@ -216,7 +216,7 @@ Package: open5gs-bsf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: BSF (Binding Support Function) @@ -228,7 +228,7 @@ Package: open5gs-udr Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: UDR (Unified Data Repository) @@ -240,7 +240,7 @@ Package: open5gs Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${misc:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${misc:Depends}, open5gs-common (= ${binary:Version}), open5gs-mme (= ${binary:Version}), open5gs-sgwc (= ${binary:Version}), @@ -266,7 +266,7 @@ Package: open5gs-dbg Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202208020002), ${misc:Depends}, +Depends: osmocom-nightly (= 1.0.0.202208030002), ${misc:Depends}, open5gs (= ${binary:Version}) Description: Debug symbols for Open5GS Open5GS is a C-language implementation of 5G Core and EPC
View file
open5gs_2.4.9.202208020002.tar.xz/lib/sbi/context.c -> open5gs_2.4.9.202208030002.tar.xz/lib/sbi/context.c
Changed
@@ -400,6 +400,27 @@ ogs_socknode_remove_all(&list); ogs_socknode_remove_all(&list6); } + } else if (!strcmp(local_key, "service_name")) { + ogs_yaml_iter_t service_name_iter; + ogs_yaml_iter_recurse(&local_iter, &service_name_iter); + ogs_assert(ogs_yaml_iter_type( + &service_name_iter) != YAML_MAPPING_NODE); + + do { + const char *v = NULL; + + if (ogs_yaml_iter_type(&service_name_iter) == + YAML_SEQUENCE_NODE) { + if (!ogs_yaml_iter_next(&service_name_iter)) + break; + } + + v = ogs_yaml_iter_value(&service_name_iter); + if (v && strlen(v)) + self.service_nameself.num_of_service_name++ = v; + + } while (ogs_yaml_iter_type( + &service_name_iter) == YAML_SEQUENCE_NODE); } } } else if (nrf && !strcmp(root_key, nrf)) { @@ -706,6 +727,24 @@ return OGS_OK; } +bool ogs_sbi_nf_service_is_available(const char *name) +{ + int i; + + ogs_assert(name); + + if (self.num_of_service_name == 0) + /* If no service name is configured, all services are available */ + return true; + + for (i = 0; i < self.num_of_service_name; i++) + /* Only services in the configuration are available */ + if (strcmp(self.service_namei, name) == 0) + return true; + + return false; +} + ogs_sbi_nf_instance_t *ogs_sbi_nf_instance_add(void) { ogs_sbi_nf_instance_t *nf_instance = NULL; @@ -856,7 +895,7 @@ ogs_sbi_nf_service_t *ogs_sbi_nf_service_add( ogs_sbi_nf_instance_t *nf_instance, - char *id, char *name, OpenAPI_uri_scheme_e scheme) + char *id, const char *name, OpenAPI_uri_scheme_e scheme) { ogs_sbi_nf_service_t *nf_service = NULL; @@ -888,7 +927,7 @@ } void ogs_sbi_nf_service_add_version(ogs_sbi_nf_service_t *nf_service, - char *in_uri, char *full, char *expiry) + const char *in_uri, const char *full, const char *expiry) { ogs_assert(nf_service); @@ -1148,7 +1187,7 @@ } ogs_sbi_nf_service_t *ogs_sbi_nf_service_build_default( - ogs_sbi_nf_instance_t *nf_instance, char *name) + ogs_sbi_nf_instance_t *nf_instance, const char *name) { ogs_sbi_server_t *server = NULL; ogs_sbi_nf_service_t *nf_service = NULL;
View file
open5gs_2.4.9.202208020002.tar.xz/lib/sbi/context.h -> open5gs_2.4.9.202208030002.tar.xz/lib/sbi/context.h
Changed
@@ -68,6 +68,8 @@ void (*client_wait_expire)(void *data); ogs_fsm_handler_t nf_state_registered; + int num_of_service_name; + const char *service_nameOGS_MAX_NUM_OF_NF_SERVICE; } ogs_sbi_context_t; typedef struct ogs_sbi_nf_instance_s { @@ -271,6 +273,8 @@ int ogs_sbi_context_parse_config( const char *local, const char *nrf, const char *scp); +bool ogs_sbi_nf_service_is_available(const char *name); + ogs_sbi_nf_instance_t *ogs_sbi_scp_instance(void); ogs_sbi_nf_instance_t *ogs_sbi_nf_instance_add(void); @@ -287,10 +291,12 @@ ogs_sbi_nf_instance_t *ogs_sbi_nf_instance_find(char *id); bool ogs_sbi_nf_instance_maximum_number_is_reached(void); -ogs_sbi_nf_service_t *ogs_sbi_nf_service_add(ogs_sbi_nf_instance_t *nf_instance, - char *id, char *name, OpenAPI_uri_scheme_e scheme); -void ogs_sbi_nf_service_add_version(ogs_sbi_nf_service_t *nf_service, - char *in_uri, char *full, char *expiry); +ogs_sbi_nf_service_t *ogs_sbi_nf_service_add( + ogs_sbi_nf_instance_t *nf_instance, + char *id, const char *name, OpenAPI_uri_scheme_e scheme); +void ogs_sbi_nf_service_add_version( + ogs_sbi_nf_service_t *nf_service, + const char *in_uri, const char *full, const char *expiry); void ogs_sbi_nf_service_add_allowed_nf_type( ogs_sbi_nf_service_t *nf_service, OpenAPI_nf_type_e allowed_nf_type); void ogs_sbi_nf_service_clear(ogs_sbi_nf_service_t *nf_service); @@ -309,7 +315,7 @@ void ogs_sbi_nf_instance_build_default( ogs_sbi_nf_instance_t *nf_instance, OpenAPI_nf_type_e nf_type); ogs_sbi_nf_service_t *ogs_sbi_nf_service_build_default( - ogs_sbi_nf_instance_t *nf_instance, char *name); + ogs_sbi_nf_instance_t *nf_instance, const char *name); ogs_sbi_client_t *ogs_sbi_client_find_by_service_name( ogs_sbi_nf_instance_t *nf_instance, char *name, char *version);
View file
open5gs_2.4.9.202208020002.tar.xz/lib/sbi/message.h -> open5gs_2.4.9.202208030002.tar.xz/lib/sbi/message.h
Changed
@@ -122,7 +122,6 @@ #define OGS_SBI_SERVICE_NAME_NSMF_PDUSESSION "nsmf-pdusession" #define OGS_SBI_RESOURCE_NAME_SM_CONTEXTS "sm-contexts" -#define OGS_SBI_SERVICE_NAME_NSMF_EVENT_EXPOSURE "nsmf-event-exposure" #define OGS_SBI_RESOURCE_NAME_MODIFY "modify" #define OGS_SBI_RESOURCE_NAME_RELEASE "release"
View file
open5gs_2.4.9.202208020002.tar.xz/src/amf/context.c -> open5gs_2.4.9.202208030002.tar.xz/src/amf/context.c
Changed
@@ -821,6 +821,8 @@ self.amf_name = ogs_yaml_iter_value(&amf_iter); } else if (!strcmp(amf_key, "sbi")) { /* handle config in sbi library */ + } else if (!strcmp(amf_key, "service_name")) { + /* handle config in sbi library */ } else ogs_warn("unknown key `%s`", amf_key); }
View file
open5gs_2.4.9.202208020002.tar.xz/src/amf/context.h -> open5gs_2.4.9.202208030002.tar.xz/src/amf/context.h
Changed
@@ -203,6 +203,7 @@ if ((_nFInstance)->reference_count == 1) { \ ogs_info("%s (%s) NF removed", (_nFInstance)->id, (_cAUSE)); \ amf_nf_fsm_fini((_nFInstance)); \ + ogs_sbi_nf_instance_remove(_nFInstance); \ } else { \ /* There is an assocation with other context */ \ ogs_info("%s:%d (%s) NF suspended", \ @@ -210,7 +211,6 @@ OGS_FSM_TRAN(&_nFInstance->sm, amf_nf_state_de_registered); \ ogs_fsm_dispatch(&_nFInstance->sm, NULL); \ } \ - ogs_sbi_nf_instance_remove(_nFInstance); \ } while(0) struct amf_ue_s {
View file
open5gs_2.4.9.202208020002.tar.xz/src/amf/nnrf-handler.c -> open5gs_2.4.9.202208030002.tar.xz/src/amf/nnrf-handler.c
Changed
@@ -183,8 +183,6 @@ ogs_info("%s (NRF-notify) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, amf_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL); @@ -314,8 +312,6 @@ ogs_info("%s (NF-discover) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, amf_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL);
View file
open5gs_2.4.9.202208020002.tar.xz/src/amf/sbi-path.c -> open5gs_2.4.9.202208030002.tar.xz/src/amf/sbi-path.c
Changed
@@ -91,12 +91,14 @@ ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_SMF); /* Build NF service information. It will be transmitted to NRF. */ - service = ogs_sbi_nf_service_build_default(nf_instance, - (char*)OGS_SBI_SERVICE_NAME_NAMF_COMM); - ogs_assert(service); - ogs_sbi_nf_service_add_version(service, (char*)OGS_SBI_API_V1, - (char*)OGS_SBI_API_V1_0_0, NULL); - ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_SMF); + if (ogs_sbi_nf_service_is_available(OGS_SBI_SERVICE_NAME_NAMF_COMM)) { + service = ogs_sbi_nf_service_build_default( + nf_instance, OGS_SBI_SERVICE_NAME_NAMF_COMM); + ogs_assert(service); + ogs_sbi_nf_service_add_version( + service, OGS_SBI_API_V1, OGS_SBI_API_V1_0_0, NULL); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_SMF); + } /* Initialize SCP NF Instance */ nf_instance = ogs_sbi_self()->scp_instance;
View file
open5gs_2.4.9.202208020002.tar.xz/src/ausf/context.c -> open5gs_2.4.9.202208030002.tar.xz/src/ausf/context.c
Changed
@@ -102,6 +102,8 @@ ogs_assert(ausf_key); if (!strcmp(ausf_key, "sbi")) { /* handle config in sbi library */ + } else if (!strcmp(ausf_key, "service_name")) { + /* handle config in sbi library */ } else ogs_warn("unknown key `%s`", ausf_key); }
View file
open5gs_2.4.9.202208020002.tar.xz/src/ausf/context.h -> open5gs_2.4.9.202208030002.tar.xz/src/ausf/context.h
Changed
@@ -70,6 +70,7 @@ if ((_nFInstance)->reference_count == 1) { \ ogs_info("%s (%s) NF removed", (_nFInstance)->id, (_cAUSE)); \ ausf_nf_fsm_fini((_nFInstance)); \ + ogs_sbi_nf_instance_remove(_nFInstance); \ } else { \ /* There is an assocation with other context */ \ ogs_info("%s:%d (%s) NF suspended", \ @@ -77,7 +78,6 @@ OGS_FSM_TRAN(&_nFInstance->sm, ausf_nf_state_de_registered); \ ogs_fsm_dispatch(&_nFInstance->sm, NULL); \ } \ - ogs_sbi_nf_instance_remove(_nFInstance); \ } while(0) };
View file
open5gs_2.4.9.202208020002.tar.xz/src/ausf/nnrf-handler.c -> open5gs_2.4.9.202208030002.tar.xz/src/ausf/nnrf-handler.c
Changed
@@ -180,8 +180,6 @@ ogs_info("%s (NRF-notify) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, ausf_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL); @@ -292,8 +290,6 @@ ogs_info("%s (NF-discover) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, ausf_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL);
View file
open5gs_2.4.9.202208020002.tar.xz/src/ausf/sbi-path.c -> open5gs_2.4.9.202208030002.tar.xz/src/ausf/sbi-path.c
Changed
@@ -88,12 +88,14 @@ ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_AMF); /* Build NF service information. It will be transmitted to NRF. */ - service = ogs_sbi_nf_service_build_default(nf_instance, - (char*)OGS_SBI_SERVICE_NAME_NAUSF_AUTH); - ogs_assert(service); - ogs_sbi_nf_service_add_version(service, (char*)OGS_SBI_API_V1, - (char*)OGS_SBI_API_V1_0_0, NULL); - ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AMF); + if (ogs_sbi_nf_service_is_available(OGS_SBI_SERVICE_NAME_NAUSF_AUTH)) { + service = ogs_sbi_nf_service_build_default( + nf_instance, OGS_SBI_SERVICE_NAME_NAUSF_AUTH); + ogs_assert(service); + ogs_sbi_nf_service_add_version( + service, OGS_SBI_API_V1, OGS_SBI_API_V1_0_0, NULL); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AMF); + } /* Initialize NRF NF Instance */ ogs_list_for_each(&ogs_sbi_self()->nf_instance_list, nf_instance) {
View file
open5gs_2.4.9.202208020002.tar.xz/src/bsf/context.c -> open5gs_2.4.9.202208030002.tar.xz/src/bsf/context.c
Changed
@@ -104,6 +104,8 @@ ogs_assert(bsf_key); if (!strcmp(bsf_key, "sbi")) { /* handle config in sbi library */ + } else if (!strcmp(bsf_key, "service_name")) { + /* handle config in sbi library */ } else ogs_warn("unknown key `%s`", bsf_key); }
View file
open5gs_2.4.9.202208020002.tar.xz/src/bsf/context.h -> open5gs_2.4.9.202208030002.tar.xz/src/bsf/context.h
Changed
@@ -48,6 +48,7 @@ if ((_nFInstance)->reference_count == 1) { \ ogs_info("%s (%s) NF removed", (_nFInstance)->id, (_cAUSE)); \ bsf_nf_fsm_fini((_nFInstance)); \ + ogs_sbi_nf_instance_remove(_nFInstance); \ } else { \ /* There is an assocation with other context */ \ ogs_info("%s:%d (%s) NF suspended", \ @@ -55,7 +56,6 @@ OGS_FSM_TRAN(&_nFInstance->sm, bsf_nf_state_de_registered); \ ogs_fsm_dispatch(&_nFInstance->sm, NULL); \ } \ - ogs_sbi_nf_instance_remove(_nFInstance); \ } while(0) typedef struct bsf_sess_s bsf_sess_t;
View file
open5gs_2.4.9.202208020002.tar.xz/src/bsf/nnrf-handler.c -> open5gs_2.4.9.202208030002.tar.xz/src/bsf/nnrf-handler.c
Changed
@@ -181,8 +181,6 @@ ogs_info("%s (NRF-notify) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, bsf_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL); @@ -293,8 +291,6 @@ ogs_info("%s (NF-discover) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, bsf_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL);
View file
open5gs_2.4.9.202208020002.tar.xz/src/bsf/sbi-path.c -> open5gs_2.4.9.202208030002.tar.xz/src/bsf/sbi-path.c
Changed
@@ -88,12 +88,14 @@ ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_PCF); /* Build NF service information. It will be transmitted to NRF. */ - service = ogs_sbi_nf_service_build_default(nf_instance, - (char*)OGS_SBI_SERVICE_NAME_NBSF_MANAGEMENT); - ogs_assert(service); - ogs_sbi_nf_service_add_version(service, (char*)OGS_SBI_API_V1, - (char*)OGS_SBI_API_V1_0_0, NULL); - ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_PCF); + if (ogs_sbi_nf_service_is_available(OGS_SBI_SERVICE_NAME_NBSF_MANAGEMENT)) { + service = ogs_sbi_nf_service_build_default( + nf_instance, OGS_SBI_SERVICE_NAME_NBSF_MANAGEMENT); + ogs_assert(service); + ogs_sbi_nf_service_add_version( + service, OGS_SBI_API_V1, OGS_SBI_API_V1_0_0, NULL); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_PCF); + } /* Initialize NRF NF Instance */ ogs_list_for_each(&ogs_sbi_self()->nf_instance_list, nf_instance) {
View file
open5gs_2.4.9.202208020002.tar.xz/src/nssf/context.c -> open5gs_2.4.9.202208030002.tar.xz/src/nssf/context.c
Changed
@@ -96,6 +96,8 @@ ogs_assert(nssf_key); if (!strcmp(nssf_key, "sbi")) { /* handle config in sbi library */ + } else if (!strcmp(nssf_key, "service_name")) { + /* handle config in sbi library */ } else if (!strcmp(nssf_key, "nsi")) { ogs_list_t list, list6; ogs_socknode_t *node = NULL, *node6 = NULL;
View file
open5gs_2.4.9.202208020002.tar.xz/src/nssf/context.h -> open5gs_2.4.9.202208030002.tar.xz/src/nssf/context.h
Changed
@@ -47,6 +47,7 @@ if ((_nFInstance)->reference_count == 1) { \ ogs_info("%s (%s) NF removed", (_nFInstance)->id, (_cAUSE)); \ nssf_nf_fsm_fini((_nFInstance)); \ + ogs_sbi_nf_instance_remove(_nFInstance); \ } else { \ /* There is an assocation with other context */ \ ogs_info("%s:%d (%s) NF suspended", \ @@ -54,7 +55,6 @@ OGS_FSM_TRAN(&_nFInstance->sm, nssf_nf_state_de_registered); \ ogs_fsm_dispatch(&_nFInstance->sm, NULL); \ } \ - ogs_sbi_nf_instance_remove(_nFInstance); \ } while(0) void nssf_context_init(void);
View file
open5gs_2.4.9.202208020002.tar.xz/src/nssf/nnrf-handler.c -> open5gs_2.4.9.202208030002.tar.xz/src/nssf/nnrf-handler.c
Changed
@@ -180,8 +180,6 @@ ogs_info("%s (NRF-notify) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, nssf_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL);
View file
open5gs_2.4.9.202208020002.tar.xz/src/nssf/sbi-path.c -> open5gs_2.4.9.202208030002.tar.xz/src/nssf/sbi-path.c
Changed
@@ -88,12 +88,15 @@ ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_AMF); /* Build NF service information. It will be transmitted to NRF. */ - service = ogs_sbi_nf_service_build_default(nf_instance, - (char*)OGS_SBI_SERVICE_NAME_NNSSF_NSSELECTION); - ogs_assert(service); - ogs_sbi_nf_service_add_version(service, (char*)OGS_SBI_API_V2, - (char*)OGS_SBI_API_V2_0_0, NULL); - ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AMF); + if (ogs_sbi_nf_service_is_available( + OGS_SBI_SERVICE_NAME_NNSSF_NSSELECTION)) { + service = ogs_sbi_nf_service_build_default( + nf_instance, OGS_SBI_SERVICE_NAME_NNSSF_NSSELECTION); + ogs_assert(service); + ogs_sbi_nf_service_add_version( + service, OGS_SBI_API_V2, OGS_SBI_API_V2_0_0, NULL); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AMF); + } /* Initialize NRF NF Instance */ ogs_list_for_each(&ogs_sbi_self()->nf_instance_list, nf_instance) {
View file
open5gs_2.4.9.202208020002.tar.xz/src/pcf/context.c -> open5gs_2.4.9.202208030002.tar.xz/src/pcf/context.c
Changed
@@ -117,6 +117,8 @@ ogs_assert(pcf_key); if (!strcmp(pcf_key, "sbi")) { /* handle config in sbi library */ + } else if (!strcmp(pcf_key, "service_name")) { + /* handle config in sbi library */ } else ogs_warn("unknown key `%s`", pcf_key); }
View file
open5gs_2.4.9.202208020002.tar.xz/src/pcf/context.h -> open5gs_2.4.9.202208030002.tar.xz/src/pcf/context.h
Changed
@@ -53,6 +53,7 @@ if ((_nFInstance)->reference_count == 1) { \ ogs_info("%s (%s) NF removed", (_nFInstance)->id, (_cAUSE)); \ pcf_nf_fsm_fini((_nFInstance)); \ + ogs_sbi_nf_instance_remove(_nFInstance); \ } else { \ /* There is an assocation with other context */ \ ogs_info("%s:%d (%s) NF suspended", \ @@ -60,7 +61,6 @@ OGS_FSM_TRAN(&_nFInstance->sm, pcf_nf_state_de_registered); \ ogs_fsm_dispatch(&_nFInstance->sm, NULL); \ } \ - ogs_sbi_nf_instance_remove(_nFInstance); \ } while(0) struct pcf_ue_s {
View file
open5gs_2.4.9.202208020002.tar.xz/src/pcf/nnrf-handler.c -> open5gs_2.4.9.202208030002.tar.xz/src/pcf/nnrf-handler.c
Changed
@@ -181,8 +181,6 @@ ogs_info("%s (NRF-notify) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, pcf_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL); @@ -294,8 +292,6 @@ ogs_info("%s (NF-discover) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, pcf_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL);
View file
open5gs_2.4.9.202208020002.tar.xz/src/pcf/sbi-path.c -> open5gs_2.4.9.202208030002.tar.xz/src/pcf/sbi-path.c
Changed
@@ -91,22 +91,38 @@ ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_AF); /* Build NF service information. It will be transmitted to NRF. */ - service = ogs_sbi_nf_service_build_default(nf_instance, - (char*)OGS_SBI_SERVICE_NAME_NPCF_AM_POLICY_CONTROL); - ogs_assert(service); - ogs_sbi_nf_service_add_version(service, (char*)OGS_SBI_API_V1, - (char*)OGS_SBI_API_V1_0_0, NULL); - ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AMF); - ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_NEF); + if (ogs_sbi_nf_service_is_available( + OGS_SBI_SERVICE_NAME_NPCF_AM_POLICY_CONTROL)) { + service = ogs_sbi_nf_service_build_default( + nf_instance, OGS_SBI_SERVICE_NAME_NPCF_AM_POLICY_CONTROL); + ogs_assert(service); + ogs_sbi_nf_service_add_version( + service, OGS_SBI_API_V1, OGS_SBI_API_V1_0_0, NULL); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AMF); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_NEF); + } - service = ogs_sbi_nf_service_build_default(nf_instance, - (char*)OGS_SBI_SERVICE_NAME_NPCF_SMPOLICYCONTROL); - ogs_assert(service); - ogs_sbi_nf_service_add_version(service, (char*)OGS_SBI_API_V1, - (char*)OGS_SBI_API_V1_0_0, NULL); - ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_SMF); - ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_NEF); - ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AF); + if (ogs_sbi_nf_service_is_available( + OGS_SBI_SERVICE_NAME_NPCF_SMPOLICYCONTROL)) { + service = ogs_sbi_nf_service_build_default( + nf_instance, OGS_SBI_SERVICE_NAME_NPCF_SMPOLICYCONTROL); + ogs_assert(service); + ogs_sbi_nf_service_add_version( + service, OGS_SBI_API_V1, OGS_SBI_API_V1_0_0, NULL); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_SMF); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_NEF); + } + + if (ogs_sbi_nf_service_is_available( + OGS_SBI_SERVICE_NAME_NPCF_POLICYAUTHORIZATION)) { + service = ogs_sbi_nf_service_build_default( + nf_instance, OGS_SBI_SERVICE_NAME_NPCF_POLICYAUTHORIZATION); + ogs_assert(service); + ogs_sbi_nf_service_add_version( + service, OGS_SBI_API_V1, OGS_SBI_API_V1_0_0, NULL); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AF); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_NEF); + } /* Initialize NRF NF Instance */ ogs_list_for_each(&ogs_sbi_self()->nf_instance_list, nf_instance) {
View file
open5gs_2.4.9.202208020002.tar.xz/src/scp/context.c -> open5gs_2.4.9.202208030002.tar.xz/src/scp/context.c
Changed
@@ -96,6 +96,8 @@ ogs_assert(scp_key); if (!strcmp(scp_key, "sbi")) { /* handle config in sbi library */ + } else if (!strcmp(scp_key, "service_name")) { + /* handle config in sbi library */ } else ogs_warn("unknown key `%s`", scp_key); }
View file
open5gs_2.4.9.202208020002.tar.xz/src/scp/context.h -> open5gs_2.4.9.202208030002.tar.xz/src/scp/context.h
Changed
@@ -45,6 +45,7 @@ if ((_nFInstance)->reference_count == 1) { \ ogs_info("%s (%s) NF removed", (_nFInstance)->id, (_cAUSE)); \ scp_nf_fsm_fini((_nFInstance)); \ + ogs_sbi_nf_instance_remove(_nFInstance); \ } else { \ /* There is an assocation with other context */ \ ogs_info("%s:%d (%s) NF suspended", \ @@ -52,7 +53,6 @@ OGS_FSM_TRAN(&_nFInstance->sm, scp_nf_state_de_registered); \ ogs_fsm_dispatch(&_nFInstance->sm, NULL); \ } \ - ogs_sbi_nf_instance_remove(_nFInstance); \ } while(0) typedef struct scp_conn_s scp_conn_t;
View file
open5gs_2.4.9.202208020002.tar.xz/src/scp/nnrf-handler.c -> open5gs_2.4.9.202208030002.tar.xz/src/scp/nnrf-handler.c
Changed
@@ -181,8 +181,6 @@ ogs_info("%s (NRF-notify) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, scp_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL); @@ -293,8 +291,6 @@ ogs_info("%s (NF-discover) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, scp_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL);
View file
open5gs_2.4.9.202208020002.tar.xz/src/smf/context.c -> open5gs_2.4.9.202208030002.tar.xz/src/smf/context.c
Changed
@@ -831,6 +831,8 @@ /* handle config in pfcp library */ } else if (!strcmp(smf_key, "sbi")) { /* handle config in sbi library */ + } else if (!strcmp(smf_key, "service_name")) { + /* handle config in sbi library */ } else ogs_warn("unknown key `%s`", smf_key); }
View file
open5gs_2.4.9.202208020002.tar.xz/src/smf/context.h -> open5gs_2.4.9.202208030002.tar.xz/src/smf/context.h
Changed
@@ -132,6 +132,7 @@ if ((_nFInstance)->reference_count == 1) { \ ogs_info("%s (%s) NF removed", (_nFInstance)->id, (_cAUSE)); \ smf_nf_fsm_fini((_nFInstance)); \ + ogs_sbi_nf_instance_remove(_nFInstance); \ } else { \ /* There is an assocation with other context */ \ ogs_info("%s:%d (%s) NF suspended", \ @@ -139,7 +140,6 @@ OGS_FSM_TRAN(&_nFInstance->sm, smf_nf_state_de_registered); \ ogs_fsm_dispatch(&_nFInstance->sm, NULL); \ } \ - ogs_sbi_nf_instance_remove(_nFInstance); \ } while(0) #define SMF_SESS_CLEAR(__sESS) \ do { \
View file
open5gs_2.4.9.202208020002.tar.xz/src/smf/nnrf-handler.c -> open5gs_2.4.9.202208030002.tar.xz/src/smf/nnrf-handler.c
Changed
@@ -181,8 +181,6 @@ ogs_info("%s (NRF-notify) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, smf_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL); @@ -293,8 +291,6 @@ ogs_info("%s (NF-discover) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, smf_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL);
View file
open5gs_2.4.9.202208020002.tar.xz/src/smf/sbi-path.c -> open5gs_2.4.9.202208030002.tar.xz/src/smf/sbi-path.c
Changed
@@ -90,12 +90,14 @@ ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_AMF); /* Build NF service information. It will be transmitted to NRF. */ - service = ogs_sbi_nf_service_build_default(nf_instance, - (char*)OGS_SBI_SERVICE_NAME_NSMF_PDUSESSION); - ogs_assert(service); - ogs_sbi_nf_service_add_version(service, (char*)OGS_SBI_API_V1, - (char*)OGS_SBI_API_V1_0_0, NULL); - ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AMF); + if (ogs_sbi_nf_service_is_available(OGS_SBI_SERVICE_NAME_NSMF_PDUSESSION)) { + service = ogs_sbi_nf_service_build_default( + nf_instance, OGS_SBI_SERVICE_NAME_NSMF_PDUSESSION); + ogs_assert(service); + ogs_sbi_nf_service_add_version( + service, OGS_SBI_API_V1, OGS_SBI_API_V1_0_0, NULL); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AMF); + } /* Initialize NRF NF Instance */ ogs_list_for_each(&ogs_sbi_self()->nf_instance_list, nf_instance) {
View file
open5gs_2.4.9.202208020002.tar.xz/src/udm/context.c -> open5gs_2.4.9.202208030002.tar.xz/src/udm/context.c
Changed
@@ -102,6 +102,8 @@ ogs_assert(udm_key); if (!strcmp(udm_key, "sbi")) { /* handle config in sbi library */ + } else if (!strcmp(udm_key, "service_name")) { + /* handle config in sbi library */ } else ogs_warn("unknown key `%s`", udm_key); }
View file
open5gs_2.4.9.202208020002.tar.xz/src/udm/context.h -> open5gs_2.4.9.202208030002.tar.xz/src/udm/context.h
Changed
@@ -79,6 +79,7 @@ if ((_nFInstance)->reference_count == 1) { \ ogs_info("%s (%s) NF removed", (_nFInstance)->id, (_cAUSE)); \ udm_nf_fsm_fini((_nFInstance)); \ + ogs_sbi_nf_instance_remove(_nFInstance); \ } else { \ /* There is an assocation with other context */ \ ogs_info("%s:%d (%s) NF suspended", \ @@ -86,7 +87,6 @@ OGS_FSM_TRAN(&_nFInstance->sm, udm_nf_state_de_registered); \ ogs_fsm_dispatch(&_nFInstance->sm, NULL); \ } \ - ogs_sbi_nf_instance_remove(_nFInstance); \ } while(0) };
View file
open5gs_2.4.9.202208020002.tar.xz/src/udm/nnrf-handler.c -> open5gs_2.4.9.202208030002.tar.xz/src/udm/nnrf-handler.c
Changed
@@ -181,8 +181,6 @@ ogs_info("%s (NRF-notify) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, udm_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL); @@ -293,8 +291,6 @@ ogs_info("%s (NF-discover) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, udm_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL);
View file
open5gs_2.4.9.202208020002.tar.xz/src/udm/sbi-path.c -> open5gs_2.4.9.202208030002.tar.xz/src/udm/sbi-path.c
Changed
@@ -90,25 +90,33 @@ ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_AUSF); /* Build NF service information. It will be transmitted to NRF. */ - service = ogs_sbi_nf_service_build_default(nf_instance, - (char*)OGS_SBI_SERVICE_NAME_NUDM_UEAU); - ogs_assert(service); - ogs_sbi_nf_service_add_version(service, (char*)OGS_SBI_API_V1, - (char*)OGS_SBI_API_V1_0_0, NULL); - ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AUSF); - service = ogs_sbi_nf_service_build_default(nf_instance, - (char*)OGS_SBI_SERVICE_NAME_NUDM_UECM); - ogs_assert(service); - ogs_sbi_nf_service_add_version(service, (char*)OGS_SBI_API_V1, - (char*)OGS_SBI_API_V1_0_0, NULL); - ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AMF); - service = ogs_sbi_nf_service_build_default(nf_instance, - (char*)OGS_SBI_SERVICE_NAME_NUDM_SDM); - ogs_assert(service); - ogs_sbi_nf_service_add_version(service, (char*)OGS_SBI_API_V2, - (char*)OGS_SBI_API_V2_0_0, NULL); - ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AMF); - ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_SMF); + if (ogs_sbi_nf_service_is_available(OGS_SBI_SERVICE_NAME_NUDM_UEAU)) { + service = ogs_sbi_nf_service_build_default( + nf_instance, OGS_SBI_SERVICE_NAME_NUDM_UEAU); + ogs_assert(service); + ogs_sbi_nf_service_add_version( + service, OGS_SBI_API_V1, OGS_SBI_API_V1_0_0, NULL); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AUSF); + } + + if (ogs_sbi_nf_service_is_available(OGS_SBI_SERVICE_NAME_NUDM_UECM)) { + service = ogs_sbi_nf_service_build_default( + nf_instance, OGS_SBI_SERVICE_NAME_NUDM_UECM); + ogs_assert(service); + ogs_sbi_nf_service_add_version( + service, OGS_SBI_API_V1, OGS_SBI_API_V1_0_0, NULL); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AMF); + } + + if (ogs_sbi_nf_service_is_available(OGS_SBI_SERVICE_NAME_NUDM_SDM)) { + service = ogs_sbi_nf_service_build_default( + nf_instance, OGS_SBI_SERVICE_NAME_NUDM_SDM); + ogs_assert(service); + ogs_sbi_nf_service_add_version( + service, OGS_SBI_API_V2, OGS_SBI_API_V2_0_0, NULL); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AMF); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_SMF); + } /* Initialize NRF NF Instance */ ogs_list_for_each(&ogs_sbi_self()->nf_instance_list, nf_instance) {
View file
open5gs_2.4.9.202208020002.tar.xz/src/udr/context.c -> open5gs_2.4.9.202208030002.tar.xz/src/udr/context.c
Changed
@@ -84,6 +84,8 @@ ogs_assert(udr_key); if (!strcmp(udr_key, "sbi")) { /* handle config in sbi library */ + } else if (!strcmp(udr_key, "service_name")) { + /* handle config in sbi library */ } else ogs_warn("unknown key `%s`", udr_key); }
View file
open5gs_2.4.9.202208020002.tar.xz/src/udr/context.h -> open5gs_2.4.9.202208030002.tar.xz/src/udr/context.h
Changed
@@ -47,6 +47,7 @@ if ((_nFInstance)->reference_count == 1) { \ ogs_info("%s (%s) NF removed", (_nFInstance)->id, (_cAUSE)); \ udr_nf_fsm_fini((_nFInstance)); \ + ogs_sbi_nf_instance_remove(_nFInstance); \ } else { \ /* There is an assocation with other context */ \ ogs_info("%s:%d (%s) NF suspended", \ @@ -54,7 +55,6 @@ OGS_FSM_TRAN(&_nFInstance->sm, udr_nf_state_de_registered); \ ogs_fsm_dispatch(&_nFInstance->sm, NULL); \ } \ - ogs_sbi_nf_instance_remove(_nFInstance); \ } while(0) void udr_context_init(void);
View file
open5gs_2.4.9.202208020002.tar.xz/src/udr/nnrf-handler.c -> open5gs_2.4.9.202208030002.tar.xz/src/udr/nnrf-handler.c
Changed
@@ -181,8 +181,6 @@ ogs_info("%s (NRF-notify) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, udr_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL);
View file
open5gs_2.4.9.202208020002.tar.xz/src/udr/sbi-path.c -> open5gs_2.4.9.202208030002.tar.xz/src/udr/sbi-path.c
Changed
@@ -89,13 +89,15 @@ ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_UDM); /* Build NF service information. It will be transmitted to NRF. */ - service = ogs_sbi_nf_service_build_default(nf_instance, - (char*)OGS_SBI_SERVICE_NAME_NUDR_DR); - ogs_assert(service); - ogs_sbi_nf_service_add_version(service, (char*)OGS_SBI_API_V1, - (char*)OGS_SBI_API_V1_0_0, NULL); - ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_PCF); - ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_UDM); + if (ogs_sbi_nf_service_is_available(OGS_SBI_SERVICE_NAME_NUDR_DR)) { + service = ogs_sbi_nf_service_build_default( + nf_instance, OGS_SBI_SERVICE_NAME_NUDR_DR); + ogs_assert(service); + ogs_sbi_nf_service_add_version( + service, OGS_SBI_API_V1, OGS_SBI_API_V1_0_0, NULL); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_PCF); + ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_UDM); + } /* Initialize NRF NF Instance */ ogs_list_for_each(&ogs_sbi_self()->nf_instance_list, nf_instance) {
View file
open5gs_2.4.9.202208020002.tar.xz/tests/af/context.c -> open5gs_2.4.9.202208030002.tar.xz/tests/af/context.c
Changed
@@ -111,6 +111,8 @@ ogs_assert(af_key); if (!strcmp(af_key, "sbi")) { /* handle config in sbi library */ + } else if (!strcmp(af_key, "service_name")) { + /* handle config in sbi library */ } else ogs_warn("unknown key `%s`", af_key); }
View file
open5gs_2.4.9.202208020002.tar.xz/tests/af/context.h -> open5gs_2.4.9.202208030002.tar.xz/tests/af/context.h
Changed
@@ -52,6 +52,7 @@ if ((_nFInstance)->reference_count == 1) { \ ogs_info("%s (%s) NF removed", (_nFInstance)->id, (_cAUSE)); \ af_nf_fsm_fini((_nFInstance)); \ + ogs_sbi_nf_instance_remove(_nFInstance); \ } else { \ /* There is an assocation with other context */ \ ogs_info("%s:%d (%s) NF suspended", \ @@ -59,7 +60,6 @@ OGS_FSM_TRAN(&_nFInstance->sm, af_nf_state_de_registered); \ ogs_fsm_dispatch(&_nFInstance->sm, NULL); \ } \ - ogs_sbi_nf_instance_remove(_nFInstance); \ } while(0) typedef struct af_sess_s af_sess_t;
View file
open5gs_2.4.9.202208020002.tar.xz/tests/af/nnrf-handler.c -> open5gs_2.4.9.202208030002.tar.xz/tests/af/nnrf-handler.c
Changed
@@ -185,8 +185,6 @@ ogs_info("%s (NRF-notify) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, af_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL); @@ -297,8 +295,6 @@ ogs_info("%s (NF-discover) NF registered", nf_instance->id); } else { - nf_instance->reference_count++; - OGS_FSM_TRAN(&nf_instance->sm, af_nf_state_registered); ogs_fsm_dispatch(&nf_instance->sm, NULL);
View file
open5gs_2.4.9.202208020002.tar.xz/tests/af/sbi-path.c -> open5gs_2.4.9.202208030002.tar.xz/tests/af/sbi-path.c
Changed
@@ -87,11 +87,14 @@ ogs_sbi_nf_instance_build_default(nf_instance, OpenAPI_nf_type_AF); /* Build NF service information. It will be transmitted to NRF. */ - service = ogs_sbi_nf_service_build_default(nf_instance, - (char*)OGS_SBI_SERVICE_NAME_NAF_EVENTEXPOSURE); - ogs_assert(service); - ogs_sbi_nf_service_add_version(service, (char*)OGS_SBI_API_V1, - (char*)OGS_SBI_API_V1_0_0, NULL); + if (ogs_sbi_nf_service_is_available( + OGS_SBI_SERVICE_NAME_NAF_EVENTEXPOSURE)) { + service = ogs_sbi_nf_service_build_default( + nf_instance, OGS_SBI_SERVICE_NAME_NAF_EVENTEXPOSURE); + ogs_assert(service); + ogs_sbi_nf_service_add_version( + service, OGS_SBI_API_V1, OGS_SBI_API_V1_0_0, NULL); + } /* Initialize NRF NF Instance */ ogs_list_for_each(&ogs_sbi_self()->nf_instance_list, nf_instance) {
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.