Fix the bug for various assert [#551]

configs/open5gs/amf.yaml.in

@@ -262,7 +262,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -270,7 +270,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024

configs/open5gs/ausf.yaml.in

@@ -138,7 +138,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -146,7 +146,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024

configs/open5gs/hss.yaml.in

@@ -64,7 +64,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -72,7 +72,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024

configs/open5gs/mme.yaml.in

@@ -366,7 +366,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -374,7 +374,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024

configs/open5gs/nrf.yaml.in

@@ -108,7 +108,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -116,7 +116,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024

configs/open5gs/pcrf.yaml.in

@@ -63,7 +63,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -71,7 +71,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024

configs/open5gs/sgwc.yaml.in

@@ -145,7 +145,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -153,7 +153,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024

configs/open5gs/sgwu.yaml.in

@@ -105,7 +105,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -113,7 +113,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024

configs/open5gs/smf.yaml.in

@@ -327,7 +327,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -335,7 +335,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024

configs/open5gs/udm.yaml.in

@@ -138,7 +138,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -146,7 +146,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024

configs/open5gs/udr.yaml.in

@@ -140,7 +140,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -148,7 +148,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024

configs/open5gs/upf.yaml.in

@@ -193,7 +193,7 @@ max:
 #
 # o The Number of Default Memory Pool Size
 #
-#   - Pool-size 128         => 8192 Number
+#   - Pool-size 128         => 32768 Number
 #   - Pool-size 256         => 4096 Number
 #   - Pool-size 512         => 2048 Number
 #   - Pool-size 1024        => 1024 Number
@@ -201,7 +201,7 @@ max:
 #   - Pool-size 8192        => 128 Number
 #   - Pool-size 1024*1024   => 8 Number
 #
-#    128:  8192
+#    128:  32768
 #    256:  4096
 #    512:  2048
 #    1024: 1024

lib/core/ogs-pkbuf.c

@@ -92,7 +92,7 @@ void ogs_pkbuf_default_init(ogs_pkbuf_config_t *config)
     ogs_assert(config);
     memset(config, 0, sizeof *config);
 
-    config->cluster_128_pool = 8192;
+    config->cluster_128_pool = 32768;
     config->cluster_256_pool = 4096;
     config->cluster_512_pool = 2048;
     config->cluster_1024_pool = 1024;

src/mme/s1ap-handler.c

@@ -536,7 +536,7 @@ void s1ap_handle_initial_context_setup_response(
             enb_ue->enb_ue_s1ap_id, enb_ue->mme_ue_s1ap_id);
 
     mme_ue = enb_ue->mme_ue;
-    ogs_assert(mme_ue);
+    ogs_expect(mme_ue);
 
     if (E_RABSetupListCtxtSURes) {
         for (i = 0; i < E_RABSetupListCtxtSURes->list.count; i++) {
@@ -730,8 +730,9 @@ void s1ap_handle_ue_context_modification_response(
     ogs_assert(ENB_UE_S1AP_ID);
     enb_ue = enb_ue_find_by_enb_ue_s1ap_id(enb, *ENB_UE_S1AP_ID);
     ogs_assert(enb_ue);
+
     mme_ue = enb_ue->mme_ue;
-    ogs_assert(mme_ue);
+    ogs_expect(mme_ue);
 
     ogs_debug("    ENB_UE_S1AP_ID[%d] MME_UE_S1AP_ID[%d]",
             enb_ue->enb_ue_s1ap_id, enb_ue->mme_ue_s1ap_id);
@@ -801,7 +802,7 @@ void s1ap_handle_ue_context_modification_failure(
 
 cleanup:
     mme_ue = enb_ue->mme_ue;
-    ogs_assert(mme_ue);
+    ogs_expect(mme_ue);
     CLEAR_SERVICE_INDICATOR(mme_ue);
 }
 
@@ -873,7 +874,7 @@ void s1ap_handle_e_rab_setup_response(
             enb_ue->enb_ue_s1ap_id, enb_ue->mme_ue_s1ap_id);
 
     mme_ue = enb_ue->mme_ue;
-    ogs_assert(mme_ue);
+    ogs_expect(mme_ue);
 
     if (E_RABSetupListBearerSURes) {
         for (i = 0; i < E_RABSetupListBearerSURes->list.count; i++) {
@@ -1232,7 +1233,7 @@ void s1ap_handle_path_switch_request(
             enb_ue->enb_ue_s1ap_id, enb_ue->mme_ue_s1ap_id);
 
     mme_ue = enb_ue->mme_ue;
-    ogs_assert(mme_ue);
+    ogs_expect(mme_ue);
 
     if (SECURITY_CONTEXT_IS_VALID(mme_ue)) {
         mme_ue->nhcc++;
@@ -1497,7 +1498,7 @@ void s1ap_handle_handover_required(mme_enb_t *enb, ogs_s1ap_message_t *message)
             source_ue->enb_ue_s1ap_id, source_ue->mme_ue_s1ap_id);
 
     mme_ue = source_ue->mme_ue;
-    ogs_assert(mme_ue);
+    ogs_expect(mme_ue);
 
     if (SECURITY_CONTEXT_IS_VALID(mme_ue)) {
         mme_ue->nhcc++;
@@ -1587,7 +1588,7 @@ void s1ap_handle_handover_request_ack(
     source_ue = target_ue->source_ue;
     ogs_assert(source_ue);
     mme_ue = source_ue->mme_ue;
-    ogs_assert(mme_ue);
+    ogs_expect(mme_ue);
 
     ogs_debug("    Source : ENB_UE_S1AP_ID[%d] MME_UE_S1AP_ID[%d]",
             source_ue->enb_ue_s1ap_id, source_ue->mme_ue_s1ap_id);
@@ -1855,7 +1856,8 @@ void s1ap_handle_enb_status_transfer(mme_enb_t *enb, ogs_s1ap_message_t *message
             ENB_StatusTransfer_TransparentContainer);
 }
 
-void s1ap_handle_handover_notification(mme_enb_t *enb, ogs_s1ap_message_t *message)
+void s1ap_handle_handover_notification(
+        mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char buf[OGS_ADDRSTRLEN];
     int i;
@@ -1932,7 +1934,7 @@ void s1ap_handle_handover_notification(mme_enb_t *enb, ogs_s1ap_message_t *messa
     source_ue = target_ue->source_ue;
     ogs_assert(source_ue);
     mme_ue = source_ue->mme_ue;
-    ogs_assert(mme_ue);
+    ogs_expect(mme_ue);
 
     ogs_debug("    Source : ENB_UE_S1AP_ID[%d] MME_UE_S1AP_ID[%d]",
             source_ue->enb_ue_s1ap_id, source_ue->mme_ue_s1ap_id);

src/sgwc/sxa-handler.c

@@ -248,6 +248,8 @@ void sgwc_sxa_handle_session_modification_response(
     flags = pfcp_xact->modify_flags;
     ogs_assert(flags);
 
+    ogs_pfcp_xact_commit(pfcp_xact);
+
     cause_value = OGS_GTP_CAUSE_REQUEST_ACCEPTED;
 
     if (!sess) {
@@ -333,8 +335,6 @@ void sgwc_sxa_handle_session_modification_response(
         ogs_assert(ul_tunnel);
     }
 
-    ogs_pfcp_xact_commit(pfcp_xact);
-
     if (flags & OGS_PFCP_MODIFY_CREATE) {
         if (flags & OGS_PFCP_MODIFY_UL_ONLY) {
             ogs_gtp_create_bearer_request_t *gtp_req = NULL;