Changes of Revision 322

View file
commit_125740727e558c7604897eda711d4d40f2906239.txt Added
View file
commit_7da45cde668394c4518eee2cf864736cae135ede.txt Deleted
View file
open5gs_2.6.6.11.7da45c.dsc -> open5gs_2.6.6.15.12574.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-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
4
 Architecture: any
5
-Version: 2.6.6.11.7da45c
6
+Version: 2.6.6.15.12574
7
 Maintainer: Harald Welte <laforge@gnumonks.org>
8
 Uploaders: Sukchan Lee <acetcom@gmail.com>
9
 Homepage: https://open5gs.org
10
@@ -31,8 +31,8 @@
11
  open5gs-udr deb net optional arch=any
12
  open5gs-upf deb net optional arch=any
13
 Checksums-Sha1:
14
- f1681f181cbd0b2c97d02b99581da70703147544 14426604 open5gs_2.6.6.11.7da45c.tar.xz
15
+ 3a67e777c3432cdd0944e260c4425726aa07d3d3 14426220 open5gs_2.6.6.15.12574.tar.xz
16
 Checksums-Sha256:
17
- f7591d9df3c1fa7028772cba3f4d14a1af4566a36ce3d1269db4bd84edd419e9 14426604 open5gs_2.6.6.11.7da45c.tar.xz
18
+ 0c032c142f9e2d4f7671725e1899f8e93f9de14e9d3baa88a05ee81955c5ba05 14426220 open5gs_2.6.6.15.12574.tar.xz
19
 Files:
20
- a7d64f5a6533775cc3393285ac28bf61 14426604 open5gs_2.6.6.11.7da45c.tar.xz
21
+ e8d3a2926733507aa8be5a5a379a97a4 14426220 open5gs_2.6.6.15.12574.tar.xz
22
​
View file
open5gs_2.6.6.11.7da45c.tar.xz/.tarball-version -> open5gs_2.6.6.15.12574.tar.xz/.tarball-version Changed
4
 
1
@@ -1 +1 @@
2
-2.6.6.11-7da45c
3
+2.6.6.15-12574
4
​
View file
open5gs_2.6.6.11.7da45c.tar.xz/debian/changelog -> open5gs_2.6.6.15.12574.tar.xz/debian/changelog Changed
12
 
1
@@ -1,8 +1,8 @@
2
-open5gs (2.6.6.11.7da45c) unstable; urgency=medium
3
+open5gs (2.6.6.15.12574) unstable; urgency=medium
4
5
   * Automatically generated changelog entry for building the Osmocom master feed
6
7
- -- Osmocom OBS scripts <info@osmocom.org>  Tue, 17 Oct 2023 13:49:32 +0000
8
+ -- Osmocom OBS scripts <info@osmocom.org>  Tue, 17 Oct 2023 22:42:02 +0000
9
10
 open5gs (2.6.6) unstable; urgency=medium
11
12
​
View file
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
9
 
1
@@ -40,6 +40,7 @@
2
 #define OGS_DIAM_AUTHORIZATION_REJECTED             5003
3
 #define OGS_DIAM_MISSING_AVP                        5004
4
 #define OGS_DIAM_INVALID_AVP_VALUE                  5005
5
+#define OGS_DIAM_USER_UNKNOWN                       5030
6
7
 extern struct dict_object *ogs_diam_session_id;
8
 extern struct dict_object *ogs_diam_termination_cause;
9
​
View file
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
40
 
1
@@ -160,7 +160,6 @@
2
     ogs_pfcp_measurement_method_t prev_meas_method;
3
     ogs_pfcp_reporting_triggers_t prev_rep_triggers;
4
     ogs_pfcp_quota_validity_time_t prev_quota_validity_time;
5
-    ogs_pfcp_volume_quota_t prev_vol_quota;
6
     ogs_pfcp_time_quota_t prev_time_quota;
7
     ogs_pfcp_volume_threshold_t prev_vol_threshold;
8
     ogs_pfcp_time_threshold_t prev_time_threshold;
9
@@ -190,17 +189,19 @@
10
     prev_meas_method = urr->meas_method;
11
     prev_rep_triggers = urr->rep_triggers;
12
     prev_quota_validity_time = urr->quota_validity_time;
13
-    prev_vol_quota = urr->vol_quota;
14
     prev_time_quota = urr->time_quota;
15
     prev_vol_threshold = urr->vol_threshold;
16
     prev_time_threshold = urr->time_threshold;
17
18
     urr_update_time(sess, urr, gy_message);
19
     urr_update_volume(sess, urr, gy_message);
20
+    /* Associate accounting URR each direction PDR: */
21
     ogs_pfcp_pdr_associate_urr(bearer->ul_pdr, urr);
22
+    ogs_pfcp_pdr_associate_urr(bearer->dl_pdr, urr);
23
24
     if (urr->meas_method != prev_meas_method)
25
         modify_flags |= OGS_PFCP_MODIFY_URR_MEAS_METHOD;
