Changes of Revision 238

View file
commit_93012c4512d8c5570674d67dcd5692b9c68d1896.txt Added
View file
commit_93bcd7fda7c3754ae96ff8d6eec22568964babc4.txt Deleted
View file
open5gs_2.6.4.22.93bcd.dsc -> open5gs_2.6.4.25.93012.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.4.22.93bcd
6
+Version: 2.6.4.25.93012
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
- 68c673a7e59bc5827c6aa89dcd9a6934d18fd152 14124456 open5gs_2.6.4.22.93bcd.tar.xz
15
+ c73f7507665919c01c57c4984bdc3b48bdde5607 14123740 open5gs_2.6.4.25.93012.tar.xz
16
 Checksums-Sha256:
17
- d6c509ca3455e524254cd8a6dc063070c6e9e8d247e609496f5d1ab9e5096e7f 14124456 open5gs_2.6.4.22.93bcd.tar.xz
18
+ 0ec6c2c74997768c79a9e63bd8e85440511d35c1f543aa530aeb031cf78066b4 14123740 open5gs_2.6.4.25.93012.tar.xz
19
 Files:
20
- cf378d11a278aecd16b5c39cb5876ce5 14124456 open5gs_2.6.4.22.93bcd.tar.xz
21
+ fee9a862ec6bc760de871f1ccf65fbde 14123740 open5gs_2.6.4.25.93012.tar.xz
22
​
View file
open5gs_2.6.4.22.93bcd.tar.xz/.tarball-version -> open5gs_2.6.4.25.93012.tar.xz/.tarball-version Changed
4
 
1
@@ -1 +1 @@
2
-2.6.4.22-93bcd
3
+2.6.4.25-93012
4
​
View file
open5gs_2.6.4.22.93bcd.tar.xz/debian/changelog -> open5gs_2.6.4.25.93012.tar.xz/debian/changelog Changed
12
 
1
@@ -1,8 +1,8 @@
2
-open5gs (2.6.4.22.93bcd) unstable; urgency=medium
3
+open5gs (2.6.4.25.93012) unstable; urgency=medium
4
5
   * Automatically generated changelog entry for building the Osmocom master feed
6
7
- -- Osmocom OBS scripts <info@osmocom.org>  Thu, 15 Jun 2023 09:52:14 +0000
8
+ -- Osmocom OBS scripts <info@osmocom.org>  Wed, 21 Jun 2023 13:48:40 +0000
9
10
 open5gs (2.6.4) unstable; urgency=medium
11
12
​
View file
open5gs_2.6.4.22.93bcd.tar.xz/docs/_pages/docs.md -> open5gs_2.6.4.25.93012.tar.xz/docs/_pages/docs.md Changed
6
 
