Changes of Revision 866

open5gs_2.7.2.4533.bc02.202411022026.dsc -> open5gs_2.7.2.4536.c888.202411032026.dsc Changed
x
 
1
@@ -2,7 +2,7 @@
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-sepp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
4
 Architecture: any
5
-Version: 2.7.2.4533.bc02.202411022026
6
+Version: 2.7.2.4536.c888.202411032026
7
 Maintainer: Harald Welte <laforge@gnumonks.org>
8
 Uploaders: Sukchan Lee <acetcom@gmail.com>
9
 Homepage: https://open5gs.org
10
@@ -32,8 +32,8 @@
11
  open5gs-udr deb net optional arch=any
12
  open5gs-upf deb net optional arch=any
13
 Checksums-Sha1:
14
- 19c9394122e5e58aa13de08a01dd1ac1f82f38af 14510976 open5gs_2.7.2.4533.bc02.202411022026.tar.xz
15
+ 55b1d6cb8552e124828d6d3ecb8a345bd295852b 14511312 open5gs_2.7.2.4536.c888.202411032026.tar.xz
16
 Checksums-Sha256:
17
- 25706436f12391c16b21c363cdf483ff772e6194ca182320df3675a23ecd18ef 14510976 open5gs_2.7.2.4533.bc02.202411022026.tar.xz
18
+ 0a4ce603ec7e5270d49f1785643656fa84f525e1b66a438ec42ab2ce240406e2 14511312 open5gs_2.7.2.4536.c888.202411032026.tar.xz
19
 Files:
20
- 23ed52ae654f2fd4d6cf386dd41768bd 14510976 open5gs_2.7.2.4533.bc02.202411022026.tar.xz
21
+ d0a8d1feb60cb9c38b24e72648de9668 14511312 open5gs_2.7.2.4536.c888.202411032026.tar.xz
22
open5gs_2.7.2.4533.bc02.202411022026.tar.xz/.tarball-version -> open5gs_2.7.2.4536.c888.202411032026.tar.xz/.tarball-version Changed
4
 
1
@@ -1 +1 @@
2
-2.7.2.4533-bc02.202411022026
3
+2.7.2.4536-c888.202411032026
4
open5gs_2.7.2.4533.bc02.202411022026.tar.xz/debian/changelog -> open5gs_2.7.2.4536.c888.202411032026.tar.xz/debian/changelog Changed
12
 
1
@@ -1,8 +1,8 @@
2
-open5gs (2.7.2.4533.bc02.202411022026) unstable; urgency=medium
3
+open5gs (2.7.2.4536.c888.202411032026) unstable; urgency=medium
4
 
5
   * Automatically generated changelog entry for building the Osmocom nightly feed
6
 
7
- -- Osmocom OBS scripts <info@osmocom.org>  Sat, 02 Nov 2024 20:27:57 +0000
8
+ -- Osmocom OBS scripts <info@osmocom.org>  Sun, 03 Nov 2024 20:27:58 +0000
9
 
10
 open5gs (2.7.2) unstable; urgency=medium
11
 
12
open5gs_2.7.2.4533.bc02.202411022026.tar.xz/lib/app/ogs-config.c -> open5gs_2.7.2.4536.c888.202411032026.tar.xz/lib/app/ogs-config.c Changed
20
 
1
@@ -105,7 +105,7 @@
2
     return &local_conf;
3
 }
4
 
