Osmocom Open Build Service

commit_125740727e558c7604897eda711d4d40f2906239.txt Added

commit_7da45cde668394c4518eee2cf864736cae135ede.txt Deleted

open5gs_2.6.6.11.7da45c.dsc -> open5gs_2.6.6.15.12574.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-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
 Architecture: any
-Version: 2.6.6.11.7da45c
+Version: 2.6.6.15.12574
 Maintainer: Harald Welte <laforge@gnumonks.org>
 Uploaders: Sukchan Lee <acetcom@gmail.com>
 Homepage: https://open5gs.org
@@ -31,8 +31,8 @@
  open5gs-udr deb net optional arch=any
  open5gs-upf deb net optional arch=any
 Checksums-Sha1:
- f1681f181cbd0b2c97d02b99581da70703147544 14426604 open5gs_2.6.6.11.7da45c.tar.xz
+ 3a67e777c3432cdd0944e260c4425726aa07d3d3 14426220 open5gs_2.6.6.15.12574.tar.xz
 Checksums-Sha256:
- f7591d9df3c1fa7028772cba3f4d14a1af4566a36ce3d1269db4bd84edd419e9 14426604 open5gs_2.6.6.11.7da45c.tar.xz
+ 0c032c142f9e2d4f7671725e1899f8e93f9de14e9d3baa88a05ee81955c5ba05 14426220 open5gs_2.6.6.15.12574.tar.xz
 Files:
- a7d64f5a6533775cc3393285ac28bf61 14426604 open5gs_2.6.6.11.7da45c.tar.xz
+ e8d3a2926733507aa8be5a5a379a97a4 14426220 open5gs_2.6.6.15.12574.tar.xz

open5gs_2.6.6.11.7da45c.tar.xz/.tarball-version -> open5gs_2.6.6.15.12574.tar.xz/.tarball-version Changed

open5gs_2.6.6.11.7da45c.tar.xz/debian/changelog -> open5gs_2.6.6.15.12574.tar.xz/debian/changelog Changed

open5gs_2.6.6.11.7da45c.tar.xz/lib/diameter/common/message.h -> open5gs_2.6.6.15.12574.tar.xz/lib/diameter/common/message.h Changed

open5gs_2.6.6.11.7da45c.tar.xz/src/smf/gy-handler.c -> open5gs_2.6.6.15.12574.tar.xz/src/smf/gy-handler.c Changed

@@ -160,7 +160,6 @@
     ogs_pfcp_measurement_method_t prev_meas_method;
     ogs_pfcp_reporting_triggers_t prev_rep_triggers;
     ogs_pfcp_quota_validity_time_t prev_quota_validity_time;
-    ogs_pfcp_volume_quota_t prev_vol_quota;
     ogs_pfcp_time_quota_t prev_time_quota;
     ogs_pfcp_volume_threshold_t prev_vol_threshold;
     ogs_pfcp_time_threshold_t prev_time_threshold;
@@ -190,17 +189,19 @@
     prev_meas_method = urr->meas_method;
     prev_rep_triggers = urr->rep_triggers;
     prev_quota_validity_time = urr->quota_validity_time;
-    prev_vol_quota = urr->vol_quota;
     prev_time_quota = urr->time_quota;
     prev_vol_threshold = urr->vol_threshold;
     prev_time_threshold = urr->time_threshold;
 
     urr_update_time(sess, urr, gy_message);
     urr_update_volume(sess, urr, gy_message);
+    /* Associate accounting URR each direction PDR: */
     ogs_pfcp_pdr_associate_urr(bearer->ul_pdr, urr);
+    ogs_pfcp_pdr_associate_urr(bearer->dl_pdr, urr);
 
     if (urr->meas_method != prev_meas_method)
         modify_flags |= OGS_PFCP_MODIFY_URR_MEAS_METHOD;
