Osmocom Open Build Service

commit_5697cd792e860999df6726d3310743892fbd4273.txt Added

commit_b35dee93276cf6d5e50a1d268f5bad7e83a90152.txt Deleted

open5gs_2.7.1.4453.b35d.dsc -> open5gs_2.7.1.4455.5697.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-scp, open5gs-sepp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
 Architecture: any
-Version: 2.7.1.4453.b35d
+Version: 2.7.1.4455.5697
 Maintainer: Harald Welte <laforge@gnumonks.org>
 Uploaders: Sukchan Lee <acetcom@gmail.com>
 Homepage: https://open5gs.org
@@ -32,8 +32,8 @@
  open5gs-udr deb net optional arch=any
  open5gs-upf deb net optional arch=any
 Checksums-Sha1:
- 587acab3af4001afb02d968803d771ca4539aeee 14501128 open5gs_2.7.1.4453.b35d.tar.xz
+ f82cb43b5c68eb2b080e45559f63e337f42bb545 14500852 open5gs_2.7.1.4455.5697.tar.xz
 Checksums-Sha256:
- c7171254c40a83fd6dc1bab64d03b1d7cc9975e41ac43890b840b0d70e3e20a0 14501128 open5gs_2.7.1.4453.b35d.tar.xz
+ 1e6c3a883873a4d4f0cc921aa10f827bacfd5923de714b2fd05561c9f7205c7d 14500852 open5gs_2.7.1.4455.5697.tar.xz
 Files:
- 72b5e0012d741bc3d54694fc4449041e 14501128 open5gs_2.7.1.4453.b35d.tar.xz
+ a7050933b965c31a545391252b35c131 14500852 open5gs_2.7.1.4455.5697.tar.xz

open5gs_2.7.1.4453.b35d.tar.xz/.tarball-version -> open5gs_2.7.1.4455.5697.tar.xz/.tarball-version Changed

open5gs_2.7.1.4453.b35d.tar.xz/debian/changelog -> open5gs_2.7.1.4455.5697.tar.xz/debian/changelog Changed

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

@@ -793,6 +793,7 @@
         char *validity_time, const char *action)
 {
     ogs_time_t time, validity, patch;
+    char *validity_time_string = NULL;
 
     ogs_assert(subscription_data);
     ogs_assert(action);
@@ -855,13 +856,24 @@
     }
     ogs_timer_start(subscription_data->t_patch, patch);
 
+    if (validity_time) {
+        validity_time_string = ogs_strdup(validity_time);
+        ogs_assert(validity_time_string);
+    } else {
+        validity_time_string = ogs_sbi_localtime_string(
+                ogs_time_now() + subscription_data->validity_duration);
+        ogs_assert(validity_time_string);
+    }
+
     ogs_info("%s Subscription %s until %s "
             "duration:%ld,validity:%d.%06d,patch:%d.%06d",
-            subscription_data->id, action, validity_time,
+            subscription_data->id, action, validity_time_string,
             subscription_data->validity_duration,
             (int)ogs_time_sec(subscription_data->validity_duration),
             (int)ogs_time_usec(subscription_data->validity_duration),
             (int)ogs_time_sec(patch), (int)ogs_time_usec(patch));
+
+    ogs_free(validity_time_string);
 }
 
 void ogs_nnrf_nfm_handle_nf_status_subscribe(
@@ -967,6 +979,7 @@
 {
     OpenAPI_subscription_data_t *SubscriptionData = NULL;
     char *validity_time = NULL;
+    const char *action = NULL;
 
     ogs_assert(recvmsg);
     ogs_assert(subscription_data);
@@ -983,8 +996,10 @@
         }
 
         validity_time = SubscriptionData->validity_time;
+        action = "updated(200 OK)";
     } else if (recvmsg->res_status == OGS_SBI_HTTP_STATUS_NO_CONTENT) {
         /* No valdityTime. Re-use current subscription_data->valdity_duration */
+        action = "updated(204 No Content)";
     } else {
         ogs_fatal("%s HTTP response error %d",
                 subscription_data->id ?  subscription_data->id : "Unknown",
@@ -993,7 +1008,7 @@
     }
 
     /* Update Subscription Validity Time */
-    handle_validity_time(subscription_data, validity_time, "updated");
+    handle_validity_time(subscription_data, validity_time, action);
 }
 
 bool ogs_nnrf_nfm_handle_nf_status_notify(

open5gs_2.7.1.4453.b35d.tar.xz/meson.build -> open5gs_2.7.1.4455.5697.tar.xz/meson.build Changed

Changes of Revision 496