Osmocom Open Build Service

open5gs_2.6.4.22.93bcd.202306210026.dsc -> open5gs_2.6.4.25.93012.202306220026.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.4.22.93bcd.202306210026
+Version: 2.6.4.25.93012.202306220026
 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:
- 19374f52e347fe5bccfda90a3622805776f8d0b5 14123856 open5gs_2.6.4.22.93bcd.202306210026.tar.xz
+ 2350411bb539322c0bc32befd851510f28705a3a 14123816 open5gs_2.6.4.25.93012.202306220026.tar.xz
 Checksums-Sha256:
- a50a9e5e1034d9647ecddf9915467d041126a600ca593e359fb8ae79eff02d4b 14123856 open5gs_2.6.4.22.93bcd.202306210026.tar.xz
+ c2d12ba90cfbfe4af61df1a1ebd6ef29c71618b80b71285c45aa4bf7442c8f53 14123816 open5gs_2.6.4.25.93012.202306220026.tar.xz
 Files:
- 4f08acb7fbe031b5d417c075645bba1f 14123856 open5gs_2.6.4.22.93bcd.202306210026.tar.xz
+ b3cb7568269ef7c74cfdd1dd84cc55b6 14123816 open5gs_2.6.4.25.93012.202306220026.tar.xz

open5gs_2.6.4.22.93bcd.202306210026.tar.xz/.tarball-version -> open5gs_2.6.4.25.93012.202306220026.tar.xz/.tarball-version Changed

open5gs_2.6.4.22.93bcd.202306210026.tar.xz/debian/changelog -> open5gs_2.6.4.25.93012.202306220026.tar.xz/debian/changelog Changed

open5gs_2.6.4.22.93bcd.202306210026.tar.xz/docs/_pages/docs.md -> open5gs_2.6.4.25.93012.202306220026.tar.xz/docs/_pages/docs.md Changed

open5gs_2.6.4.22.93bcd.202306210026.tar.xz/src/smf/context.c -> open5gs_2.6.4.25.93012.202306220026.tar.xz/src/smf/context.c Changed

open5gs_2.6.4.22.93bcd.202306210026.tar.xz/src/smf/gx-path.c -> open5gs_2.6.4.25.93012.202306220026.tar.xz/src/smf/gx-path.c Changed

@@ -28,9 +28,12 @@
 
     os0_t       peer_host;          /* Peer Host */
 
-#define MAX_CC_REQUEST_NUMBER 64
+#define NUM_CC_REQUEST_SLOT 4
     smf_sess_t *sess;
-    ogs_gtp_xact_t *xactMAX_CC_REQUEST_NUMBER;
+    struct {
+        uint32_t cc_req_no;
+        ogs_gtp_xact_t *ptr;
+    } xact_dataNUM_CC_REQUEST_SLOT;
 
     uint32_t cc_request_type;
     uint32_t cc_request_number;
@@ -103,6 +106,7 @@
     struct sockaddr_in sin;
     struct sockaddr_in6 sin6;
     uint32_t charging_id;
+    uint32_t req_slot;
 
     ogs_assert(sess);
 
@@ -191,11 +195,12 @@
 
     ogs_debug("    CC Request Type%d Number%d",
         sess_data->cc_request_type, sess_data->cc_request_number);
-    ogs_assert(sess_data->cc_request_number <= MAX_CC_REQUEST_NUMBER);
 
     /* Update session state */
     sess_data->sess = sess;
-    sess_data->xactsess_data->cc_request_number = xact;
+    req_slot = sess_data->cc_request_number % NUM_CC_REQUEST_SLOT;
+    sess_data->xact_datareq_slot.ptr = xact;
+    sess_data->xact_datareq_slot.cc_req_no = sess_data->cc_request_number;
 
     /* Set Origin-Host & Origin-Realm */
     ret = fd_msg_add_origin(req, 0);
@@ -713,7 +718,7 @@
     ogs_gtp_xact_t *xact = NULL;
     smf_sess_t *sess = NULL;
     ogs_diam_gx_message_t *gx_message = NULL;
-    uint32_t cc_request_number = 0;
+    uint32_t req_slot, cc_request_number = 0;
 
     ogs_debug("Credit-Control-Answer");
 
@@ -755,11 +760,13 @@
     ret = fd_msg_avp_hdr(avp, &hdr);
     ogs_assert(ret == 0);
     cc_request_number = hdr->avp_value->i32;