+
     if (urr->rep_triggers.quota_validity_time != prev_rep_triggers.quota_validity_time ||
         urr->rep_triggers.time_quota != prev_rep_triggers.time_quota ||
         urr->rep_triggers.volume_quota != prev_rep_triggers.volume_quota ||
@@ -214,8 +215,7 @@
     if (urr->time_quota != prev_time_quota)
         modify_flags |= OGS_PFCP_MODIFY_URR_TIME_QUOTA;
 
-    if (urr->vol_quota.tovol != prev_vol_quota.tovol ||
-        urr->vol_quota.total_volume != prev_vol_quota.total_volume)
+    if (urr->vol_quota.tovol || urr->vol_quota.total_volume)
         modify_flags |= OGS_PFCP_MODIFY_URR_VOLUME_QUOTA;
 
     if (urr->time_threshold != prev_time_threshold)

open5gs_2.6.6.11.7da45c.tar.xz/src/smf/gy-path.c -> open5gs_2.6.6.15.12574.tar.xz/src/smf/gy-path.c Changed

@@ -110,7 +110,16 @@
 
         /* CC-Time, RFC4006 8.21 */
         /* CC-Money, RFC4006 8.22. Not used in 3GPP. */
+
         /* CC-Total-Octets, RFC4006 8.23 */
+        ret = fd_msg_avp_new(ogs_diam_gy_cc_total_octets, 0, &avpch2);
+        ogs_assert(ret == 0);
+        val.u64 = 1000000;
+        ret = fd_msg_avp_setvalue (avpch2, &val);
+        ogs_assert(ret == 0);
+        ret = fd_msg_avp_add (avpch1, MSG_BRW_LAST_CHILD, avpch2);
+        ogs_assert(ret == 0);
+
         /* CC-Input-Octets, RFC4006 8.24 */
         /* CC-Output-Octets, RFC4006 8.25 */
         /* CC-Service-Specific-Units, RFC4006 8.26 */
@@ -119,6 +128,8 @@
         ogs_assert(ret == 0);
     }
 
+   if (cc_request_type != OGS_DIAM_GY_CC_REQUEST_TYPE_INITIAL_REQUEST) {
+
     /* Used-Service-Unit, RFC4006 8.18 */
     ret = fd_msg_avp_new(ogs_diam_gy_used_service_unit, 0, &avpch1);
     ogs_assert(ret == 0);
@@ -182,6 +193,7 @@
 
     ret = fd_msg_avp_add (avp, MSG_BRW_LAST_CHILD, avpch1);
     ogs_assert(ret == 0);
+     //bypass USU if we are in CCR INITIAL
 
     /* Service-Identifier, RFC4006 8.28. Not used in Gy. */
     /* Rating-Group */
@@ -296,7 +308,7 @@
     ogs_assert(ret == 0);
     ret = fd_msg_avp_add (avp, MSG_BRW_LAST_CHILD, avpch1);
     ogs_assert(ret == 0);
-
+    }
     /* Multiple Services AVP add to req: */
     ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
     ogs_assert(ret == 0);
@@ -306,6 +318,7 @@
 static void fill_service_information_ccr(smf_sess_t *sess,
                                          uint32_t cc_request_type, struct msg *req)
 {
+
     int ret;
     union avp_value val;
     struct avp *avp;
@@ -558,6 +571,7 @@
 void smf_gy_send_ccr(smf_sess_t *sess, void *xact,
         uint32_t cc_request_type)
 {
+
     int ret;
     smf_ue_t *smf_ue = NULL;
 
@@ -599,7 +613,6 @@
         ogs_assert(new == 0);
 
         ogs_debug("    Found Gy Session-Id: %s", sess->gy_sid);
-
         /* Add Session-Id to the message */
         ret = ogs_diam_message_session_id_set(req, (os0_t)sess->gy_sid, sidlen);
         ogs_assert(ret == 0);
@@ -630,12 +643,10 @@
         ogs_assert(sess_data);
 
         ogs_debug("    Allocate new Gy session: %s", sess_data->gy_sid);
-
         /* Save Session-Id to SMF Session Context */
         sess->gy_sid = (char *)sess_data->gy_sid;
     } else
         ogs_debug("    Retrieve Gy session: %s", sess_data->gy_sid);
-
     /*
      * 8.2.  CC-Request-Number AVP
      *
@@ -670,6 +681,7 @@
     sess_data->xact_datareq_slot.cc_req_no = sess_data->cc_request_number;
     sess_data->xact_datareq_slot.ptr = xact;
 
+
     /* Origin-Host & Origin-Realm */
     ret = fd_msg_add_origin(req, 0);
     ogs_assert(ret == 0);
@@ -720,6 +732,8 @@
     ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
     ogs_assert(ret == 0);
 
+
+
     /* Set the Destination-Host AVP */
     if (sess_data->peer_host) {
         ret = fd_msg_avp_new(ogs_diam_destination_host, 0, &avp);
@@ -881,6 +895,7 @@
     ret = fd_msg_send(&req, smf_gy_cca_cb, svg);
     ogs_assert(ret == 0);
 
+
     /* Increment the counter */
     ogs_assert(pthread_mutex_lock(&ogs_diam_logger_self()->stats_lock) == 0);
     ogs_diam_logger_self()->stats.nb_sent++;

Changes of Revision 322