1
@@ -63,3 +63,4 @@
2
   - SCP Indirect communication Model C(https://github.com/s5uishida/open5gs_5gc_ueransim_scp_model_c_sample_config)
3
   - Monitoring Metrics with Prometheus(https://github.com/s5uishida/open5gs_5gc_ueransim_metrics_sample_config)
4
   - Frame Routing(https://github.com/s5uishida/open5gs_5gc_ueransim_framed_routing_sample_config)
5
+  - VPP-UPF with DPDK(https://github.com/s5uishida/open5gs_5gc_ueransim_vpp_upf_dpdk_sample_config)
6
​
View file
open5gs_2.6.4.22.93bcd.tar.xz/src/smf/context.c -> open5gs_2.6.4.25.93012.tar.xz/src/smf/context.c Changed
10
 
1
@@ -1490,6 +1490,8 @@
2
     if (sess) {
3
         ogs_warn("OLD Session Will Release SUPI:%s,PDU Session identity:%d",
4
                 SmContextCreateData->supi, SmContextCreateData->pdu_session_id);
5
+        smf_metrics_inst_by_slice_add(&sess->plmn_id, &sess->s_nssai,
6
+                SMF_METR_GAUGE_SM_SESSIONNBR, -1);
7
         smf_sess_remove(sess);
8
     }
9
10
​
View file
open5gs_2.6.4.22.93bcd.tar.xz/src/smf/gx-path.c -> open5gs_2.6.4.25.93012.tar.xz/src/smf/gx-path.c Changed
63
 
1
@@ -28,9 +28,12 @@
2
3
     os0_t       peer_host;          /* Peer Host */
4
5
-#define MAX_CC_REQUEST_NUMBER 64
6
+#define NUM_CC_REQUEST_SLOT 4
7
     smf_sess_t *sess;
8
-    ogs_gtp_xact_t *xactMAX_CC_REQUEST_NUMBER;
9
+    struct {
10
+        uint32_t cc_req_no;
11
+        ogs_gtp_xact_t *ptr;
12
+    } xact_dataNUM_CC_REQUEST_SLOT;
13
14
     uint32_t cc_request_type;
15
     uint32_t cc_request_number;
16
@@ -103,6 +106,7 @@
17
     struct sockaddr_in sin;
18
     struct sockaddr_in6 sin6;
19
     uint32_t charging_id;
20
+    uint32_t req_slot;
21
22
     ogs_assert(sess);
23
24
@@ -191,11 +195,12 @@
25
26
     ogs_debug("    CC Request Type%d Number%d",
27
         sess_data->cc_request_type, sess_data->cc_request_number);
28
-    ogs_assert(sess_data->cc_request_number <= MAX_CC_REQUEST_NUMBER);
29
30
     /* Update session state */
31
     sess_data->sess = sess;
32
-    sess_data->xactsess_data->cc_request_number = xact;
33
+    req_slot = sess_data->cc_request_number % NUM_CC_REQUEST_SLOT;
34
+    sess_data->xact_datareq_slot.ptr = xact;
35
+    sess_data->xact_datareq_slot.cc_req_no = sess_data->cc_request_number;
36
37
     /* Set Origin-Host & Origin-Realm */
38
     ret = fd_msg_add_origin(req, 0);
39
@@ -713,7 +718,7 @@
40
     ogs_gtp_xact_t *xact = NULL;
41
     smf_sess_t *sess = NULL;
42
     ogs_diam_gx_message_t *gx_message = NULL;
43
-    uint32_t cc_request_number = 0;
44
+    uint32_t req_slot, cc_request_number = 0;
45
46
     ogs_debug("Credit-Control-Answer");
47
48
@@ -755,11 +760,13 @@
49
     ret = fd_msg_avp_hdr(avp, &hdr);
50
     ogs_assert(ret == 0);
51
     cc_request_number = hdr->avp_value->i32;
52
+    req_slot = cc_request_number % NUM_CC_REQUEST_SLOT;
53
54
     ogs_debug("    CC-Request-Number%d", cc_request_number);
55
56
-    xact = sess_data->xactcc_request_number;
57
+    xact = sess_data->xact_datareq_slot.ptr;
58
     sess = sess_data->sess;
59
+    ogs_assert(sess_data->xact_datareq_slot.cc_req_no == cc_request_number);
60
     ogs_assert(sess);
61
62
     gx_message = ogs_calloc(1, sizeof(ogs_diam_gx_message_t));
63
​
View file
open5gs_2.6.4.22.93bcd.tar.xz/src/smf/gy-path.c -> open5gs_2.6.4.25.93012.tar.xz/src/smf/gy-path.c Changed
85
 
1
@@ -29,12 +29,14 @@
2
3
     os0_t       peer_host;          /* Peer Host */
4
5
-#define MAX_CC_REQUEST_NUMBER 64
6
+#define NUM_CC_REQUEST_SLOT 4
7
+
8
     smf_sess_t *sess;
9
     struct {
10
+        uint32_t cc_req_no;
11
         bool pfcp;
12
         void *ptr; /* INITIAL: ogs_gtp_xact_t, UPDATE: ogs_pfcp_xact_t */
13
-    } xact_dataMAX_CC_REQUEST_NUMBER;
14
+    } xact_dataNUM_CC_REQUEST_SLOT;
15
     uint32_t cc_request_type;
16
     uint32_t cc_request_number;
17
18
@@ -567,7 +569,7 @@
19
     struct session *session = NULL;
20
     int new;
21
     const char *service_context_id = "32251@3gpp.org";
22
-    uint32_t timestamp;
23
+    uint32_t timestamp, req_slot;
24
25
     ogs_assert(xact);
26
     ogs_assert(sess);
27
@@ -657,15 +659,16 @@
28
29
     ogs_debug("    CC Request Type%d Number%d",
30
         sess_data->cc_request_type, sess_data->cc_request_number);
31
-    ogs_assert(sess_data->cc_request_number <= MAX_CC_REQUEST_NUMBER);
32
33
     /* Update session state */
34
     sess_data->sess = sess;
35
+    req_slot = sess_data->cc_request_number % NUM_CC_REQUEST_SLOT;
36
     if (cc_request_type == OGS_DIAM_GY_CC_REQUEST_TYPE_UPDATE_REQUEST)
37
-        sess_data->xact_datasess_data->cc_request_number.pfcp = true;
38
+        sess_data->xact_datareq_slot.pfcp = true;
39
     else
40
-        sess_data->xact_datasess_data->cc_request_number.pfcp = false;
41
-    sess_data->xact_datasess_data->cc_request_number.ptr = xact;
42
+        sess_data->xact_datareq_slot.pfcp = false;
43
+    sess_data->xact_datareq_slot.cc_req_no = sess_data->cc_request_number;
44
+    sess_data->xact_datareq_slot.ptr = xact;
45
46
     /* Origin-Host & Origin-Realm */
47
     ret = fd_msg_add_origin(req, 0);
48
@@ -902,7 +905,7 @@
49
     void *xact = NULL;
50
     smf_sess_t *sess = NULL;
51
     ogs_diam_gy_message_t *gy_message = NULL;
52
-    uint32_t cc_request_number = 0;
53
+    uint32_t req_slot, cc_request_number = 0;
54
55
     ogs_debug("GyCredit-Control-Answer");
56
57
@@ -944,11 +947,12 @@
58
     ret = fd_msg_avp_hdr(avp, &hdr);
59
     ogs_assert(ret == 0);
60
     cc_request_number = hdr->avp_value->i32;
61
+    req_slot = cc_request_number % NUM_CC_REQUEST_SLOT;
62
63
     ogs_debug("    CC-Request-Number%d", cc_request_number);
64
65
-    xact = sess_data->xact_datacc_request_number.ptr;
66
-    ogs_assert(xact);
67
+    xact = sess_data->xact_datareq_slot.ptr;
68
+    ogs_assert(sess_data->xact_datareq_slot.cc_req_no == cc_request_number);
69
     sess = sess_data->sess;
70
     ogs_assert(sess);
71
72
@@ -1106,10 +1110,10 @@
73
         e->sess = sess;
74
         e->gy_message = gy_message;
75
         if (gy_message->cc_request_type == OGS_DIAM_GY_CC_REQUEST_TYPE_UPDATE_REQUEST) {
76
-            ogs_assert(sess_data->xact_datasess_data->cc_request_number.pfcp == true);
77
+            ogs_assert(sess_data->xact_datareq_slot.pfcp == true);
78
             e->pfcp_xact = xact;
79
         } else {
80
-            ogs_assert(sess_data->xact_datasess_data->cc_request_number.pfcp == false);
81
+            ogs_assert(sess_data->xact_datareq_slot.pfcp == false);
82
             e->gtp_xact = xact;
83
         }
84
         rv = ogs_queue_push(ogs_app()->queue, e);
85
​
Locations
Help
Contact