5
-static int global_conf_prepare(void)
6
+int ogs_app_global_conf_prepare(void)
7
 {
8
     global_conf.sockopt.no_delay = true;
9
 
10
@@ -165,9 +165,6 @@
11
 
12
     ogs_assert(parent);
13
 
14
-    rv = global_conf_prepare();
15
-    if (rv != OGS_OK) return rv;
16
-
17
     ogs_yaml_iter_recurse(parent, &global_iter);
18
     while (ogs_yaml_iter_next(&global_iter)) {
19
         const char *global_key = ogs_yaml_iter_key(&global_iter);
20
open5gs_2.7.2.4533.bc02.202411022026.tar.xz/lib/app/ogs-config.h -> open5gs_2.7.2.4536.c888.202411032026.tar.xz/lib/app/ogs-config.h Changed
9
 
1
@@ -174,6 +174,7 @@
2
 ogs_app_local_conf_t *ogs_local_conf(void);
3
 
4
 int ogs_app_count_nf_conf_sections(const char *conf_section);
5
+int ogs_app_global_conf_prepare(void);
6
 int ogs_app_parse_global_conf(ogs_yaml_iter_t *parent);
7
 int ogs_app_parse_local_conf(const char *local);
8
 
9
open5gs_2.7.2.4533.bc02.202411022026.tar.xz/lib/app/ogs-init.c -> open5gs_2.7.2.4536.c888.202411032026.tar.xz/lib/app/ogs-init.c Changed
16
 
1
@@ -257,9 +257,14 @@
2
 
3
 static int context_prepare(void)
4
 {
5
+    int rv;
6
+
7
 #define USRSCTP_LOCAL_UDP_PORT      9899
8
     ogs_app()->usrsctp.udp_port = USRSCTP_LOCAL_UDP_PORT;
9
 
10
+    rv = ogs_app_global_conf_prepare();
11
+    if (rv != OGS_OK) return rv;
12
+
13
     return OGS_OK;
14
 }
15
 
16
open5gs_2.7.2.4533.bc02.202411022026.tar.xz/lib/core/ogs-epoll.c -> open5gs_2.7.2.4536.c888.202411032026.tar.xz/lib/core/ogs-epoll.c Changed
11
 
1
@@ -75,7 +75,8 @@
2
 
3
     context->epfd = epoll_create(pollset->capacity);
4
     if (context->epfd < 0) {
5
-        ogs_log_message(OGS_LOG_FATAL, ogs_errno, "epoll_create() failed");
6
+        ogs_log_message(OGS_LOG_FATAL, ogs_errno,
7
+                "epoll_create() failed %d", pollset->capacity);
8
         ogs_assert_if_reached();
9
         return;
10
     }
11
open5gs_2.7.2.4533.bc02.202411022026.tar.xz/lib/sbi/client.c -> open5gs_2.7.2.4536.c888.202411032026.tar.xz/lib/sbi/client.c Changed
19
 
1
@@ -250,9 +250,15 @@
2
         if (fqdn) {
3
             if (!client->fqdn)
4
                 continue;
5
-            if (strcmp(client->fqdn, fqdn) != 0 ||
6
-                client->fqdn_port != fqdn_port)
7
+            if (strcmp(client->fqdn, fqdn) != 0)
8
                 continue;
9
+
10
+            if (fqdn_port) {
11
+                if (!client->fqdn_port)
12
+                    continue;
13
+                if (client->fqdn_port != fqdn_port)
14
+                    continue;
15
+            }
16
         }
17
         if (addr) {
18
             if (!client->addr)
19
open5gs_2.7.2.4533.bc02.202411022026.tar.xz/src/scp/sbi-path.c -> open5gs_2.7.2.4536.c888.202411032026.tar.xz/src/scp/sbi-path.c Changed
114
 
1
@@ -647,14 +647,13 @@
2
 
3
         scp_assoc_remove(assoc);
4
 
5
-        if (!stream) {
6
+        if (stream) {
7
+            ogs_assert(true ==
8
+                ogs_sbi_server_send_error(stream,
9
+                    OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, NULL,
10
+                    "response_handler() failed", NULL, NULL));
11
+        } else
12
             ogs_error("STREAM has already been removed %d", stream_id);
13
-            return OGS_ERROR;
14
-        }
15
-        ogs_assert(true ==
16
-            ogs_sbi_server_send_error(stream,
17
-                OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, NULL,
18
-                "response_handler() failed", NULL, NULL));
19
 
20
         return OGS_ERROR;
21
     }
22
@@ -673,6 +672,7 @@
23
 
24
     if (!stream) {
25
         ogs_error("STREAM has already been removed %d", stream_id);
26
+        ogs_sbi_response_free(response);
27
         return OGS_ERROR;
28
     }
29
     ogs_expect(true == ogs_sbi_server_send_response(stream, response));
30
@@ -727,14 +727,13 @@
31
 
32
         scp_assoc_remove(assoc);
33
 
34
-        if (!stream) {
35
+        if (stream) {
36
+            ogs_assert(true ==
37
+                ogs_sbi_server_send_error(stream,
38
+                    OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, NULL,
39
+                    "nf_discover_handler() failed", NULL, NULL));
40
+        } else
41
             ogs_error("STREAM has already been removed %d", stream_id);
42
-            return OGS_ERROR;
43
-        }
44
-        ogs_assert(true ==
45
-            ogs_sbi_server_send_error(stream,
46
-                OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, NULL,
47
-                "nf_discover_handler() failed", NULL, NULL));
48
 
49
         return OGS_ERROR;
50
     }
51
@@ -820,14 +819,13 @@
52
 
53
     scp_assoc_remove(assoc);
54
 
55
-    if (!stream) {
56
+    if (stream) {
57
+        ogs_assert(true ==
58
+            ogs_sbi_server_send_error(
59
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, NULL, strerror, NULL,
60
+                NULL));
61
+    } else
62
         ogs_error("STREAM has already been removed %d", stream_id);
63
-        return OGS_ERROR;
64
-    }
65
-    ogs_assert(true ==
66
-        ogs_sbi_server_send_error(
67
-            stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, NULL, strerror, NULL,
68
-            NULL));
69
 
70
     ogs_free(strerror);
71
 
72
@@ -866,14 +864,13 @@
73
 
74
         scp_assoc_remove(assoc);
75
 
76
-        if (!stream) {
77
+        if (stream) {
78
+            ogs_assert(true ==
79
+                ogs_sbi_server_send_error(stream,
80
+                    OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, NULL,
81
+                    "sepp_discover_handler() failed", NULL, NULL));
82
+        } else
83
             ogs_error("STREAM has already been removed %d", stream_id);
84
-            return OGS_ERROR;
85
-        }
86
-        ogs_assert(true ==
87
-            ogs_sbi_server_send_error(stream,
88
-                OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, NULL,
89
-                "sepp_discover_handler() failed", NULL, NULL));
90
 
91
         return OGS_ERROR;
92
     }
