Changes of Revision 496

commit_5697cd792e860999df6726d3310743892fbd4273.txt Added
commit_b35dee93276cf6d5e50a1d268f5bad7e83a90152.txt Deleted
open5gs_2.7.1.4453.b35d.dsc -> open5gs_2.7.1.4455.5697.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.1.4453.b35d
6
+Version: 2.7.1.4455.5697
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
- 587acab3af4001afb02d968803d771ca4539aeee 14501128 open5gs_2.7.1.4453.b35d.tar.xz
15
+ f82cb43b5c68eb2b080e45559f63e337f42bb545 14500852 open5gs_2.7.1.4455.5697.tar.xz
16
 Checksums-Sha256:
17
- c7171254c40a83fd6dc1bab64d03b1d7cc9975e41ac43890b840b0d70e3e20a0 14501128 open5gs_2.7.1.4453.b35d.tar.xz
18
+ 1e6c3a883873a4d4f0cc921aa10f827bacfd5923de714b2fd05561c9f7205c7d 14500852 open5gs_2.7.1.4455.5697.tar.xz
19
 Files:
20
- 72b5e0012d741bc3d54694fc4449041e 14501128 open5gs_2.7.1.4453.b35d.tar.xz
21
+ a7050933b965c31a545391252b35c131 14500852 open5gs_2.7.1.4455.5697.tar.xz
22
open5gs_2.7.1.4453.b35d.tar.xz/.tarball-version -> open5gs_2.7.1.4455.5697.tar.xz/.tarball-version Changed
4
 
1
@@ -1 +1 @@
2
-2.7.1.4453-b35d
3
+2.7.1.4455-5697
4
open5gs_2.7.1.4453.b35d.tar.xz/debian/changelog -> open5gs_2.7.1.4455.5697.tar.xz/debian/changelog Changed
12
 
1
@@ -1,8 +1,8 @@
2
-open5gs (2.7.1.4453.b35d) unstable; urgency=medium
3
+open5gs (2.7.1.4455.5697) unstable; urgency=medium
4
 
5
   * Automatically generated changelog entry for building the Osmocom master feed
6
 
7
- -- Osmocom OBS scripts <info@osmocom.org>  Sun, 04 Aug 2024 04:51:35 +0000
8
+ -- Osmocom OBS scripts <info@osmocom.org>  Sun, 04 Aug 2024 12:03:53 +0000
9
 
10
 open5gs (2.7.1) unstable; urgency=medium
11
 
12
open5gs_2.7.1.4453.b35d.tar.xz/lib/sbi/nnrf-handler.c -> open5gs_2.7.1.4455.5697.tar.xz/lib/sbi/nnrf-handler.c Changed
63
 
1
@@ -793,6 +793,7 @@
2
         char *validity_time, const char *action)
3
 {
4
     ogs_time_t time, validity, patch;
5
+    char *validity_time_string = NULL;
6
 
7
     ogs_assert(subscription_data);
8
     ogs_assert(action);
9
@@ -855,13 +856,24 @@
10
     }
11
     ogs_timer_start(subscription_data->t_patch, patch);
12
 
13
+    if (validity_time) {
14
+        validity_time_string = ogs_strdup(validity_time);
15
+        ogs_assert(validity_time_string);
16
+    } else {
17
+        validity_time_string = ogs_sbi_localtime_string(
18
+                ogs_time_now() + subscription_data->validity_duration);
19
+        ogs_assert(validity_time_string);
20
+    }
21
+
22
     ogs_info("%s Subscription %s until %s "
23
             "duration:%ld,validity:%d.%06d,patch:%d.%06d",
24
-            subscription_data->id, action, validity_time,
25
+            subscription_data->id, action, validity_time_string,
26
             subscription_data->validity_duration,
27
             (int)ogs_time_sec(subscription_data->validity_duration),
28
             (int)ogs_time_usec(subscription_data->validity_duration),
29
             (int)ogs_time_sec(patch), (int)ogs_time_usec(patch));
30
+
31
+    ogs_free(validity_time_string);
32
 }
33
 
34
 void ogs_nnrf_nfm_handle_nf_status_subscribe(
35
@@ -967,6 +979,7 @@
36
 {
37
     OpenAPI_subscription_data_t *SubscriptionData = NULL;
38
     char *validity_time = NULL;
39
+    const char *action = NULL;
40
 
41
     ogs_assert(recvmsg);
42
     ogs_assert(subscription_data);
43
@@ -983,8 +996,10 @@
44
         }
45
 
46
         validity_time = SubscriptionData->validity_time;
47
+        action = "updated(200 OK)";
48
     } else if (recvmsg->res_status == OGS_SBI_HTTP_STATUS_NO_CONTENT) {
49
         /* No valdityTime. Re-use current subscription_data->valdity_duration */
50
+        action = "updated(204 No Content)";
51
     } else {
52
         ogs_fatal("%s HTTP response error %d",
53
                 subscription_data->id ?  subscription_data->id : "Unknown",
54
@@ -993,7 +1008,7 @@
55
     }
56
 
57
     /* Update Subscription Validity Time */
58
-    handle_validity_time(subscription_data, validity_time, "updated");
59
+    handle_validity_time(subscription_data, validity_time, action);
60
 }
61
 
62
 bool ogs_nnrf_nfm_handle_nf_status_notify(
63
open5gs_2.7.1.4453.b35d.tar.xz/meson.build -> open5gs_2.7.1.4455.5697.tar.xz/meson.build Changed
19
 
1
@@ -16,7 +16,7 @@
2
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
3
 
4
 project('open5gs', 'c', 'cpp',
5
-    version : '2.7.1',
6
+    version : '2.7.2',
7
     license : 'AGPL-3.0-or-later',
8
     meson_version : '>= 0.43.0',
9
     default_options : 
10
@@ -25,7 +25,7 @@
11
     ,
12
 )
13
 
14
-libogslib_version = '2.7.1'
15
+libogslib_version = '2.7.2'
16
 
17
 prefix = get_option('prefix')
18
 bindir = join_paths(prefix, get_option('bindir'))
19