+    req_slot = cc_request_number % NUM_CC_REQUEST_SLOT;
 
     ogs_debug("    CC-Request-Number%d", cc_request_number);
 
-    xact = sess_data->xactcc_request_number;
+    xact = sess_data->xact_datareq_slot.ptr;
     sess = sess_data->sess;
+    ogs_assert(sess_data->xact_datareq_slot.cc_req_no == cc_request_number);
     ogs_assert(sess);
 
     gx_message = ogs_calloc(1, sizeof(ogs_diam_gx_message_t));

open5gs_2.6.4.22.93bcd.202306210026.tar.xz/src/smf/gy-path.c -> open5gs_2.6.4.25.93012.202306220026.tar.xz/src/smf/gy-path.c Changed

@@ -29,12 +29,14 @@
 
     os0_t       peer_host;          /* Peer Host */
 
-#define MAX_CC_REQUEST_NUMBER 64
+#define NUM_CC_REQUEST_SLOT 4
+
     smf_sess_t *sess;
     struct {
+        uint32_t cc_req_no;
         bool pfcp;
         void *ptr; /* INITIAL: ogs_gtp_xact_t, UPDATE: ogs_pfcp_xact_t */
-    } xact_dataMAX_CC_REQUEST_NUMBER;
+    } xact_dataNUM_CC_REQUEST_SLOT;
     uint32_t cc_request_type;
     uint32_t cc_request_number;
 
@@ -567,7 +569,7 @@
     struct session *session = NULL;
     int new;
     const char *service_context_id = "32251@3gpp.org";
-    uint32_t timestamp;
+    uint32_t timestamp, req_slot;
 
     ogs_assert(xact);
     ogs_assert(sess);
@@ -657,15 +659,16 @@
 
     ogs_debug("    CC Request Type%d Number%d",
         sess_data->cc_request_type, sess_data->cc_request_number);
-    ogs_assert(sess_data->cc_request_number <= MAX_CC_REQUEST_NUMBER);
 
     /* Update session state */
     sess_data->sess = sess;
+    req_slot = sess_data->cc_request_number % NUM_CC_REQUEST_SLOT;
     if (cc_request_type == OGS_DIAM_GY_CC_REQUEST_TYPE_UPDATE_REQUEST)
-        sess_data->xact_datasess_data->cc_request_number.pfcp = true;
+        sess_data->xact_datareq_slot.pfcp = true;
     else
-        sess_data->xact_datasess_data->cc_request_number.pfcp = false;
-    sess_data->xact_datasess_data->cc_request_number.ptr = xact;
+        sess_data->xact_datareq_slot.pfcp = false;
+    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);
@@ -902,7 +905,7 @@
     void *xact = NULL;
     smf_sess_t *sess = NULL;
     ogs_diam_gy_message_t *gy_message = NULL;
-    uint32_t cc_request_number = 0;
+    uint32_t req_slot, cc_request_number = 0;
 
     ogs_debug("GyCredit-Control-Answer");
 
@@ -944,11 +947,12 @@
     ret = fd_msg_avp_hdr(avp, &hdr);
     ogs_assert(ret == 0);
     cc_request_number = hdr->avp_value->i32;
+    req_slot = cc_request_number % NUM_CC_REQUEST_SLOT;
 
     ogs_debug("    CC-Request-Number%d", cc_request_number);
 
-    xact = sess_data->xact_datacc_request_number.ptr;
-    ogs_assert(xact);
+    xact = sess_data->xact_datareq_slot.ptr;
+    ogs_assert(sess_data->xact_datareq_slot.cc_req_no == cc_request_number);
     sess = sess_data->sess;
     ogs_assert(sess);
 
@@ -1106,10 +1110,10 @@
         e->sess = sess;
         e->gy_message = gy_message;
         if (gy_message->cc_request_type == OGS_DIAM_GY_CC_REQUEST_TYPE_UPDATE_REQUEST) {
-            ogs_assert(sess_data->xact_datasess_data->cc_request_number.pfcp == true);
+            ogs_assert(sess_data->xact_datareq_slot.pfcp == true);
             e->pfcp_xact = xact;
         } else {
-            ogs_assert(sess_data->xact_datasess_data->cc_request_number.pfcp == false);
+            ogs_assert(sess_data->xact_datareq_slot.pfcp == false);
             e->gtp_xact = xact;
         }
         rv = ogs_queue_push(ogs_app()->queue, e);

Changes of Revision 364