93
@@ -928,14 +925,13 @@
94
 
95
     scp_assoc_remove(assoc);
96
 
97
-    if (!stream) {
98
+    if (stream) {
99
+        ogs_assert(true ==
100
+            ogs_sbi_server_send_error(
101
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, NULL, strerror, NULL,
102
+                NULL));
103
+    } else
104
         ogs_error("STREAM has already been removed %d", stream_id);
105
-        return OGS_ERROR;
106
-    }
107
-    ogs_assert(true ==
108
-        ogs_sbi_server_send_error(
109
-            stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, NULL, strerror, NULL,
110
-            NULL));
111
 
112
     ogs_free(strerror);
113
 
114
open5gs_2.7.2.4533.bc02.202411022026.tar.xz/src/sepp/sbi-path.c -> open5gs_2.7.2.4536.c888.202411032026.tar.xz/src/sepp/sbi-path.c Changed
30
 
1
@@ -435,14 +435,13 @@
2
 
3
         sepp_assoc_remove(assoc);
4
 
5
-        if (!stream) {
6
+        if (stream) {
7
+            ogs_assert(true ==
8
+                ogs_sbi_server_send_error(stream,
9
+                    OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, NULL,
10
+                    "response_handler() failed", NULL, NULL));
11
+        } else
12
             ogs_error("STREAM has already been removed %d", stream_id);
13
-            return OGS_ERROR;
14
-        }
15
-        ogs_assert(true ==
16
-            ogs_sbi_server_send_error(stream,
17
-                OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, NULL,
18
-                "response_handler() failed", NULL, NULL));
19
 
20
         return OGS_ERROR;
21
     }
22
@@ -453,6 +452,7 @@
23
 
24
     if (!stream) {
25
         ogs_error("STREAM has already been removed %d", stream_id);
26
+        ogs_sbi_response_free(response);
27
         return OGS_ERROR;
28
     }
29
     ogs_expect(true == ogs_sbi_server_send_response(stream, response));
30