Changes of Revision 132
commit_610b9980388e88b5c53193d712db07c21002491b.txt
Deleted
commit_b7386284a707953ac01071bf44ff460138b48e40.txt
Added
open5gs_2.6.0.3.610b9.dsc -> open5gs_2.6.0.4.b7386.dsc
Changed
x
1
2
Source: open5gs
3
Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-scp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
4
Architecture: any
5
-Version: 2.6.0.3.610b9
6
+Version: 2.6.0.4.b7386
7
Maintainer: Harald Welte <laforge@gnumonks.org>
8
Uploaders: Sukchan Lee <acetcom@gmail.com>
9
Homepage: https://open5gs.org
10
11
open5gs-udr deb net optional arch=any
12
open5gs-upf deb net optional arch=any
13
Checksums-Sha1:
14
- 5194e32e71a5c9eaeded9eec9400703eda77a552 13616112 open5gs_2.6.0.3.610b9.tar.xz
15
+ 98f1f69bb7517a2f0470b6dd178d415c38f12944 13614928 open5gs_2.6.0.4.b7386.tar.xz
16
Checksums-Sha256:
17
- 8e65cc572fde7657a1912fb412b941492be6d07cfdb92cb63f79881d97b4c766 13616112 open5gs_2.6.0.3.610b9.tar.xz
18
+ 88981381fae737b78616da0947738a596b8b4ddad4ee52218a67456dc38850c5 13614928 open5gs_2.6.0.4.b7386.tar.xz
19
Files:
20
- e3cabde3e770aebfeccf4029349431eb 13616112 open5gs_2.6.0.3.610b9.tar.xz
21
+ 9f3d99290f1d9e3607e4bbc0745f5df3 13614928 open5gs_2.6.0.4.b7386.tar.xz
22
open5gs_2.6.0.3.610b9.tar.xz/.tarball-version -> open5gs_2.6.0.4.b7386.tar.xz/.tarball-version
Changed
4
1
2
-2.6.0.3-610b9
3
+2.6.0.4-b7386
4
open5gs_2.6.0.3.610b9.tar.xz/debian/changelog -> open5gs_2.6.0.4.b7386.tar.xz/debian/changelog
Changed
12
1
2
-open5gs (2.6.0.3.610b9) unstable; urgency=medium
3
+open5gs (2.6.0.4.b7386) unstable; urgency=medium
4
5
* Automatically generated changelog entry for building the Osmocom master feed
6
7
- -- Osmocom OBS scripts <info@osmocom.org> Sun, 29 Jan 2023 00:19:51 +0000
8
+ -- Osmocom OBS scripts <info@osmocom.org> Sun, 29 Jan 2023 02:55:25 +0000
9
10
open5gs (2.5.6) unstable; urgency=medium
11
12
open5gs_2.6.0.3.610b9.tar.xz/lib/sbi/context.c -> open5gs_2.6.0.4.b7386.tar.xz/lib/sbi/context.c
Changed
69
1
2
static OGS_POOL(smf_info_pool, ogs_sbi_smf_info_t);
3
static OGS_POOL(nf_info_pool, ogs_sbi_nf_info_t);
4
5
-void ogs_sbi_context_init(void)
6
+void ogs_sbi_context_init(OpenAPI_nf_type_e nf_type)
7
{
8
char nf_instance_idOGS_UUID_FORMATTED_LENGTH + 1;
9
10
+ ogs_assert(nf_type);
11
+
12
ogs_assert(context_initialized == 0);
13
14
/* Initialize SBI context */
15
16
17
ogs_pool_init(&nf_info_pool, ogs_app()->pool.nf * OGS_MAX_NUM_OF_NF_INFO);
18
19
- /* Add AELF NF-Instance */
20
+ /* Add SELF NF-Instance */
21
self.nf_instance = ogs_sbi_nf_instance_add();
22
ogs_assert(self.nf_instance);
23
24
ogs_uuid_get(&self.uuid);
25
ogs_uuid_format(nf_instance_id, &self.uuid);
26
ogs_sbi_nf_instance_set_id(self.nf_instance, nf_instance_id);
27
+ ogs_sbi_nf_instance_set_type(self.nf_instance, nf_type);
28
29
/* Add NRF NF-Instance */
30
- self.nrf_instance = ogs_sbi_nf_instance_add();
31
- ogs_assert(self.nrf_instance);
32
- ogs_sbi_nf_instance_set_type(self.nrf_instance, OpenAPI_nf_type_NRF);
33
+ if (nf_type != OpenAPI_nf_type_NRF) {
34
+ self.nrf_instance = ogs_sbi_nf_instance_add();
35
+ ogs_assert(self.nrf_instance);
36
+ ogs_sbi_nf_instance_set_type(self.nrf_instance, OpenAPI_nf_type_NRF);
37
+ }
38
39
/* Add SCP NF-Instance */
40
self.scp_instance = ogs_sbi_nf_instance_add();
41
42
return NULL;
43
}
44
45
-void ogs_sbi_nf_instance_build_default(
46
- ogs_sbi_nf_instance_t *nf_instance, OpenAPI_nf_type_e nf_type)
47
+void ogs_sbi_nf_instance_build_default(ogs_sbi_nf_instance_t *nf_instance)
48
{
49
ogs_sbi_server_t *server = NULL;
50
char *hostname = NULL;
51
52
ogs_assert(nf_instance);
53
- ogs_assert(nf_type);
54
55
- ogs_sbi_nf_instance_set_type(nf_instance, nf_type);
56
ogs_sbi_nf_instance_set_status(nf_instance, OpenAPI_nf_status_REGISTERED);
57
58
hostname = NULL;
59
60
ogs_assert(target_nf_type);
61
ogs_assert(requester_nf_type);
62
63
+ if (NF_INSTANCE_EXCLUDED_FROM_DISCOVERY(nf_instance))
64
+ return false;
65
+
66
if (!OGS_FSM_CHECK(&nf_instance->sm, ogs_sbi_nf_state_registered))
67
return false;
68
69
open5gs_2.6.0.3.610b9.tar.xz/lib/sbi/context.h -> open5gs_2.6.0.4.b7386.tar.xz/lib/sbi/context.h
Changed
42
1
2
ogs_timer_t *t_no_heartbeat; /* check heartbeat */
3
ogs_timer_t *t_validity; /* check validation */
4
5
+ /*
6
+ * Issues #2034
7
+ *
8
+ * Other NF instances are obtained through NRF
9
+ * or created directly through configuration files.
10
+ *
11
+ * Other NFs created by the config file should not be passed
12
+ * through NRF discovery or anything like that.
13
+ *
14
+ * Since self-created NF Instances do not have an ID,
15
+ * they are implemented to exclude them from NRF Discovery.
16
+ */
17
+#define NF_INSTANCE_EXCLUDED_FROM_DISCOVERY(__nFInstance) \
18
+ (!(__nFInstance) || !((__nFInstance)->id))
19
+
20
#define NF_INSTANCE_ID(__nFInstance) \
21
((__nFInstance) ? ((__nFInstance)->id) : NULL)
22
#define NF_INSTANCE_ID_IS_SELF(_iD) \
23
24
};
25
} ogs_sbi_nf_info_t;
26
27
-void ogs_sbi_context_init(void);
28
+void ogs_sbi_context_init(OpenAPI_nf_type_e nf_type);
29
void ogs_sbi_context_final(void);
30
ogs_sbi_context_t *ogs_sbi_self(void);
31
int ogs_sbi_context_parse_config(
32
33
ogs_sbi_nf_info_t *ogs_sbi_nf_info_find(
34
ogs_list_t *list, OpenAPI_nf_type_e nf_type);
35
36
-void ogs_sbi_nf_instance_build_default(
37
- ogs_sbi_nf_instance_t *nf_instance, OpenAPI_nf_type_e nf_type);
38
+void ogs_sbi_nf_instance_build_default(ogs_sbi_nf_instance_t *nf_instance);
39
ogs_sbi_nf_service_t *ogs_sbi_nf_service_build_default(
40
ogs_sbi_nf_instance_t *nf_instance, const char *name);
41
42
open5gs_2.6.0.3.610b9.tar.xz/lib/sbi/path.c -> open5gs_2.6.0.4.b7386.tar.xz/lib/sbi/path.c
Changed
18
1
2
discovery_option = xact->discovery_option;
3
4
/* NRF NF-Instance */
5
- nf_instance = sbi_object->nf_type_arrayOpenAPI_nf_type_NRF.nf_instance;
6
- if (!nf_instance) {
7
- nf_instance = ogs_sbi_nf_instance_find_by_discovery_param(
8
- OpenAPI_nf_type_NRF, requester_nf_type, NULL);
9
- if (nf_instance)
10
- OGS_SBI_SETUP_NF_INSTANCE(
11
- sbi_object->nf_type_arrayOpenAPI_nf_type_NRF, nf_instance);
12
- }
13
-
14
+ nf_instance = ogs_sbi_self()->nrf_instance;
15
if (nf_instance) {
16
bool rc;
17
ogs_sbi_client_t *client = NULL;
18
open5gs_2.6.0.3.610b9.tar.xz/src/amf/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/amf/init.c
Changed
10
1
2
3
amf_metrics_init();
4
5
- ogs_sbi_context_init();
6
+ ogs_sbi_context_init(OpenAPI_nf_type_AMF);
7
amf_context_init();
8
9
rv = ogs_sbi_context_parse_config("amf", "nrf", "scp");
10
open5gs_2.6.0.3.610b9.tar.xz/src/amf/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/amf/sbi-path.c
Changed
10
1
2
ogs_sbi_nf_fsm_init(nf_instance);
3
4
/* Build NF instance information. It will be transmitted to NRF. */
5
- ogs_sbi_nf_instance_build_default(nf_instance, OpenAPI_nf_type_AMF);
6
+ ogs_sbi_nf_instance_build_default(nf_instance);
7
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_SMF);
8
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_SCP);
9
10
open5gs_2.6.0.3.610b9.tar.xz/src/ausf/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/ausf/init.c
Changed
11
1
2
{
3
int rv;
4
5
- ogs_sbi_context_init();
6
-
7
+ ogs_sbi_context_init(OpenAPI_nf_type_AUSF);
8
ausf_context_init();
9
10
rv = ogs_sbi_context_parse_config("ausf", "nrf", "scp");
11
open5gs_2.6.0.3.610b9.tar.xz/src/ausf/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/ausf/sbi-path.c
Changed
10
1
2
ogs_sbi_nf_fsm_init(nf_instance);
3
4
/* Build NF instance information. It will be transmitted to NRF. */
5
- ogs_sbi_nf_instance_build_default(nf_instance, OpenAPI_nf_type_AUSF);
6
+ ogs_sbi_nf_instance_build_default(nf_instance);
7
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_AMF);
8
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_SCP);
9
10
open5gs_2.6.0.3.610b9.tar.xz/src/bsf/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/bsf/init.c
Changed
11
1
2
{
3
int rv;
4
5
- ogs_sbi_context_init();
6
-
7
+ ogs_sbi_context_init(OpenAPI_nf_type_BSF);
8
bsf_context_init();
9
10
rv = ogs_sbi_context_parse_config("bsf", "nrf", "scp");
11
open5gs_2.6.0.3.610b9.tar.xz/src/bsf/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/bsf/sbi-path.c
Changed
10
1
2
ogs_sbi_nf_fsm_init(nf_instance);
3
4
/* Build NF instance information. It will be transmitted to NRF. */
5
- ogs_sbi_nf_instance_build_default(nf_instance, OpenAPI_nf_type_BSF);
6
+ ogs_sbi_nf_instance_build_default(nf_instance);
7
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_PCF);
8
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_AF);
9
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_SCP);
10
open5gs_2.6.0.3.610b9.tar.xz/src/nrf/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/nrf/init.c
Changed
11
1
2
{
3
int rv;
4
5
- ogs_sbi_context_init();
6
-
7
+ ogs_sbi_context_init(OpenAPI_nf_type_NRF);
8
nrf_context_init();
9
10
rv = ogs_sbi_context_parse_config("nrf", NULL, "scp");
11
open5gs_2.6.0.3.610b9.tar.xz/src/nrf/nnrf-handler.c -> open5gs_2.6.0.4.b7386.tar.xz/src/nrf/nnrf-handler.c
Changed
20
1
2
3
i = 0;
4
ogs_list_for_each(&ogs_sbi_self()->nf_instance_list, nf_instance) {
5
+ if (NF_INSTANCE_EXCLUDED_FROM_DISCOVERY(nf_instance))
6
+ continue;
7
8
if (recvmsg->param.nf_type &&
9
recvmsg->param.nf_type != nf_instance->nf_type)
10
11
12
i = 0;
13
ogs_list_for_each(&ogs_sbi_self()->nf_instance_list, nf_instance) {
14
+ if (NF_INSTANCE_EXCLUDED_FROM_DISCOVERY(nf_instance))
15
+ continue;
16
+
17
if (nf_instance->nf_type != recvmsg->param.target_nf_type)
18
continue;
19
20
open5gs_2.6.0.3.610b9.tar.xz/src/nrf/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/nrf/sbi-path.c
Changed
10
1
2
ogs_assert(nf_instance);
3
4
/* Build NF instance information. */
5
- ogs_sbi_nf_instance_build_default(nf_instance, OpenAPI_nf_type_NRF);
6
+ ogs_sbi_nf_instance_build_default(nf_instance);
7
8
if (ogs_sbi_server_start_all(ogs_sbi_server_handler) != OGS_OK)
9
return OGS_ERROR;
10
open5gs_2.6.0.3.610b9.tar.xz/src/nssf/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/nssf/init.c
Changed
11
1
2
{
3
int rv;
4
5
- ogs_sbi_context_init();
6
-
7
+ ogs_sbi_context_init(OpenAPI_nf_type_NSSF);
8
nssf_context_init();
9
10
rv = ogs_sbi_context_parse_config("nssf", "nrf", "scp");
11
open5gs_2.6.0.3.610b9.tar.xz/src/nssf/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/nssf/sbi-path.c
Changed
10
1
2
ogs_sbi_nf_fsm_init(nf_instance);
3
4
/* Build NF instance information. It will be transmitted to NRF. */
5
- ogs_sbi_nf_instance_build_default(nf_instance, OpenAPI_nf_type_NSSF);
6
+ ogs_sbi_nf_instance_build_default(nf_instance);
7
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_AMF);
8
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_SCP);
9
10
open5gs_2.6.0.3.610b9.tar.xz/src/pcf/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/pcf/init.c
Changed
10
1
2
3
pcf_metrics_init();
4
5
- ogs_sbi_context_init();
6
+ ogs_sbi_context_init(OpenAPI_nf_type_PCF);
7
pcf_context_init();
8
9
rv = ogs_sbi_context_parse_config("pcf", "nrf", "scp");
10
open5gs_2.6.0.3.610b9.tar.xz/src/pcf/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/pcf/sbi-path.c
Changed
10
1
2
ogs_sbi_nf_fsm_init(nf_instance);
3
4
/* Build NF instance information. It will be transmitted to NRF. */
5
- ogs_sbi_nf_instance_build_default(nf_instance, OpenAPI_nf_type_PCF);
6
+ ogs_sbi_nf_instance_build_default(nf_instance);
7
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_AMF);
8
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_SMF);
9
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_SCP);
10
open5gs_2.6.0.3.610b9.tar.xz/src/scp/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/scp/init.c
Changed
11
1
2
{
3
int rv;
4
5
- ogs_sbi_context_init();
6
-
7
+ ogs_sbi_context_init(OpenAPI_nf_type_SCP);
8
scp_context_init();
9
10
rv = ogs_sbi_context_parse_config("scp", "nrf", "next_scp");
11
open5gs_2.6.0.3.610b9.tar.xz/src/scp/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/scp/sbi-path.c
Changed
10
1
2
ogs_sbi_nf_fsm_init(nf_instance);
3
4
/* Build NF instance information. It will be transmitted to NRF. */
5
- ogs_sbi_nf_instance_build_default(nf_instance, OpenAPI_nf_type_SCP);
6
+ ogs_sbi_nf_instance_build_default(nf_instance);
7
8
/*
9
* If the SCP is running in Model D,
10
open5gs_2.6.0.3.610b9.tar.xz/src/smf/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/smf/init.c
Changed
10
1
2
3
ogs_gtp_context_init(ogs_app()->pool.nf * OGS_MAX_NUM_OF_GTPU_RESOURCE);
4
ogs_pfcp_context_init();
5
- ogs_sbi_context_init();
6
+ ogs_sbi_context_init(OpenAPI_nf_type_SMF);
7
8
smf_context_init();
9
10
open5gs_2.6.0.3.610b9.tar.xz/src/smf/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/smf/sbi-path.c
Changed
10
1
2
ogs_sbi_nf_fsm_init(nf_instance);
3
4
/* Build NF instance information. It will be transmitted to NRF. */
5
- ogs_sbi_nf_instance_build_default(nf_instance, OpenAPI_nf_type_SMF);
6
+ ogs_sbi_nf_instance_build_default(nf_instance);
7
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_AMF);
8
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_SCP);
9
10
open5gs_2.6.0.3.610b9.tar.xz/src/udm/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/udm/init.c
Changed
11
1
2
{
3
int rv;
4
5
- ogs_sbi_context_init();
6
-
7
+ ogs_sbi_context_init(OpenAPI_nf_type_UDM);
8
udm_context_init();
9
10
rv = ogs_sbi_context_parse_config("udm", "nrf", "scp");
11
open5gs_2.6.0.3.610b9.tar.xz/src/udm/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/udm/sbi-path.c
Changed
10
1
2
ogs_sbi_nf_fsm_init(nf_instance);
3
4
/* Build NF instance information. It will be transmitted to NRF. */
5
- ogs_sbi_nf_instance_build_default(nf_instance, OpenAPI_nf_type_UDM);
6
+ ogs_sbi_nf_instance_build_default(nf_instance);
7
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_AMF);
8
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_SMF);
9
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_AUSF);
10
open5gs_2.6.0.3.610b9.tar.xz/src/udr/init.c -> open5gs_2.6.0.4.b7386.tar.xz/src/udr/init.c
Changed
11
1
2
{
3
int rv;
4
5
- ogs_sbi_context_init();
6
-
7
+ ogs_sbi_context_init(OpenAPI_nf_type_UDR);
8
udr_context_init();
9
10
rv = ogs_sbi_context_parse_config("udr", "nrf", "scp");
11
open5gs_2.6.0.3.610b9.tar.xz/src/udr/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/src/udr/sbi-path.c
Changed
10
1
2
ogs_sbi_nf_fsm_init(nf_instance);
3
4
/* Build NF instance information. It will be transmitted to NRF. */
5
- ogs_sbi_nf_instance_build_default(nf_instance, OpenAPI_nf_type_UDR);
6
+ ogs_sbi_nf_instance_build_default(nf_instance);
7
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_PCF);
8
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_UDM);
9
ogs_sbi_nf_instance_add_allowed_nf_type(nf_instance, OpenAPI_nf_type_SCP);
10
open5gs_2.6.0.3.610b9.tar.xz/tests/af/init.c -> open5gs_2.6.0.4.b7386.tar.xz/tests/af/init.c
Changed
11
1
2
{
3
int rv;
4
5
- ogs_sbi_context_init();
6
-
7
+ ogs_sbi_context_init(OpenAPI_nf_type_AF);
8
af_context_init();
9
10
rv = ogs_sbi_context_parse_config("af", "nrf", "scp");
11
open5gs_2.6.0.3.610b9.tar.xz/tests/af/sbi-path.c -> open5gs_2.6.0.4.b7386.tar.xz/tests/af/sbi-path.c
Changed
10
1
2
ogs_sbi_nf_fsm_init(nf_instance);
3
4
/* Build NF instance information. It will be transmitted to NRF. */
5
- ogs_sbi_nf_instance_build_default(nf_instance, OpenAPI_nf_type_AF);
6
+ ogs_sbi_nf_instance_build_default(nf_instance);
7
8
/* Initialize NRF NF Instance */
9
nf_instance = ogs_sbi_self()->nrf_instance;
10
open5gs_2.6.0.3.610b9.tar.xz/tests/registration/abts-main.c -> open5gs_2.6.0.4.b7386.tar.xz/tests/registration/abts-main.c
Changed
10
1
2
3
test_5gc_init();
4
5
- ogs_sbi_context_init();
6
+ ogs_sbi_context_init(OpenAPI_nf_type_AMF);
7
ogs_assert(ogs_sbi_context_parse_config(NULL, "nrf", "scp") == OGS_OK);
8
9
rv = app_initialize(argv);
10