26
+
27
     if (urr->rep_triggers.quota_validity_time != prev_rep_triggers.quota_validity_time ||
28
         urr->rep_triggers.time_quota != prev_rep_triggers.time_quota ||
29
         urr->rep_triggers.volume_quota != prev_rep_triggers.volume_quota ||
30
@@ -214,8 +215,7 @@
31
     if (urr->time_quota != prev_time_quota)
32
         modify_flags |= OGS_PFCP_MODIFY_URR_TIME_QUOTA;
33
34
-    if (urr->vol_quota.tovol != prev_vol_quota.tovol ||
35
-        urr->vol_quota.total_volume != prev_vol_quota.total_volume)
36
+    if (urr->vol_quota.tovol || urr->vol_quota.total_volume)
37
         modify_flags |= OGS_PFCP_MODIFY_URR_VOLUME_QUOTA;
38
39
     if (urr->time_threshold != prev_time_threshold)
40
​
View file
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
106
 
1
@@ -110,7 +110,16 @@
2
3
         /* CC-Time, RFC4006 8.21 */
4
         /* CC-Money, RFC4006 8.22. Not used in 3GPP. */
5
+
6
         /* CC-Total-Octets, RFC4006 8.23 */
7
+        ret = fd_msg_avp_new(ogs_diam_gy_cc_total_octets, 0, &avpch2);
8
+        ogs_assert(ret == 0);
9
+        val.u64 = 1000000;
10
+        ret = fd_msg_avp_setvalue (avpch2, &val);
11
+        ogs_assert(ret == 0);
12
+        ret = fd_msg_avp_add (avpch1, MSG_BRW_LAST_CHILD, avpch2);
13
+        ogs_assert(ret == 0);
14
+
15
         /* CC-Input-Octets, RFC4006 8.24 */
16
         /* CC-Output-Octets, RFC4006 8.25 */
17
         /* CC-Service-Specific-Units, RFC4006 8.26 */
18
@@ -119,6 +128,8 @@
19
         ogs_assert(ret == 0);
20
     }
21
22
+   if (cc_request_type != OGS_DIAM_GY_CC_REQUEST_TYPE_INITIAL_REQUEST) {
23
+
24
     /* Used-Service-Unit, RFC4006 8.18 */
25
     ret = fd_msg_avp_new(ogs_diam_gy_used_service_unit, 0, &avpch1);
26
     ogs_assert(ret == 0);
27
@@ -182,6 +193,7 @@
28
29
     ret = fd_msg_avp_add (avp, MSG_BRW_LAST_CHILD, avpch1);
30
     ogs_assert(ret == 0);
31
+     //bypass USU if we are in CCR INITIAL
32
33
     /* Service-Identifier, RFC4006 8.28. Not used in Gy. */
34
     /* Rating-Group */
35
@@ -296,7 +308,7 @@
36
     ogs_assert(ret == 0);
37
     ret = fd_msg_avp_add (avp, MSG_BRW_LAST_CHILD, avpch1);
38
     ogs_assert(ret == 0);
39
-
40
+    }
41
     /* Multiple Services AVP add to req: */
42
     ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
43
     ogs_assert(ret == 0);
44
@@ -306,6 +318,7 @@
45
 static void fill_service_information_ccr(smf_sess_t *sess,
46
                                          uint32_t cc_request_type, struct msg *req)
47
 {
48
+
49
     int ret;
50
     union avp_value val;
51
     struct avp *avp;
52
@@ -558,6 +571,7 @@
53
 void smf_gy_send_ccr(smf_sess_t *sess, void *xact,
54
         uint32_t cc_request_type)
55
 {
56
+
57
     int ret;
58
     smf_ue_t *smf_ue = NULL;
59
60
@@ -599,7 +613,6 @@
61
         ogs_assert(new == 0);
62
63
         ogs_debug("    Found Gy Session-Id: %s", sess->gy_sid);
64
-
65
         /* Add Session-Id to the message */
66
         ret = ogs_diam_message_session_id_set(req, (os0_t)sess->gy_sid, sidlen);
67
         ogs_assert(ret == 0);
68
@@ -630,12 +643,10 @@
69
         ogs_assert(sess_data);
70
71
         ogs_debug("    Allocate new Gy session: %s", sess_data->gy_sid);
72
-
73
         /* Save Session-Id to SMF Session Context */
74
         sess->gy_sid = (char *)sess_data->gy_sid;
75
     } else
76
         ogs_debug("    Retrieve Gy session: %s", sess_data->gy_sid);
77
-
78
     /*
79
      * 8.2.  CC-Request-Number AVP
80
      *
81
@@ -670,6 +681,7 @@
82
     sess_data->xact_datareq_slot.cc_req_no = sess_data->cc_request_number;
83
     sess_data->xact_datareq_slot.ptr = xact;
84
85
+
86
     /* Origin-Host & Origin-Realm */
87
     ret = fd_msg_add_origin(req, 0);
88
     ogs_assert(ret == 0);
89
@@ -720,6 +732,8 @@
90
     ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
91
     ogs_assert(ret == 0);
92
93
+
94
+
95
     /* Set the Destination-Host AVP */
96
     if (sess_data->peer_host) {
97
         ret = fd_msg_avp_new(ogs_diam_destination_host, 0, &avp);
98
@@ -881,6 +895,7 @@
99
     ret = fd_msg_send(&req, smf_gy_cca_cb, svg);
100
     ogs_assert(ret == 0);
101
102
+
103
     /* Increment the counter */
104
     ogs_assert(pthread_mutex_lock(&ogs_diam_logger_self()->stats_lock) == 0);
105
     ogs_diam_logger_self()->stats.nb_sent++;
106
​
Locations
Help
Contact