Osmocom Open Build Service

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 115

commit_689574a2d9ce9f10d9a5b861a1b5953171eed095.txt Added

commit_a8f83989f4fdd55a176de3f159aa026750a5c5a8.txt Deleted

open5gs_2.5.5.100.a8f8.dsc -> open5gs_2.5.5.101.6895.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.5.5.100.a8f8
+Version: 2.5.5.101.6895
 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:
- e395a7378bf13b85fe3b229b74e70007e5583fc7 13611620 open5gs_2.5.5.100.a8f8.tar.xz
+ 5d87a89ff215cddb2a6c415bdf79a1b643c34ee7 13611540 open5gs_2.5.5.101.6895.tar.xz
 Checksums-Sha256:
- 84d699461e4bb14e733633f9a8d6ccb10b6ae49441a357fe973e8cf04b8b0193 13611620 open5gs_2.5.5.100.a8f8.tar.xz
+ 1b3c16c42512e82be1572559054333fc8829a5f7f9e3700cf0e5768038fb630a 13611540 open5gs_2.5.5.101.6895.tar.xz
 Files:
- f9e06dfc04435d7b6f142689b0bd6ce4 13611620 open5gs_2.5.5.100.a8f8.tar.xz
+ 8a5ca2672687a98d4cdf0727e8146c1f 13611540 open5gs_2.5.5.101.6895.tar.xz

open5gs_2.5.5.100.a8f8.tar.xz/.tarball-version -> open5gs_2.5.5.101.6895.tar.xz/.tarball-version Changed

open5gs_2.5.5.100.a8f8.tar.xz/debian/changelog -> open5gs_2.5.5.101.6895.tar.xz/debian/changelog Changed

open5gs_2.5.5.100.a8f8.tar.xz/lib/core/ogs-errno.h -> open5gs_2.5.5.101.6895.tar.xz/lib/core/ogs-errno.h Changed

open5gs_2.5.5.100.a8f8.tar.xz/lib/core/ogs-pkbuf.c -> open5gs_2.5.5.101.6895.tar.xz/lib/core/ogs-pkbuf.c Changed

open5gs_2.5.5.100.a8f8.tar.xz/src/amf/amf-sm.c -> open5gs_2.5.5.101.6895.tar.xz/src/amf/amf-sm.c Changed

@@ -45,7 +45,7 @@
 
 void amf_state_operational(ogs_fsm_t *s, amf_event_t *e)
 {
-    int rv;
+    int r, rv;
     char bufOGS_ADDRSTRLEN;
     const char *api_version = NULL;
 
@@ -621,9 +621,10 @@
                 }
 
                 ogs_error("%s Cannot receive SBI message", amf_ue->suci);
-                ogs_expect(OGS_OK ==
-                    nas_5gs_send_gmm_reject_from_sbi(amf_ue,
-                        OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT));
+                r = nas_5gs_send_gmm_reject_from_sbi(amf_ue,
+                        OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 break;
 
             case OGS_SBI_OBJ_SESS_TYPE:
@@ -638,16 +639,17 @@
                 ogs_error("%d:%d Cannot receive SBI message",
                         sess->psi, sess->pti);
                 if (sess->payload_container_type) {
-                    ogs_expect(OGS_OK ==
-                        nas_5gs_send_back_gsm_message(sess,
+                    r = nas_5gs_send_back_gsm_message(sess,
                             OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                            AMF_NAS_BACKOFF_TIME));
+                            AMF_NAS_BACKOFF_TIME);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 } else {
-                    ogs_expect(OGS_OK ==
-                        ngap_send_error_indication2(amf_ue,
+                    r = ngap_send_error_indication2(amf_ue,
                             NGAP_Cause_PR_transport,
-                            NGAP_CauseTransport_transport_resource_unavailable)
-                    );
+                            NGAP_CauseTransport_transport_resource_unavailable);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 }
                 break;
 
@@ -755,10 +757,11 @@
             ogs_fsm_dispatch(&gnb->sm, e);
         } else {
             ogs_error("Cannot decode NGAP message");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication(
+            r = ngap_send_error_indication(
                     gnb, NULL, NULL, NGAP_Cause_PR_protocol, 
-                    NGAP_CauseProtocol_abstract_syntax_error_falsely_constructed_message));
+                    NGAP_CauseProtocol_abstract_syntax_error_falsely_constructed_message);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
 
         ogs_ngap_free(&ngap_message);
@@ -776,7 +779,9 @@
             pkbuf = e->pkbuf;
             ogs_assert(pkbuf);
 
-            ogs_expect(OGS_OK == ngap_send_to_ran_ue(ran_ue, pkbuf));
+            r = ngap_send_to_ran_ue(ran_ue, pkbuf);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             ogs_timer_delete(e->timer);
             break;
         case AMF_TIMER_NG_HOLDING:
@@ -811,11 +816,13 @@
             if (!amf_ue) {
                 amf_ue = amf_ue_add(ran_ue);
                 if (amf_ue == NULL) {
-                    ogs_expect(OGS_OK ==
-                        ngap_send_ran_ue_context_release_command(ran_ue,
+                    r = ngap_send_ran_ue_context_release_command(
+                            ran_ue,
                             NGAP_Cause_PR_misc,
                             NGAP_CauseMisc_control_processing_overload,
-                            NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0));
+                            NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     ogs_pkbuf_free(pkbuf);
                     return;
                 }
@@ -871,10 +878,11 @@
                 /* De-associate NG with NAS/EMM */
                 ran_ue_deassociate(amf_ue->ran_ue);
 
-                ogs_expect(OGS_OK ==
-                    ngap_send_ran_ue_context_release_command(amf_ue->ran_ue,
+                r = ngap_send_ran_ue_context_release_command(amf_ue->ran_ue,
                         NGAP_Cause_PR_nas, NGAP_CauseNas_normal_release,
-                        NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0));
+                        NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             amf_ue_associate_ran_ue(amf_ue, ran_ue);

open5gs_2.5.5.100.a8f8.tar.xz/src/amf/gmm-handler.c -> open5gs_2.5.5.101.6895.tar.xz/src/amf/gmm-handler.c Changed

@@ -548,7 +548,7 @@
 {
     amf_sess_t *sess = NULL;
     uint16_t psimask = 0;
-    int xact_count = 0;
+    int xact_count = 0, r;
 
     ogs_nas_uplink_data_status_t *uplink_data_status = NULL;
     ogs_nas_pdu_session_status_t *pdu_session_status = NULL;
@@ -634,9 +634,11 @@
         }
     }
 
-    if (amf_sess_xact_count(amf_ue) == xact_count)
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_service_accept(amf_ue));
+    if (amf_sess_xact_count(amf_ue) == xact_count) {
+        r = nas_5gs_send_service_accept(amf_ue);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
+    }
 
     return OGS_5GMM_CAUSE_REQUEST_ACCEPTED;
 }
@@ -644,6 +646,7 @@
 int gmm_handle_deregistration_request(amf_ue_t *amf_ue,
         ogs_nas_5gs_deregistration_request_from_ue_t *deregistration_request)
 {
+    int r;
     ogs_nas_de_registration_type_t *de_registration_type = NULL;
 
     ogs_assert(amf_ue);
@@ -690,9 +693,11 @@
     amf_sbi_send_release_all_sessions(
             amf_ue, AMF_RELEASE_SM_CONTEXT_NO_STATE);
 
-    if (ogs_list_count(&amf_ue->sess_list) == 0)
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_de_registration_accept(amf_ue));
+    if (ogs_list_count(&amf_ue->sess_list) == 0) {
+        r = nas_5gs_send_de_registration_accept(amf_ue);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
+    }
 
     return OGS_OK;
 }
@@ -885,6 +890,7 @@
 int gmm_handle_ul_nas_transport(amf_ue_t *amf_ue,
         ogs_nas_5gs_ul_nas_transport_t *ul_nas_transport)
 {
+    int r;
     ogs_slice_data_t *selected_slice = NULL;
     amf_sess_t *sess = NULL;
     amf_nsmf_pdusession_sm_context_param_t param;
@@ -906,34 +912,38 @@
 
     if (!payload_container_type->value) {
         ogs_error("%s No Payload container type", amf_ue->supi);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_status(
-                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION));
+        r = nas_5gs_send_gmm_status(
+                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     if (!payload_container->length) {
         ogs_error("%s No Payload container length", amf_ue->supi);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_status(
-                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION));
+        r = nas_5gs_send_gmm_status(
+                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     if (!payload_container->buffer) {
         ogs_error("%s No Payload container buffer", amf_ue->supi);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_status(
-                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION));
+        r = nas_5gs_send_gmm_status(
+                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     if ((ul_nas_transport->presencemask &
         OGS_NAS_5GS_UL_NAS_TRANSPORT_PDU_SESSION_ID_PRESENT) == 0) {
         ogs_error("%s No PDU session ID", amf_ue->supi);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_status(
-                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION));
+        r = nas_5gs_send_gmm_status(
+                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -941,9 +951,10 @@
     if (*pdu_session_id == OGS_NAS_PDU_SESSION_IDENTITY_UNASSIGNED) {
         ogs_error("%s PDU session identity is unassigned",
                 amf_ue->supi);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_status(
-                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION));
+        r = nas_5gs_send_gmm_status(
+                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -964,9 +975,10 @@
             if (!sess) {
                 ogs_error("%s No Session Context %d",
                     amf_ue->supi, gsm_header->message_type);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_gmm_status(amf_ue,
-                    OGS_5GMM_CAUSE_INSUFFICIENT_USER_PLANE_RESOURCES_FOR_THE_PDU_SESSION));
+                r = nas_5gs_send_gmm_status(amf_ue,
+                    OGS_5GMM_CAUSE_INSUFFICIENT_USER_PLANE_RESOURCES_FOR_THE_PDU_SESSION);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return OGS_ERROR;
             }
         }
@@ -1072,8 +1084,10 @@
             if (!selected_slice || !sess->dnn) {
                 ogs_warn("%s DNN Not Supported OR "
                             "Not Subscribed in the Slice", amf_ue->supi);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_gmm_status(amf_ue, OGS_5GMM_CAUSE_DNN_NOT_SUPPORTED_OR_NOT_SUBSCRIBED_IN_THE_SLICE));
+                r = nas_5gs_send_gmm_status(amf_ue,
+                        OGS_5GMM_CAUSE_DNN_NOT_SUPPORTED_OR_NOT_SUBSCRIBED_IN_THE_SLICE);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return OGS_ERROR;
             }
 
@@ -1137,9 +1151,10 @@
             if (!SESSION_CONTEXT_IN_SMF(sess)) {
                 ogs_error("%s:%d Session Context is not in SMF %d",
                     amf_ue->supi, sess->psi, gsm_header->message_type);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_back_gsm_message(sess,
-                        OGS_5GMM_CAUSE_DNN_NOT_SUPPORTED_OR_NOT_SUBSCRIBED_IN_THE_SLICE, 0));
+                r = nas_5gs_send_back_gsm_message(sess,
+                        OGS_5GMM_CAUSE_DNN_NOT_SUPPORTED_OR_NOT_SUBSCRIBED_IN_THE_SLICE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return OGS_ERROR;
             }
 
@@ -1192,9 +1207,10 @@
                     memset(&param, 0, sizeof(param));
                     param.acknowledgement_requested = 1;
                     param.guti = 1;
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_configuration_update_command(
-                            amf_ue, &param));
+                    r = nas_5gs_send_configuration_update_command(
+                            amf_ue, &param);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
 
                     AMF_UE_CLEAR_PAGING_INFO(amf_ue);
                 }
@@ -1212,9 +1228,10 @@
     default:
         ogs_error("%s Unknown Payload container type %d",
             amf_ue->supi, payload_container_type->value);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_status(amf_ue,
-                OGS_5GMM_CAUSE_MESSAGE_TYPE_NON_EXISTENT_OR_NOT_IMPLEMENTED));
+        r = nas_5gs_send_gmm_status(amf_ue,
+                OGS_5GMM_CAUSE_MESSAGE_TYPE_NON_EXISTENT_OR_NOT_IMPLEMENTED);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }

open5gs_2.5.5.100.a8f8.tar.xz/src/amf/gmm-sm.c -> open5gs_2.5.5.101.6895.tar.xz/src/amf/gmm-sm.c Changed

@@ -58,7 +58,7 @@
 
     ogs_sbi_message_t *sbi_message = NULL;
 
-    int state = 0;
+    int r, state = 0;
 
     ogs_assert(e);
 
@@ -96,8 +96,9 @@
                 OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
             } else {
                 amf_ue->t3570.retry_count++;
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_identity_request(amf_ue));
+                r = nas_5gs_send_identity_request(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -110,9 +111,10 @@
                 OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
             } else {
                 amf_ue->t3522.retry_count++;
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_de_registration_request(amf_ue,
-                        OpenAPI_deregistration_reason_NULL));
+                r = nas_5gs_send_de_registration_request(amf_ue,
+                        OpenAPI_deregistration_reason_NULL);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -287,9 +289,11 @@
                     break;
 
                 CASE(OGS_SBI_HTTP_METHOD_DELETE)
-                    if (state != AMF_NETWORK_INITIATED_DE_REGISTERED)
-                        ogs_assert(OGS_OK ==
-                            nas_5gs_send_de_registration_accept(amf_ue));
+                    if (state != AMF_NETWORK_INITIATED_DE_REGISTERED) {
+                        r = nas_5gs_send_de_registration_accept(amf_ue);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
+                    }
 
                     PCF_AM_POLICY_CLEAR(amf_ue);
                     break;
@@ -320,7 +324,7 @@
 
 void gmm_state_registered(ogs_fsm_t *s, amf_event_t *e)
 {
-    int i;
+    int i, r;
 
     amf_ue_t *amf_ue = NULL;
     amf_sess_t *sess = NULL;
@@ -389,7 +393,9 @@
             } else {
                 amf_ue->t3513.retry_count++;
                 /* If t3513 is timeout, the saved pkbuf is used.  */
-                ogs_assert(OGS_OK == ngap_send_paging(amf_ue));
+                r = ngap_send_paging(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -408,8 +414,9 @@
                  * If t3555 is timeout, the saved pkbuf is used.
                  * In this case, ack should be set to 1 for timer expiration
                  */
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_configuration_update_command(amf_ue, NULL));
+                r = nas_5gs_send_configuration_update_command(amf_ue, NULL);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -422,8 +429,9 @@
                 OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
             } else {
                 amf_ue->t3570.retry_count++;
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_identity_request(amf_ue));
+                r = nas_5gs_send_identity_request(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -507,7 +515,7 @@
 
 static void common_register_state(ogs_fsm_t *s, amf_event_t *e)
 {
-    int rv, xact_count = 0;
+    int r, rv, xact_count = 0;
     ogs_nas_5gmm_cause_t gmm_cause;
 
     amf_ue_t *amf_ue = NULL;
@@ -548,16 +556,18 @@
             if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) {
                 ogs_error("gmm_handle_registration_request() failed %d",
                             gmm_cause);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_registration_reject(amf_ue, gmm_cause));
+                r = nas_5gs_send_registration_reject(amf_ue, gmm_cause);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, gmm_state_exception);
                 break;
             }
 
             if (!AMF_UE_HAVE_SUCI(amf_ue)) {
                 CLEAR_AMF_UE_TIMER(amf_ue->t3570);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_identity_request(amf_ue));
+                r = nas_5gs_send_identity_request(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 break;
             }
 
@@ -568,8 +578,9 @@
                 if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) {
                     ogs_error("%s gmm_handle_registration_update() "
                                 "failed %d", amf_ue->suci, gmm_cause);
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_registration_reject(amf_ue, gmm_cause));
+                    r = nas_5gs_send_registration_reject(amf_ue, gmm_cause);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     OGS_FSM_TRAN(s, gmm_state_exception);
                     break;
                 }
@@ -595,8 +606,9 @@
                     }
 
                     CLEAR_AMF_UE_TIMER(amf_ue->t3550);
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_registration_accept(amf_ue));
+                    r = nas_5gs_send_registration_accept(amf_ue);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 }
 
                 if (amf_ue->next.m_tmsi)
@@ -628,28 +640,29 @@
             if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) {
                 ogs_error("%s gmm_handle_service_request() failed %d",
                             amf_ue->suci, gmm_cause);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_service_reject(amf_ue, gmm_cause));
+                r = nas_5gs_send_service_reject(amf_ue, gmm_cause);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, gmm_state_exception);
                 break;
             }
 
             if (!AMF_UE_HAVE_SUCI(amf_ue)) {
                 ogs_info("Service request : Unknown UE");
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_service_reject(amf_ue,
-                    OGS_5GMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)
-                );
+                r = nas_5gs_send_service_reject(amf_ue,
+                    OGS_5GMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, gmm_state_exception);
                 break;
             }
 
             if (!h.integrity_protected || !SECURITY_CONTEXT_IS_VALID(amf_ue)) {
                 ogs_error("No Security Context");
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_service_reject(amf_ue,
-                    OGS_5GMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)
-                );
+                r = nas_5gs_send_service_reject(amf_ue,
+                    OGS_5GMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, gmm_state_exception);
                 break;
             }
@@ -659,8 +672,9 @@
             if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) {
                 ogs_error("%s gmm_handle_service_update() failed %d",
                             amf_ue->suci, gmm_cause);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_service_reject(amf_ue, gmm_cause));
+                r = nas_5gs_send_service_reject(amf_ue, gmm_cause);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, gmm_state_exception);

open5gs_2.5.5.100.a8f8.tar.xz/src/amf/namf-handler.c -> open5gs_2.5.5.101.6895.tar.xz/src/amf/namf-handler.c Changed

@@ -27,7 +27,7 @@
 int amf_namf_comm_handle_n1_n2_message_transfer(
         ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
 {
-    int status;
+    int status, r;
 
     amf_ue_t *amf_ue = NULL;
     ran_ue_t *ran_ue = NULL;
@@ -206,7 +206,9 @@
                  * sm-context-ref is created in 1-CLIENT.
                  * So, the PDU session establishment accpet can be transmitted.
                  */
-                    ogs_expect(OGS_OK == ngap_send_to_ran_ue(ran_ue, ngapbuf));
+                    r = ngap_send_to_ran_ue(ran_ue, ngapbuf);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 } else {
                     sess->pdu_session_establishment_accept = ngapbuf;
                 }
@@ -285,12 +287,15 @@
                     AMF_SESS_STORE_N2_TRANSFER(
                             sess, pdu_session_resource_setup_request, n2buf);
 
-                    ogs_assert(OGS_OK == ngap_send_paging(amf_ue));
+                    r = ngap_send_paging(amf_ue);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 }
 
             } else if (CM_CONNECTED(amf_ue)) {
-                ogs_assert(OGS_OK ==
-                    nas_send_pdu_session_setup_request(sess, NULL, n2buf));
+                r = nas_send_pdu_session_setup_request(sess, NULL, n2buf);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
             } else {
 
@@ -349,12 +354,15 @@
                         OGS_NAS_5GS_PDU_SESSION_MODIFICATION_COMMAND,
                         n1buf, n2buf);
 
-                ogs_assert(OGS_OK == ngap_send_paging(amf_ue));
+                r = ngap_send_paging(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
 
         } else if (CM_CONNECTED(amf_ue)) {
-            ogs_expect(OGS_OK ==
-                nas_send_pdu_session_modification_command(sess, n1buf, n2buf));
+            r = nas_send_pdu_session_modification_command(sess, n1buf, n2buf);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
         } else {
             ogs_fatal("%s Invalid AMF-UE state", amf_ue->supi);
@@ -386,8 +394,9 @@
             }
 
         } else if (CM_CONNECTED(amf_ue)) {
-            ogs_expect(OGS_OK ==
-                nas_send_pdu_session_release_command(sess, NULL, n2buf));
+            r = nas_send_pdu_session_release_command(sess, NULL, n2buf);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         } else {
             ogs_fatal("%s Invalid AMF-UE state", amf_ue->supi);
             ogs_assert_if_reached();
@@ -512,11 +521,13 @@
 static int do_network_initiated_de_register(
         amf_ue_t *amf_ue, OpenAPI_deregistration_reason_e dereg_reason)
 {
+    int r;
     if ((CM_CONNECTED(amf_ue)) &&
         (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_registered))) {
 
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_de_registration_request(amf_ue, dereg_reason));
+        r = nas_5gs_send_de_registration_request(amf_ue, dereg_reason);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         amf_sbi_send_release_all_sessions(
             amf_ue, AMF_NETWORK_INITIATED_DE_REGISTERED);
@@ -809,6 +820,7 @@
         ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
 {
     int status = OGS_SBI_HTTP_STATUS_NO_CONTENT;
+    int r;
 
     amf_ue_t *amf_ue = NULL;
 
@@ -905,8 +917,9 @@
         ngapbuf = ngap_build_ue_context_modification_request(amf_ue);
         ogs_assert(ngapbuf);
 
-        if (nas_5gs_send_to_gnb(amf_ue, ngapbuf) != OGS_OK)
-            ogs_error("nas_5gs_send_to_gnb() failed");
+        r = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
     }
 
 cleanup:

open5gs_2.5.5.100.a8f8.tar.xz/src/amf/nas-path.c -> open5gs_2.5.5.101.6895.tar.xz/src/amf/nas-path.c Changed

@@ -24,16 +24,20 @@
 
 int nas_5gs_send_to_gnb(amf_ue_t *amf_ue, ogs_pkbuf_t *pkbuf)
 {
+    int rv;
     ogs_assert(pkbuf);
 
     amf_ue = amf_ue_cycle(amf_ue);
     if (!amf_ue) {
-        ogs_warn("UE(amf-ue) context has already been removed");
+        ogs_error("UE(amf-ue) context has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
-    return ngap_send_to_ran_ue(amf_ue->ran_ue, pkbuf);
+    rv = ngap_send_to_ran_ue(amf_ue->ran_ue, pkbuf);
+    ogs_expect(rv == OGS_OK);
+
+    return rv;
 }
 
 int nas_5gs_send_to_downlink_nas_transport(amf_ue_t *amf_ue, ogs_pkbuf_t *pkbuf)
@@ -46,21 +50,24 @@
 
     amf_ue = amf_ue_cycle(amf_ue);
     if (!amf_ue) {
-        ogs_warn("UE(amf-ue) context has already been removed");
+        ogs_error("UE(amf-ue) context has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
     ran_ue = ran_ue_cycle(amf_ue->ran_ue);
     if (!ran_ue) {
-        ogs_warn("NG context has already been removed");
+        ogs_error("NG context has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
     ngapbuf = ngap_build_downlink_nas_transport(
             ran_ue, pkbuf, false, false);
-    ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+    if (!ngapbuf) {
+        ogs_error("ngap_build_downlink_nas_transport() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
     ogs_expect(rv == OGS_OK);
@@ -80,26 +87,37 @@
 
     ogs_assert(amf_ue);
     ran_ue = ran_ue_cycle(amf_ue->ran_ue);
-    ogs_expect_or_return_val(ran_ue, OGS_ERROR);
+    if (!ran_ue) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("%s Registration accept", amf_ue->supi);
 
     if (amf_ue->next.m_tmsi) {
         if (amf_ue->t3550.pkbuf) {
             gmmbuf = amf_ue->t3550.pkbuf;
-            ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
         } else {
             gmmbuf = gmm_build_registration_accept(amf_ue);
-            ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+            if (!gmmbuf) {
+                ogs_error("gmm_build_registration_accept() failed");
+                return OGS_ERROR;
+            }
         }
 
         amf_ue->t3550.pkbuf = ogs_pkbuf_copy(gmmbuf);
-        ogs_expect_or_return_val(amf_ue->t3550.pkbuf, OGS_ERROR);
+        if (!amf_ue->t3550.pkbuf) {
+            ogs_error("ogs_pkbuf_copy(amf_ue->t3550.pkbuf) failed");
+            return OGS_ERROR;
+        }
         ogs_timer_start(amf_ue->t3550.timer,
                 amf_timer_cfg(AMF_TIMER_T3550)->duration);
     } else {
         gmmbuf = gmm_build_registration_accept(amf_ue);
-        ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+        if (!gmmbuf) {
+            ogs_error("gmm_build_registration_accept() failed");
+            return OGS_ERROR;
+        }
     }
 
     /*
@@ -125,31 +143,41 @@
     if (ran_ue->initial_context_setup_request_sent == false &&
         (ran_ue->ue_context_requested == true || transfer_needed == true)) {
         ngapbuf = ngap_ue_build_initial_context_setup_request(amf_ue, gmmbuf);
-        ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+        if (!ngapbuf) {
+            ogs_error("ngap_ue_build_initial_context_setup_request() failed");
+            return OGS_ERROR;
+        }
 
         rv = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
-        ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+        ogs_expect(rv == OGS_OK);
 
         ran_ue->initial_context_setup_request_sent = true;
     } else {
         if (transfer_needed == true) {
             ngapbuf = ngap_ue_build_pdu_session_resource_setup_request(
                     amf_ue, gmmbuf);
-            ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+            if (!ngapbuf) {
+                ogs_error("ngap_ue_build_pdu_session_resource_setup_request()"
+                        " failed");
+                return OGS_ERROR;
+            }
 
             rv = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
-            ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+            ogs_expect(rv == OGS_OK);
         } else {
             ngapbuf = ngap_build_downlink_nas_transport(
                     ran_ue, gmmbuf, true, true);
-            ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+            if (!ngapbuf) {
+                ogs_error("ngap_build_downlink_nas_transport() failed");
+                return OGS_ERROR;
+            }
 
             rv = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
-            ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+            ogs_expect(rv == OGS_OK);
         }
     }
 
-    return OGS_OK;
+    return rv;
 }
 
 int nas_5gs_send_registration_reject(
@@ -165,7 +193,10 @@
     ogs_warn("%s Registration reject %d", amf_ue->suci, gmm_cause);
 
     gmmbuf = gmm_build_registration_reject(gmm_cause);
-    ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+    if (!gmmbuf) {
+        ogs_error("gmm_build_registration_reject() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_5gs_send_to_downlink_nas_transport(amf_ue, gmmbuf);
     ogs_expect(rv == OGS_OK);
@@ -184,12 +215,18 @@
 
     ogs_assert(amf_ue);
     ran_ue = ran_ue_cycle(amf_ue->ran_ue);
-    ogs_expect_or_return_val(ran_ue, OGS_ERROR);
+    if (!ran_ue) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("%s Service accept", amf_ue->supi);
 
     gmmbuf = gmm_build_service_accept(amf_ue);
-    ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+    if (!gmmbuf) {
+        ogs_error("gmm_build_registration_reject() failed");
+        return OGS_ERROR;
+    }
 
     /*
      * Previously, AMF would sends PDUSessionResourceSetupRequest
@@ -214,27 +251,34 @@
     if (ran_ue->initial_context_setup_request_sent == false &&
         (ran_ue->ue_context_requested == true || transfer_needed == true)) {
         ngapbuf = ngap_ue_build_initial_context_setup_request(amf_ue, gmmbuf);
-        ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+        if (!ngapbuf) {
+            ogs_error("ngap_ue_build_initial_context_setup_request() failed");
+            return OGS_ERROR;
+        }
 
         rv = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
-        ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+        ogs_expect(rv == OGS_OK);
 
         ran_ue->initial_context_setup_request_sent = true;
     } else {
         if (transfer_needed == true) {
             ngapbuf = ngap_ue_build_pdu_session_resource_setup_request(
                     amf_ue, gmmbuf);
-            ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+            if (!ngapbuf) {

open5gs_2.5.5.100.a8f8.tar.xz/src/amf/nausf-handler.c -> open5gs_2.5.5.101.6895.tar.xz/src/amf/nausf-handler.c Changed

open5gs_2.5.5.100.a8f8.tar.xz/src/amf/ngap-handler.c -> open5gs_2.5.5.101.6895.tar.xz/src/amf/ngap-handler.c Changed

@@ -100,7 +100,7 @@
 void ngap_handle_ng_setup_request(amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i, j, k;
+    int i, j, k, r;
 
     NGAP_InitiatingMessage_t *initiatingMessage = NULL;
     NGAP_NGSetupRequest_t *NGSetupRequest = NULL;
@@ -148,8 +148,9 @@
         ogs_error("No GlobalRANNodeID");
         group = NGAP_Cause_PR_protocol;
         cause = NGAP_CauseProtocol_semantic_error;
-        ogs_assert(OGS_OK ==
-            ngap_send_ng_setup_failure(gnb, group, cause));
+        r = ngap_send_ng_setup_failure(gnb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -158,8 +159,9 @@
         ogs_error("No globalGNB_ID");
         group = NGAP_Cause_PR_protocol;
         cause = NGAP_CauseProtocol_semantic_error;
-        ogs_assert(OGS_OK ==
-            ngap_send_ng_setup_failure(gnb, group, cause));
+        r = ngap_send_ng_setup_failure(gnb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -167,8 +169,9 @@
         ogs_error("No SupportedTAList");
         group = NGAP_Cause_PR_protocol;
         cause = NGAP_CauseProtocol_semantic_error;
-        ogs_assert(OGS_OK ==
-            ngap_send_ng_setup_failure(gnb, group, cause));
+        r = ngap_send_ng_setup_failure(gnb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -191,8 +194,9 @@
             ogs_error("No SupportedTAItem");
             group = NGAP_Cause_PR_protocol;
             cause = NGAP_CauseProtocol_semantic_error;
-            ogs_assert(OGS_OK ==
-                ngap_send_ng_setup_failure(gnb, group, cause));
+            r = ngap_send_ng_setup_failure(gnb, group, cause);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -216,8 +220,9 @@
                 ogs_error("No BroadcastPLMNItem");
                 group = NGAP_Cause_PR_protocol;
                 cause = NGAP_CauseProtocol_semantic_error;
-                ogs_assert(OGS_OK ==
-                    ngap_send_ng_setup_failure(gnb, group, cause));
+                r = ngap_send_ng_setup_failure(gnb, group, cause);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
@@ -248,8 +253,9 @@
                     ogs_error("No SliceSupportItem");
                     group = NGAP_Cause_PR_protocol;
                     cause = NGAP_CauseProtocol_semantic_error;
-                    ogs_assert(OGS_OK ==
-                        ngap_send_ng_setup_failure(gnb, group, cause));
+                    r = ngap_send_ng_setup_failure(gnb, group, cause);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     return;
                 }
 
@@ -285,8 +291,9 @@
         group = NGAP_Cause_PR_misc;
         cause = NGAP_CauseMisc_control_processing_overload;
 
-        ogs_assert(OGS_OK ==
-            ngap_send_ng_setup_failure(gnb, group, cause));
+        r = ngap_send_ng_setup_failure(gnb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -296,8 +303,9 @@
         group = NGAP_Cause_PR_protocol;
         cause = NGAP_CauseProtocol_message_not_compatible_with_receiver_state;
 
-        ogs_assert(OGS_OK ==
-            ngap_send_ng_setup_failure(gnb, group, cause));
+        r = ngap_send_ng_setup_failure(gnb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -307,8 +315,9 @@
         group = NGAP_Cause_PR_misc;
         cause = NGAP_CauseMisc_unknown_PLMN_or_SNPN;
 
-        ogs_assert(OGS_OK ==
-            ngap_send_ng_setup_failure(gnb, group, cause));
+        r = ngap_send_ng_setup_failure(gnb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -319,21 +328,23 @@
         group = NGAP_Cause_PR_radioNetwork;
         cause = NGAP_CauseRadioNetwork_slice_not_supported;
 
-        ogs_assert(OGS_OK ==
-            ngap_send_ng_setup_failure(gnb, group, cause));
+        r = ngap_send_ng_setup_failure(gnb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     amf_gnb_set_gnb_id(gnb, gnb_id);
 
     gnb->state.ng_setup_success = true;
-    ogs_assert(OGS_OK ==
-        ngap_send_ng_setup_response(gnb));
+    r = ngap_send_ng_setup_response(gnb);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 }
 
 void ngap_handle_initial_ue_message(amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
-    int i;
+    int i, r;
     char bufOGS_ADDRSTRLEN;
 
     ran_ue_t *ran_ue = NULL;
@@ -389,9 +400,10 @@
 
     if (!RAN_UE_NGAP_ID) {
         ogs_error("No RAN_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, NULL, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, NULL, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -399,10 +411,11 @@
     if (!ran_ue) {
         ran_ue = ran_ue_add(gnb, *RAN_UE_NGAP_ID);
         if (ran_ue == NULL) {
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication(gnb, NULL, NULL,
+            r = ngap_send_error_indication(gnb, NULL, NULL,
                     NGAP_Cause_PR_misc,
-                    NGAP_CauseMisc_control_processing_overload));
+                    NGAP_CauseMisc_control_processing_overload);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -456,10 +469,12 @@
                     /* De-associate NG with NAS/EMM */
                     ran_ue_deassociate(amf_ue->ran_ue);
 
-                    ogs_assert(OGS_OK ==
-                        ngap_send_ran_ue_context_release_command(amf_ue->ran_ue,
+                    r = ngap_send_ran_ue_context_release_command(
+                            amf_ue->ran_ue,
                             NGAP_Cause_PR_nas, NGAP_CauseNas_normal_release,
-                            NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0));
+                            NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 }
                 amf_ue_associate_ran_ue(amf_ue, ran_ue);
 
@@ -480,9 +495,10 @@
 
     if (!UserLocationInformation) {
         ogs_error("No UserLocationInformation");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, &ran_ue->ran_ue_ngap_id, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, &ran_ue->ran_ue_ngap_id, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);

open5gs_2.5.5.100.a8f8.tar.xz/src/amf/ngap-path.c -> open5gs_2.5.5.101.6895.tar.xz/src/amf/ngap-path.c Changed

@@ -54,16 +54,16 @@
 
     gnb = amf_gnb_cycle(gnb);
     if (!gnb) {
-        ogs_warn("gNB has already been removed");
+        ogs_error("gNB has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
     ogs_assert(gnb->sctp.sock);
     if (gnb->sctp.sock->fd == INVALID_SOCKET) {
-        ogs_fatal("gNB SCTP socket has already been destroyed");
+        ogs_error("gNB SCTP socket has already been destroyed");
         ogs_log_hexdump(OGS_LOG_FATAL, pkbuf->data, pkbuf->len);
-        ogs_assert_if_reached();
+        ogs_pkbuf_free(pkbuf);
         return OGS_ERROR;
     }
 
@@ -83,16 +83,20 @@
 
 int ngap_send_to_ran_ue(ran_ue_t *ran_ue, ogs_pkbuf_t *pkbuf)
 {
+    int rv;
     ogs_assert(pkbuf);
 
     ran_ue = ran_ue_cycle(ran_ue);
     if (!ran_ue) {
-        ogs_warn("NG context has already been removed");
+        ogs_error("NG context has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
-    return ngap_send_to_gnb(ran_ue->gnb, pkbuf, ran_ue->gnb_ostream_id);
+    rv = ngap_send_to_gnb(ran_ue->gnb, pkbuf, ran_ue->gnb_ostream_id);
+    ogs_expect(rv == OGS_OK);
+
+    return rv;
 }
 
 int ngap_delayed_send_to_ran_ue(
@@ -117,10 +121,10 @@
 
         return OGS_OK;
     } else {
-        amf_gnb_t *gnb = NULL;
-        gnb = ran_ue->gnb;
-        ogs_assert(gnb);
-        return ngap_send_to_ran_ue(ran_ue, pkbuf);
+        int rv = ngap_send_to_ran_ue(ran_ue, pkbuf);
+        ogs_expect(rv == OGS_OK);
+
+        return rv;
     }
 }
 
@@ -149,6 +153,8 @@
 int ngap_send_to_nas(ran_ue_t *ran_ue,
         NGAP_ProcedureCode_t procedureCode, NGAP_NAS_PDU_t *nasPdu)
 {
+    int rv;
+
     ogs_nas_5gs_security_header_t *sh = NULL;
     ogs_nas_security_header_type_t security_header_type;
 
@@ -211,7 +217,6 @@
     ogs_assert(h);
     if (h->extended_protocol_discriminator ==
             OGS_NAS_EXTENDED_PROTOCOL_DISCRIMINATOR_5GMM) {
-        int rv;
         e = amf_event_new(AMF_EVENT_5GMM_MESSAGE);
         if (!e) {
             ogs_error("ngap_send_to_nas() failed");
@@ -237,7 +242,10 @@
             ogs_pkbuf_free(nasbuf);
             return OGS_ERROR;
         }
-        return ngap_send_to_5gsm(amf_ue, nasbuf);
+        rv = ngap_send_to_5gsm(amf_ue, nasbuf);
+        ogs_expect(rv == OGS_OK);
+
+        return rv;
     } else {
         ogs_error("Unknown NAS Protocol discriminator 0x%02x",
                   h->extended_protocol_discriminator);
@@ -253,7 +261,10 @@
 
     ogs_debug("NG-Setup response");
     ngap_buffer = ngap_build_ng_setup_response();
-    ogs_expect_or_return_val(ngap_buffer, OGS_ERROR);
+    if (!ngap_buffer) {
+        ogs_error("ngap_build_ng_setup_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_send_to_gnb(gnb, ngap_buffer, NGAP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -270,7 +281,10 @@
     ogs_debug("NG-Setup failure");
     ngap_buffer = ngap_build_ng_setup_failure(
             group, cause, NGAP_TimeToWait_v10s);
-    ogs_expect_or_return_val(ngap_buffer, OGS_ERROR);
+    if (!ngap_buffer) {
+        ogs_error("ngap_build_ng_setup_failure() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_send_to_gnb(gnb, ngap_buffer, NGAP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -285,7 +299,10 @@
 
     ogs_debug("RANConfigurationUpdateAcknowledge");
     ngap_buffer = ngap_build_ran_configuration_update_ack();
-    ogs_expect_or_return_val(ngap_buffer, OGS_ERROR);
+    if (!ngap_buffer) {
+        ogs_error("ngap_build_ran_configuration_update_ack() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_send_to_gnb(gnb, ngap_buffer, NGAP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -302,7 +319,10 @@
     ogs_debug("RANConfigurationUpdateFailure");
     ngap_buffer = ngap_build_ran_configuration_update_failure(
             group, cause, NGAP_TimeToWait_v10s);
-    ogs_expect_or_return_val(ngap_buffer, OGS_ERROR);
+    if (!ngap_buffer) {
+        ogs_error("ngap_build_ran_configuration_update_failure() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_send_to_gnb(gnb, ngap_buffer, NGAP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -330,7 +350,10 @@
             group, (int)cause, action, (int)duration);
 
     ngapbuf = ngap_build_ue_context_release_command(ran_ue, group, cause);
-    ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+    if (!ngapbuf) {
+        ogs_error("ngap_build_ue_context_release_command() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_delayed_send_to_ran_ue(ran_ue, ngapbuf, duration);
     ogs_expect(rv == OGS_OK);
@@ -345,21 +368,15 @@
     amf_ue_t *amf_ue, NGAP_Cause_PR group, long cause,
     uint8_t action, ogs_time_t duration)
 {
+    int rv;
     ogs_assert(amf_ue);
 
-    ran_ue_t *ran_ue = ran_ue_cycle(amf_ue->ran_ue);
-    if (ran_ue) {
-        ogs_assert(OGS_OK ==
-            ngap_send_ran_ue_context_release_command(ran_ue,
-                group, cause, action, duration));
-        ogs_debug("    SUPI%s", amf_ue->supi);
-    } else {
-        ogs_error("%s No NG Context - "
-                "Group%d Cause%d Action%d Duration%d",
-                amf_ue->supi, group, (int)cause, action, (int)duration);
-    }
+    rv = ngap_send_ran_ue_context_release_command(
+            amf_ue->ran_ue, group, cause, action, duration);
+    ogs_expect(rv == OGS_OK);
+    ogs_debug("    SUPI%s", amf_ue->supi);
 
-    return OGS_OK;
+    return rv;
 }
 
 int ngap_send_paging(amf_ue_t *amf_ue)
@@ -383,14 +400,23 @@
                         ngapbuf = amf_ue->t3513.pkbuf;
                     } else {
                         ngapbuf = ngap_build_paging(amf_ue);
-                        ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+                        if (!ngapbuf) {
+                            ogs_error("ngap_build_paging() failed");
+                            return OGS_ERROR;
+                        }
                     }
 
                     amf_ue->t3513.pkbuf = ogs_pkbuf_copy(ngapbuf);
-                    ogs_expect_or_return_val(amf_ue->t3513.pkbuf, OGS_ERROR);
+                    if (!amf_ue->t3513.pkbuf) {
+                        ogs_error("ogs_pkbuf_copy() failed");
+                        return OGS_ERROR;
+                    }
 
                     rv = ngap_send_to_gnb(gnb, ngapbuf, NGAP_NON_UE_SIGNALLING);
-                    ogs_expect_or_return_val(rv == OGS_OK, rv);
+                    if (rv != OGS_OK) {
+                        ogs_error("ngap_send_to_gnb() failed");
+                        return rv;

open5gs_2.5.5.100.a8f8.tar.xz/src/amf/ngap-path.h -> open5gs_2.5.5.101.6895.tar.xz/src/amf/ngap-path.h Changed

open5gs_2.5.5.100.a8f8.tar.xz/src/amf/ngap-sm.c -> open5gs_2.5.5.101.6895.tar.xz/src/amf/ngap-sm.c Changed

open5gs_2.5.5.100.a8f8.tar.xz/src/amf/nnrf-handler.c -> open5gs_2.5.5.101.6895.tar.xz/src/amf/nnrf-handler.c Changed

@@ -25,6 +25,8 @@
 void amf_nnrf_handle_nf_discover(
         ogs_sbi_xact_t *xact, ogs_sbi_message_t *recvmsg)
 {
+    int r;
+
     ogs_sbi_nf_instance_t *nf_instance = NULL;
     ogs_sbi_object_t *sbi_object = NULL;
     ogs_sbi_service_type_e service_type = OGS_SBI_SERVICE_TYPE_NULL;
@@ -68,9 +70,10 @@
             ogs_assert(amf_ue);
             ogs_error("%s (NF discover) No %s", amf_ue->suci,
                         ogs_sbi_service_type_to_name(service_type));
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_gmm_reject_from_sbi(amf_ue,
-                    OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT));
+            r = nas_5gs_send_gmm_reject_from_sbi(amf_ue,
+                    OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             break;
         case OGS_SBI_OBJ_SESS_TYPE:
             sess = (amf_sess_t *)sbi_object;
@@ -82,15 +85,17 @@
             ogs_error("%d:%d (NF discover) No %s", sess->psi, sess->pti,
                         ogs_sbi_service_type_to_name(service_type));
             if (sess->payload_container_type) {
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_back_gsm_message(sess,
+                r = nas_5gs_send_back_gsm_message(sess,
                         OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                        AMF_NAS_BACKOFF_TIME));
+                        AMF_NAS_BACKOFF_TIME);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             } else {
-                ogs_assert(OGS_OK ==
-                    ngap_send_error_indication2(amf_ue,
+                r = ngap_send_error_indication2(amf_ue,
                         NGAP_Cause_PR_transport,
-                        NGAP_CauseTransport_transport_resource_unavailable));
+                        NGAP_CauseTransport_transport_resource_unavailable);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
         default:

open5gs_2.5.5.100.a8f8.tar.xz/src/amf/nnssf-handler.c -> open5gs_2.5.5.101.6895.tar.xz/src/amf/nnssf-handler.c Changed

@@ -25,6 +25,7 @@
         amf_sess_t *sess, ogs_sbi_message_t *recvmsg)
 {
     bool rc;
+    int r;
     OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
     ogs_sbi_client_t *client = NULL, *scp_client = NULL;
     ogs_sockaddr_t *addr = NULL;
@@ -44,34 +45,38 @@
     if (recvmsg->res_status != OGS_SBI_HTTP_STATUS_OK) {
         ogs_error("%s HTTP response error %d",
                 amf_ue->supi, recvmsg->res_status);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_status(amf_ue, recvmsg->res_status));
+        r = nas_5gs_send_gmm_status(amf_ue, recvmsg->res_status);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     AuthorizedNetworkSliceInfo = recvmsg->AuthorizedNetworkSliceInfo;
     if (!AuthorizedNetworkSliceInfo) {
         ogs_error("No AuthorizedNetworkSliceInfo");
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     NsiInformation = AuthorizedNetworkSliceInfo->nsi_information;
     if (!NsiInformation) {
         ogs_error("No NsiInformation");
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     if (!NsiInformation->nrf_id) {
         ogs_error("No nrfId");
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -97,9 +102,10 @@
         if (rc == false || scheme == OpenAPI_uri_scheme_NULL) {
             ogs_error("%s:%d Invalid URI %s",
                     amf_ue->supi, sess->psi, NsiInformation->nrf_id);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_gmm_reject_from_sbi(
-                    amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+            r = nas_5gs_send_gmm_reject_from_sbi(
+                    amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return OGS_ERROR;;
         }

open5gs_2.5.5.100.a8f8.tar.xz/src/amf/npcf-handler.c -> open5gs_2.5.5.101.6895.tar.xz/src/amf/npcf-handler.c Changed

@@ -25,7 +25,7 @@
 int amf_npcf_am_policy_control_handle_create(
         amf_ue_t *amf_ue, ogs_sbi_message_t *recvmsg)
 {
-    int rv;
+    int r, rv;
 
     uint64_t supported_features;
 
@@ -38,33 +38,37 @@
     if (recvmsg->res_status != OGS_SBI_HTTP_STATUS_CREATED) {
         ogs_error("%s HTTP response error %d",
                 amf_ue->supi, recvmsg->res_status);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(amf_ue, recvmsg->res_status));
+        r = nas_5gs_send_gmm_reject_from_sbi(amf_ue, recvmsg->res_status);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     if (!recvmsg->http.location) {
         ogs_error("%s No http.location", amf_ue->supi);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     PolicyAssociation = recvmsg->PolicyAssociation;
     if (!PolicyAssociation) {
         ogs_error("No PolicyAssociation");
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     if (!PolicyAssociation->supp_feat) {
         ogs_error("No suppFeat");
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -75,9 +79,10 @@
     if (rv != OGS_OK) {
         ogs_error("%s Cannot parse http.location %s",
                 amf_ue->supi, recvmsg->http.location);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -86,9 +91,10 @@
                 amf_ue->supi, recvmsg->http.location);
 
         ogs_sbi_header_free(&header);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }

open5gs_2.5.5.100.a8f8.tar.xz/src/amf/nsmf-handler.c -> open5gs_2.5.5.101.6895.tar.xz/src/amf/nsmf-handler.c Changed

@@ -27,7 +27,7 @@
 int amf_nsmf_pdusession_handle_create_sm_context(
         amf_sess_t *sess, ogs_sbi_message_t *recvmsg)
 {
-    int rv;
+    int rv, r;
 
     ogs_assert(sess);
     ogs_assert(recvmsg);
@@ -38,10 +38,11 @@
 
         if (!recvmsg->http.location) {
             ogs_error("%d:%d No http.location", sess->psi, sess->pti);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_back_gsm_message(sess,
+            r = nas_5gs_send_back_gsm_message(sess,
                     OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                    AMF_NAS_BACKOFF_TIME));
+                    AMF_NAS_BACKOFF_TIME);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             return OGS_ERROR;
         }
@@ -53,10 +54,11 @@
         if (rv != OGS_OK) {
             ogs_error("%d:%d Cannot parse http.location %s",
                     sess->psi, sess->pti, recvmsg->http.location);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_back_gsm_message(sess,
+            r = nas_5gs_send_back_gsm_message(sess,
                     OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                    AMF_NAS_BACKOFF_TIME));
+                    AMF_NAS_BACKOFF_TIME);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             return OGS_ERROR;
         }
@@ -66,10 +68,11 @@
                     sess->psi, sess->pti, recvmsg->http.location);
 
             ogs_sbi_header_free(&header);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_back_gsm_message(sess,
+            r = nas_5gs_send_back_gsm_message(sess,
                     OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                    AMF_NAS_BACKOFF_TIME));
+                    AMF_NAS_BACKOFF_TIME);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             return OGS_ERROR;
         }
@@ -86,7 +89,7 @@
             amf_ue_t *amf_ue = sess->amf_ue;
             ogs_assert(amf_ue);
 
-            rv = nas_5gs_send_to_gnb(amf_ue,
+            r = nas_5gs_send_to_gnb(amf_ue,
                     sess->pdu_session_establishment_accept);
 
             sess->pdu_session_establishment_accept = NULL;
@@ -96,10 +99,11 @@
                         sess->psi, sess->pti);
 
                 ogs_sbi_header_free(&header);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_back_gsm_message(sess,
+                r = nas_5gs_send_back_gsm_message(sess,
                         OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                        AMF_NAS_BACKOFF_TIME));
+                        AMF_NAS_BACKOFF_TIME);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
                 return OGS_ERROR;
             }
@@ -120,19 +124,21 @@
         SmContextCreateError = recvmsg->SmContextCreateError;
         if (!SmContextCreateError) {
             ogs_error("%d:%d No SmContextCreateError", sess->psi, sess->pti);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_back_gsm_message(sess,
+            r = nas_5gs_send_back_gsm_message(sess,
                     OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                    AMF_NAS_BACKOFF_TIME));
+                    AMF_NAS_BACKOFF_TIME);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             return OGS_ERROR;
         }
         if (!SmContextCreateError->error) {
             ogs_error("%d:%d No Error", sess->psi, sess->pti);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_back_gsm_message(sess,
+            r = nas_5gs_send_back_gsm_message(sess,
                     OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                    AMF_NAS_BACKOFF_TIME));
+                    AMF_NAS_BACKOFF_TIME);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             return OGS_ERROR;
         }
@@ -150,19 +156,21 @@
                         sess->psi, sess->pti);
                 n1smbuf = ogs_pkbuf_copy(n1smbuf);
                 ogs_assert(n1smbuf);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_gsm_reject(sess,
-                        OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION, n1smbuf));
+                r = nas_5gs_send_gsm_reject(sess,
+                        OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION, n1smbuf);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
                 return OGS_ERROR;
             }
         }
 
         ogs_error("%d:%d 5GMM was not forwarded", sess->psi, sess->pti);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_back_gsm_message(sess,
+        r = nas_5gs_send_back_gsm_message(sess,
                 OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                AMF_NAS_BACKOFF_TIME));
+                AMF_NAS_BACKOFF_TIME);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         return OGS_ERROR;
     }
@@ -173,6 +181,8 @@
 int amf_nsmf_pdusession_handle_update_sm_context(
         amf_sess_t *sess, int state, ogs_sbi_message_t *recvmsg)
 {
+    int r;
+
     amf_ue_t *amf_ue = NULL;
     ran_ue_t *ran_ue = NULL;
 
@@ -239,8 +249,9 @@
                                     amf_ue, 0, NULL));
                         } else {
                             CLEAR_AMF_UE_TIMER(amf_ue->t3550);
-                            ogs_assert(OGS_OK ==
-                                nas_5gs_send_registration_accept(amf_ue));
+                            r = nas_5gs_send_registration_accept(amf_ue);
+                            ogs_expect(r == OGS_OK);
+                            ogs_assert(r != OGS_ERROR);
 
                             AMF_UE_CLEAR_N2_TRANSFER(
                                     amf_ue, pdu_session_resource_setup_request);
@@ -255,8 +266,9 @@
                                 AMF_RELEASE_SM_CONTEXT_SERVICE_ACCEPT) &&
                         AMF_SESSION_SYNC_DONE(amf_ue,
                                 AMF_UPDATE_SM_CONTEXT_SERVICE_REQUEST)) {
-                        ogs_assert(OGS_OK ==
-                            nas_5gs_send_service_accept(amf_ue));
+                        r = nas_5gs_send_service_accept(amf_ue);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
 
                         AMF_UE_CLEAR_N2_TRANSFER(
                                 amf_ue, pdu_session_resource_setup_request);
@@ -267,8 +279,9 @@
 
                     if (AMF_SESSION_SYNC_DONE(amf_ue,
                                 AMF_UPDATE_SM_CONTEXT_HANDOVER_REQUIRED)) {
-                        ogs_assert(OGS_OK ==
-                            ngap_send_handover_request(amf_ue));
+                        r = ngap_send_handover_request(amf_ue);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
 
                         AMF_UE_CLEAR_N2_TRANSFER(amf_ue, handover_request);
                     }
@@ -282,10 +295,11 @@
                 if (!n1smbuf) {
                     ogs_error("%s:%d No N1 SM Content %s",
                             amf_ue->supi, sess->psi, n1SmMsg->content_id);
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_back_gsm_message(sess,
+                    r = nas_5gs_send_back_gsm_message(sess,
                             OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                            AMF_NAS_BACKOFF_TIME));
+                            AMF_NAS_BACKOFF_TIME);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
 
                     return OGS_ERROR;
                 }
@@ -293,10 +307,11 @@
                 if (!n2smbuf) {
                     ogs_error("%s:%d No N2 SM Content",
                             amf_ue->supi, sess->psi);
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_back_gsm_message(sess,

open5gs_2.5.5.100.a8f8.tar.xz/src/amf/nudm-handler.c -> open5gs_2.5.5.101.6895.tar.xz/src/amf/nudm-handler.c Changed

@@ -25,7 +25,7 @@
 int amf_nudm_sdm_handle_provisioned(
         amf_ue_t *amf_ue, int state, ogs_sbi_message_t *recvmsg)
 {
-    int i;
+    int i, r;
 
     ogs_assert(amf_ue);
     ogs_assert(recvmsg);
@@ -259,9 +259,10 @@
 
         if (!recvmsg->http.location) {
             ogs_error("%s No http.location", amf_ue->supi);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_gmm_reject_from_sbi(
-                    amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+            r = nas_5gs_send_gmm_reject_from_sbi(
+                    amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return OGS_ERROR;
         }
 
@@ -272,9 +273,10 @@
         if (rv != OGS_OK) {
             ogs_error("%s Cannot parse http.location %s",
                 amf_ue->supi, recvmsg->http.location);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_gmm_reject_from_sbi(
-                    amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+            r = nas_5gs_send_gmm_reject_from_sbi(
+                    amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return OGS_ERROR;
         }
 
@@ -283,9 +285,10 @@
                 amf_ue->supi, recvmsg->http.location);
 
             ogs_sbi_header_free(&header);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_gmm_reject_from_sbi(
-                    amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+            r = nas_5gs_send_gmm_reject_from_sbi(
+                    amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return OGS_ERROR;
         }

open5gs_2.5.5.100.a8f8.tar.xz/src/amf/sbi-path.c -> open5gs_2.5.5.101.6895.tar.xz/src/amf/sbi-path.c Changed

@@ -92,6 +92,7 @@
         ogs_sbi_request_t *(*build)(amf_ue_t *amf_ue, void *data),
         amf_ue_t *amf_ue, int state, void *data)
 {
+    int r;
     ogs_sbi_xact_t *xact = NULL;
 
     ogs_assert(service_type);
@@ -103,9 +104,10 @@
             (ogs_sbi_build_f)build, amf_ue, data);
     if (!xact) {
         ogs_error("amf_ue_sbi_discover_and_send() failed");
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return false;
     }
 
@@ -114,9 +116,10 @@
     if (ogs_sbi_discover_and_send(xact) != true) {
         ogs_error("amf_ue_sbi_discover_and_send() failed");
         ogs_sbi_xact_remove(xact);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return false;
     }
 
@@ -129,6 +132,7 @@
         ogs_sbi_request_t *(*build)(amf_sess_t *sess, void *data),
         amf_sess_t *sess, int state, void *data)
 {
+    int r;
     ogs_sbi_xact_t *xact = NULL;
 
     ogs_assert(service_type);
@@ -140,8 +144,10 @@
             (ogs_sbi_build_f)build, sess, data);
     if (!xact) {
         ogs_error("amf_sess_sbi_discover_and_send() failed");
-        ogs_assert(OGS_OK == nas_5gs_send_back_gsm_message(sess,
-            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME));
+        r = nas_5gs_send_back_gsm_message(sess,
+            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return false;
     }
 
@@ -150,8 +156,10 @@
     if (ogs_sbi_discover_and_send(xact) != true) {
         ogs_error("amf_sess_sbi_discover_and_send() failed");
         ogs_sbi_xact_remove(xact);
-        ogs_assert(OGS_OK == nas_5gs_send_back_gsm_message(sess,
-            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME));
+        r = nas_5gs_send_back_gsm_message(sess,
+            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return false;
     }
 
@@ -160,7 +168,7 @@
 static int client_discover_cb(
         int status, ogs_sbi_response_t *response, void *data)
 {
-    int rv;
+    int r, rv;
     ogs_sbi_message_t message;
 
     ogs_sbi_xact_t *xact = NULL;
@@ -216,24 +224,30 @@
     rv = ogs_sbi_parse_response(&message, response);
     if (rv != OGS_OK) {
         ogs_error("cannot parse HTTP response");
-        ogs_assert(OGS_OK == nas_5gs_send_back_gsm_message(sess,
-            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME));
+        r = nas_5gs_send_back_gsm_message(sess,
+            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         goto cleanup;
     }
 
     if (message.res_status != OGS_SBI_HTTP_STATUS_OK) {
         ogs_error("NF-Discover failed %d", message.res_status);
-        ogs_assert(OGS_OK == nas_5gs_send_back_gsm_message(sess,
-            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME));
+        r = nas_5gs_send_back_gsm_message(sess,
+            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         goto cleanup;
     }
 
     if (!message.SearchResult) {
         ogs_error("No SearchResult");
-        ogs_assert(OGS_OK == nas_5gs_send_back_gsm_message(sess,
-            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME));
+        r = nas_5gs_send_back_gsm_message(sess,
+            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         goto cleanup;
     }
@@ -247,10 +261,11 @@
         ogs_error("%s:%d (NF discover) No %s",
                     amf_ue->supi, sess->psi,
                     ogs_sbi_service_type_to_name(service_type));
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_back_gsm_message(sess,
+        r = nas_5gs_send_back_gsm_message(sess,
                 OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                AMF_NAS_BACKOFF_TIME));
+                AMF_NAS_BACKOFF_TIME);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         goto cleanup;
     }
@@ -294,11 +309,18 @@
 
     xact = ogs_sbi_xact_add(
             &sess->sbi, service_type, discovery_option, NULL, NULL, NULL);
-    ogs_expect_or_return_val(xact, false);
+    if (!xact) {
+        ogs_error("ogs_sbi_xact_add() failed");
+        return false;
+    }
 
     xact->request = amf_nnrf_disc_build_discover(
                 sess->nssf.nrf.id, xact->service_type, xact->discovery_option);
-    ogs_expect_or_return_val(xact->request, false);
+    if (!xact->request) {
+        ogs_error("amf_nnrf_disc_build_discover() failed");
+        ogs_sbi_xact_remove(xact);
+        return false;
+    }
 
     return ogs_sbi_client_send_request(
             client, client_discover_cb, xact->request, xact);
@@ -460,7 +482,10 @@
     ogs_assert(client);
 
     request = amf_nsmf_callback_build_n1_n2_failure_notify(sess, cause);
-    ogs_expect_or_return_val(request, false);
+    if (!request) {
+        ogs_error("amf_nsmf_callback_build_n1_n2_failure_notify() failed");
+        return false;
+    }
 
     rc = ogs_sbi_send_request_to_client(
             client, client_notify_cb, request, NULL);

open5gs_2.5.5.100.a8f8.tar.xz/src/mme/emm-handler.c -> open5gs_2.5.5.101.6895.tar.xz/src/mme/emm-handler.c Changed

@@ -35,6 +35,7 @@
 int emm_handle_attach_request(mme_ue_t *mme_ue,
         ogs_nas_eps_attach_request_t *attach_request, ogs_pkbuf_t *pkbuf)
 {
+    int r;
     int served_tai_index = 0;
 
     ogs_nas_eps_mobile_identity_guti_t *eps_mobile_identity_guti = NULL;
@@ -129,10 +130,11 @@
         /* Send Attach Reject */
         ogs_warn("Cannot find Served TAIPLMN_ID:%06x,TAC:%d",
             ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id), mme_ue->tai.tac);
-        ogs_assert(OGS_OK ==
-            nas_eps_send_attach_reject(mme_ue,
+        r = nas_eps_send_attach_reject(mme_ue,
                 OGS_NAS_EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED,
-                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
     ogs_debug("    SERVED_TAI_INDEX%d", served_tai_index);
@@ -172,10 +174,11 @@
             "but Integrity0x%x cannot be bypassed with EIA0",
             mme_selected_enc_algorithm(mme_ue), 
             mme_selected_int_algorithm(mme_ue));
-        ogs_assert(OGS_OK ==
-            nas_eps_send_attach_reject(mme_ue,
+        r = nas_eps_send_attach_reject(mme_ue,
                 OGS_NAS_EMM_CAUSE_UE_SECURITY_CAPABILITIES_MISMATCH,
-                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -222,7 +225,7 @@
 int emm_handle_attach_complete(
     mme_ue_t *mme_ue, ogs_nas_eps_attach_complete_t *attach_complete)
 {
-    int rv;
+    int r, rv;
     ogs_pkbuf_t *emmbuf = NULL;
 
     ogs_nas_eps_message_t message;
@@ -315,15 +318,19 @@
     network_daylight_saving_time->length = 1;
 
     emmbuf = nas_eps_security_encode(mme_ue, &message);
-    ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+    if (!emmbuf) {
+        ogs_error("nas_eps_security_encode() failed");
+        return OGS_ERROR;
+    }
 
-    rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    r = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 
     ogs_debug("EMM information");
     ogs_debug("    IMSI%s", mme_ue->imsi_bcd);
 
-    return rv;
+    return r;
 }
 
 int emm_handle_identity_response(
@@ -487,6 +494,7 @@
 int emm_handle_tau_request(mme_ue_t *mme_ue,
     ogs_nas_eps_tracking_area_update_request_t *tau_request, ogs_pkbuf_t *pkbuf)
 {
+    int r;
     int served_tai_index = 0;
 
     ogs_nas_eps_mobile_identity_guti_t *eps_mobile_identity_guti = NULL;
@@ -560,9 +568,10 @@
         /* Send TAU reject */
         ogs_warn("Cannot find Served TAIPLMN_ID:%06x,TAC:%d",
             ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id), mme_ue->tai.tac);
-        ogs_assert(OGS_OK ==
-            nas_eps_send_tau_reject(
-                mme_ue, OGS_NAS_EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED));
+        r = nas_eps_send_tau_reject(
+                mme_ue, OGS_NAS_EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
     ogs_debug("    SERVED_TAI_INDEX%d", served_tai_index);
@@ -625,6 +634,7 @@
 int emm_handle_extended_service_request(mme_ue_t *mme_ue,
         ogs_nas_eps_extended_service_request_t *extended_service_request)
 {
+    int r;
     int served_tai_index = 0;
 
     ogs_nas_service_type_t *service_type =
@@ -678,9 +688,10 @@
         /* Send TAU reject */
         ogs_warn("Cannot find Served TAIPLMN_ID:%06x,TAC:%d",
             ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id), mme_ue->tai.tac);
-        ogs_assert(OGS_OK ==
-            nas_eps_send_tau_reject(
-                mme_ue, OGS_NAS_EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED));
+        r = nas_eps_send_tau_reject(
+                mme_ue, OGS_NAS_EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
     ogs_debug("    SERVED_TAI_INDEX%d", served_tai_index);

open5gs_2.5.5.100.a8f8.tar.xz/src/mme/emm-sm.c -> open5gs_2.5.5.101.6895.tar.xz/src/mme/emm-sm.c Changed

@@ -56,7 +56,7 @@
 
 void emm_state_de_registered(ogs_fsm_t *s, mme_event_t *e)
 {
-    int rv;
+    int r;
     mme_ue_t *mme_ue = NULL;
 
     ogs_assert(e);
@@ -85,14 +85,10 @@
                         "Stop retransmission");
                 OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
             } else {
-                ogs_assert(mme_ue->t3470.pkbuf);
-                rv = nas_eps_send_identity_request(mme_ue);
-                if (rv == OGS_OK) {
-                    mme_ue->t3470.retry_count++;
-                } else {
-                    ogs_error("nas_eps_send_identity_request() failed");
-                    OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
-                }
+                mme_ue->t3470.retry_count++;
+                r = nas_eps_send_identity_request(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -109,7 +105,7 @@
 
 void emm_state_registered(ogs_fsm_t *s, mme_event_t *e)
 {
-    int rv;
+    int r;
     mme_ue_t *mme_ue = NULL;
 
     ogs_assert(e);
@@ -146,7 +142,9 @@
                  * We don't have to set CNDomain.
                  * So, we just set CNDomain to 0
                  */
-                ogs_assert(OGS_OK == s1ap_send_paging(mme_ue, 0));
+                r = s1ap_send_paging(mme_ue, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -157,14 +155,10 @@
                         "Stop retransmission");
                 OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
             } else {
-                ogs_assert(mme_ue->t3470.pkbuf);
-                rv = nas_eps_send_identity_request(mme_ue);
-                if (rv == OGS_OK) {
-                    mme_ue->t3470.retry_count++;
-                } else {
-                    ogs_error("nas_eps_send_identity_request() failed");
-                    OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
-                }
+                mme_ue->t3470.retry_count++;
+                r = nas_eps_send_identity_request(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -175,14 +169,10 @@
                         "Stop retransmission");
                 OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
             } else {
-                ogs_assert(mme_ue->t3422.pkbuf);
-                rv = nas_eps_send_detach_request(mme_ue);
-                if (rv == OGS_OK) {
-                    mme_ue->t3422.retry_count++;
-                } else {
-                    ogs_error("nas_eps_send_detach_request() failed");
-                    OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
-                }
+                mme_ue->t3422.retry_count++;
+                r = nas_eps_send_detach_request(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -199,7 +189,7 @@
 
 static void common_register_state(ogs_fsm_t *s, mme_event_t *e)
 {
-    int rv;
+    int r, rv;
 
     mme_ue_t *mme_ue = NULL;
     enb_ue_t *enb_ue = NULL;
@@ -234,42 +224,47 @@
 
             if (!MME_UE_HAVE_IMSI(mme_ue)) {
                 ogs_info("Service request : Unknown UE");
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_service_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                r = nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &emm_state_exception);
                 break;
             }
 
             if (!SECURITY_CONTEXT_IS_VALID(mme_ue)) {
                 ogs_warn("No Security Context : IMSI%s", mme_ue->imsi_bcd);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_service_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                r = nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &emm_state_exception);
                 break;
             }
 
             if (!SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
                 ogs_warn("No Session Context : IMSI%s", mme_ue->imsi_bcd);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_service_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                r = nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &emm_state_exception);
                 break;
             }
 
             if (!ACTIVE_EPS_BEARERS_IS_AVAIABLE(mme_ue)) {
                 ogs_warn("No active EPS bearers : IMSI%s", mme_ue->imsi_bcd);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_service_reject(mme_ue,
-                        OGS_NAS_EMM_CAUSE_NO_EPS_BEARER_CONTEXT_ACTIVATED));
+                r = nas_eps_send_service_reject(mme_ue,
+                        OGS_NAS_EMM_CAUSE_NO_EPS_BEARER_CONTEXT_ACTIVATED);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &emm_state_exception);
                 break;
             }
 
-            ogs_assert(OGS_OK ==
-                s1ap_send_initial_context_setup_request(mme_ue));
+            r = s1ap_send_initial_context_setup_request(mme_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             OGS_FSM_TRAN(s, &emm_state_registered);
             break;
         }
@@ -314,8 +309,9 @@
 
             if (!MME_UE_HAVE_IMSI(mme_ue)) {
                 CLEAR_MME_UE_TIMER(mme_ue->t3470);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_identity_request(mme_ue));
+                r = nas_eps_send_identity_request(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 break;
             }
 
@@ -328,10 +324,11 @@
                             &mme_ue->pdn_connectivity_request);
                     if (rv != OGS_OK) {
                         ogs_error("nas_eps_send_emm_to_esm() failed");
-                        ogs_assert(OGS_OK ==
-                            nas_eps_send_attach_reject(mme_ue,
+                        r = nas_eps_send_attach_reject(mme_ue,
                                 OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED,
-                                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
                         OGS_FSM_TRAN(s, &emm_state_exception);
                         break;
                     }
@@ -360,27 +357,30 @@
 
             if (!MME_UE_HAVE_IMSI(mme_ue)) {
                 ogs_info("TAU request : Unknown UE");
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_tau_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                r = nas_eps_send_tau_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &emm_state_exception);
                 break;
             }
 
             if (!SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {

open5gs_2.5.5.100.a8f8.tar.xz/src/mme/esm-handler.c -> open5gs_2.5.5.101.6895.tar.xz/src/mme/esm-handler.c Changed

@@ -31,6 +31,7 @@
 int esm_handle_pdn_connectivity_request(mme_bearer_t *bearer, 
         ogs_nas_eps_pdn_connectivity_request_t *req, int create_action)
 {
+    int r;
     mme_ue_t *mme_ue = NULL;
     mme_sess_t *sess = NULL;
     uint8_t security_protected_required = 0;
@@ -65,9 +66,11 @@
                             mme_ue, req->access_point_name.apn);
         if (!sess->session) {
             /* Invalid APN */
-            ogs_assert(OGS_OK ==
-                nas_eps_send_pdn_connectivity_reject(
-                    sess, OGS_NAS_ESM_CAUSE_MISSING_OR_UNKNOWN_APN, create_action));
+            r = nas_eps_send_pdn_connectivity_reject(
+                    sess, OGS_NAS_ESM_CAUSE_MISSING_OR_UNKNOWN_APN,
+                    create_action);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             ogs_warn("Invalid APN%s", req->access_point_name.apn);
             return OGS_ERROR;
         }
@@ -80,9 +83,11 @@
             if (derived_pdn_type == 0) {
                 ogs_error("Cannot derived PDN Type UE:%d,HSS:%d",
                     sess->request_type.type, sess->session->session_type);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_pdn_connectivity_reject(
-                        sess, OGS_NAS_ESM_CAUSE_UNKNOWN_PDN_TYPE, create_action));
+                r = nas_eps_send_pdn_connectivity_reject(
+                        sess, OGS_NAS_ESM_CAUSE_UNKNOWN_PDN_TYPE,
+                        create_action);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return OGS_ERROR;
             }
         } else {
@@ -102,7 +107,9 @@
 
     if (security_protected_required) {
         CLEAR_BEARER_TIMER(bearer->t3489);
-        ogs_assert(OGS_OK == nas_eps_send_esm_information_request(bearer));
+        r = nas_eps_send_esm_information_request(bearer);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         return OGS_OK;
     }
@@ -137,9 +144,10 @@
             mme_gtp_send_create_session_request(sess, create_action));
     } else {
         ogs_error("No APN");
-        ogs_assert(OGS_OK ==
-            nas_eps_send_pdn_connectivity_reject(
-                sess, OGS_NAS_ESM_CAUSE_MISSING_OR_UNKNOWN_APN, create_action));
+        r = nas_eps_send_pdn_connectivity_reject(
+                sess, OGS_NAS_ESM_CAUSE_MISSING_OR_UNKNOWN_APN, create_action);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -149,6 +157,7 @@
 int esm_handle_information_response(mme_sess_t *sess, 
         ogs_nas_eps_esm_information_response_t *rsp)
 {
+    int r;
     mme_ue_t *mme_ue = NULL;
 
     ogs_assert(sess);
@@ -183,10 +192,11 @@
             if (derived_pdn_type == 0) {
                 ogs_error("Cannot derived PDN Type UE:%d,HSS:%d",
                     sess->request_type.type, sess->session->session_type);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_pdn_connectivity_reject(
+                r = nas_eps_send_pdn_connectivity_reject(
                         sess, OGS_NAS_ESM_CAUSE_UNKNOWN_PDN_TYPE,
-                        OGS_GTP_CREATE_IN_ATTACH_REQUEST));
+                        OGS_GTP_CREATE_IN_ATTACH_REQUEST);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return OGS_ERROR;
             }
         } else {
@@ -203,8 +213,9 @@
                 ogs_assert(OGS_OK ==
                     sgsap_send_location_update_request(mme_ue));
             } else {
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_attach_accept(mme_ue));
+                r = nas_eps_send_attach_accept(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
         } else {
             ogs_assert(OGS_OK ==
@@ -217,10 +228,11 @@
         else
             ogs_error("No APN");
 
-        ogs_assert(OGS_OK ==
-            nas_eps_send_pdn_connectivity_reject(
+        r = nas_eps_send_pdn_connectivity_reject(
                 sess, OGS_NAS_ESM_CAUSE_MISSING_OR_UNKNOWN_APN,
-                OGS_GTP_CREATE_IN_ATTACH_REQUEST));
+                OGS_GTP_CREATE_IN_ATTACH_REQUEST);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -230,6 +242,7 @@
 int esm_handle_bearer_resource_allocation_request(
         mme_bearer_t *bearer, ogs_nas_eps_message_t *message)
 {
+    int r;
     mme_ue_t *mme_ue = NULL;
     mme_sess_t *sess = NULL;
 
@@ -239,9 +252,10 @@
     mme_ue = sess->mme_ue;
     ogs_assert(mme_ue);
 
-    ogs_assert(OGS_OK ==
-        nas_eps_send_bearer_resource_allocation_reject(
-            mme_ue, sess->pti, OGS_NAS_ESM_CAUSE_NETWORK_FAILURE));
+    r = nas_eps_send_bearer_resource_allocation_reject(
+            mme_ue, sess->pti, OGS_NAS_ESM_CAUSE_NETWORK_FAILURE);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 
     return OGS_OK;
 }

open5gs_2.5.5.100.a8f8.tar.xz/src/mme/esm-sm.c -> open5gs_2.5.5.101.6895.tar.xz/src/mme/esm-sm.c Changed

@@ -68,7 +68,7 @@
 
 void esm_state_inactive(ogs_fsm_t *s, mme_event_t *e)
 {
-    int rv;
+    int r, rv;
     mme_ue_t *mme_ue = NULL;
     mme_sess_t *sess = NULL;
     mme_bearer_t *bearer = NULL;
@@ -122,8 +122,9 @@
                     mme_gtp_send_delete_session_request(mme_ue->sgw_ue, sess,
                     OGS_GTP_DELETE_SEND_DEACTIVATE_BEARER_CONTEXT_REQUEST));
             } else {
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_deactivate_bearer_context_request(bearer));
+                r = nas_eps_send_deactivate_bearer_context_request(bearer);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             OGS_FSM_TRAN(s, esm_state_pdn_will_disconnect);
             break;
@@ -137,30 +138,34 @@
             h.type = e->nas_type;
             if (h.integrity_protected == 0) {
                 ogs_error("%s No Integrity Protected", mme_ue->imsi_bcd);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_attach_reject(mme_ue,
+                r = nas_eps_send_attach_reject(mme_ue,
                         OGS_NAS_EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED,
-                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 ogs_assert(mme_ue->enb_ue);
-                ogs_assert(OGS_OK ==
-                    s1ap_send_ue_context_release_command(mme_ue->enb_ue,
+                r = s1ap_send_ue_context_release_command(mme_ue->enb_ue,
                         S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
+                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &esm_state_exception);
                 break;
             }
 
             if (!SECURITY_CONTEXT_IS_VALID(mme_ue)) {
                 ogs_warn("%s No Security Context", mme_ue->imsi_bcd);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_attach_reject(mme_ue,
+                r = nas_eps_send_attach_reject(mme_ue,
                         OGS_NAS_EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED,
-                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 ogs_assert(mme_ue->enb_ue);
-                ogs_assert(OGS_OK ==
-                    s1ap_send_ue_context_release_command(mme_ue->enb_ue,
+                r = s1ap_send_ue_context_release_command(mme_ue->enb_ue,
                         S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
+                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &esm_state_exception);
                 break;
             }
@@ -230,18 +235,16 @@
                         "Stop retransmission", mme_ue->imsi_bcd);
                 OGS_FSM_TRAN(&bearer->sm, &esm_state_exception);
 
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_pdn_connectivity_reject(sess,
+                r = nas_eps_send_pdn_connectivity_reject(sess,
                         OGS_NAS_ESM_CAUSE_ESM_INFORMATION_NOT_RECEIVED,
-                        e->create_action));
+                        e->create_action);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             } else {
-                rv = nas_eps_send_esm_information_request(bearer);
-                if (rv == OGS_OK) {
-                    bearer->t3489.retry_count++;
-                } else {
-                    ogs_error("nas_eps_send_esm_information_request() failed");
-                    OGS_FSM_TRAN(&bearer->sm, &esm_state_exception);
-                }
+                bearer->t3489.retry_count++;
+                r = nas_eps_send_esm_information_request(bearer);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
         default:
@@ -258,7 +261,7 @@
 
 void esm_state_active(ogs_fsm_t *s, mme_event_t *e)
 {
-    int rv;
+    int r, rv;
     mme_ue_t *mme_ue = NULL;
     mme_sess_t *sess = NULL;
     mme_bearer_t *bearer = NULL;
@@ -309,8 +312,9 @@
                     mme_gtp_send_delete_session_request(mme_ue->sgw_ue, sess,
                     OGS_GTP_DELETE_SEND_DEACTIVATE_BEARER_CONTEXT_REQUEST));
             } else {
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_deactivate_bearer_context_request(bearer));
+                r = nas_eps_send_deactivate_bearer_context_request(bearer);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             OGS_FSM_TRAN(s, esm_state_pdn_will_disconnect);
             break;

open5gs_2.5.5.100.a8f8.tar.xz/src/mme/mme-context.c -> open5gs_2.5.5.101.6895.tar.xz/src/mme/mme-context.c Changed

@@ -3223,6 +3223,7 @@
 mme_bearer_t *mme_bearer_find_or_add_by_message(
         mme_ue_t *mme_ue, ogs_nas_eps_message_t *message, int create_action)
 {
+    int r;
     uint8_t pti = OGS_NAS_PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED;
     uint8_t ebi = OGS_NAS_EPS_BEARER_IDENTITY_UNASSIGNED;
 
@@ -3242,10 +3243,11 @@
         bearer = mme_bearer_find_by_ue_ebi(mme_ue, ebi);
         if (!bearer) {
             ogs_error("No Bearer : EBI%d", ebi);
-            ogs_assert(OGS_OK ==
-                nas_eps_send_attach_reject(mme_ue,
+            r = nas_eps_send_attach_reject(mme_ue,
                     OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED,
-                    OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                    OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return NULL;
         }
 
@@ -3254,10 +3256,11 @@
 
     if (pti == OGS_NAS_PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED) {
         ogs_error("Both PTI%d and EBI%d are 0", pti, ebi);
-        ogs_assert(OGS_OK ==
-            nas_eps_send_attach_reject(mme_ue,
+        r = nas_eps_send_attach_reject(mme_ue,
                 OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED,
-                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return NULL;
     }
 
@@ -3272,10 +3275,11 @@
         if (!bearer) {
             ogs_error("No Bearer : Linked-EBI%d",
                     linked_eps_bearer_identity->eps_bearer_identity);
-            ogs_assert(OGS_OK ==
-                nas_eps_send_attach_reject(mme_ue,
+            r = nas_eps_send_attach_reject(mme_ue,
                     OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED,
-                    OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                    OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return NULL;
         }
     } else if (message->esm.h.message_type ==
@@ -3291,10 +3295,11 @@
         if (!bearer) {
             ogs_error("No Bearer : Linked-EBI%d",
                     linked_eps_bearer_identity->eps_bearer_identity);
-            ogs_assert(OGS_OK ==
-                nas_eps_send_bearer_resource_allocation_reject(
+            r = nas_eps_send_bearer_resource_allocation_reject(
                     mme_ue, pti,
-                    OGS_NAS_ESM_CAUSE_INVALID_EPS_BEARER_IDENTITY));
+                    OGS_NAS_ESM_CAUSE_INVALID_EPS_BEARER_IDENTITY);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return NULL;
         }
 
@@ -3311,10 +3316,11 @@
         if (!bearer) {
             ogs_error("No Bearer : Linked-EBI%d",
                     linked_eps_bearer_identity->eps_bearer_identity);
-            ogs_assert(OGS_OK ==
-                nas_eps_send_bearer_resource_modification_reject(
+            r = nas_eps_send_bearer_resource_modification_reject(
                     mme_ue, pti,
-                    OGS_NAS_ESM_CAUSE_INVALID_EPS_BEARER_IDENTITY));
+                    OGS_NAS_ESM_CAUSE_INVALID_EPS_BEARER_IDENTITY);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return NULL;
         }
     }
@@ -3335,11 +3341,12 @@
             sess = mme_sess_find_by_apn(mme_ue,
                     pdn_connectivity_request->access_point_name.apn);
             if (sess && create_action != OGS_GTP_CREATE_IN_ATTACH_REQUEST) {
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_pdn_connectivity_reject(
+                r = nas_eps_send_pdn_connectivity_reject(
                         sess,
                         OGS_NAS_ESM_CAUSE_MULTIPLE_PDN_CONNECTIONS_FOR_A_GIVEN_APN_NOT_ALLOWED,
-                        create_action));
+                        create_action);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 ogs_warn("APN duplicated %s",
                     pdn_connectivity_request->access_point_name.apn);
                 return NULL;
@@ -3359,10 +3366,11 @@
         if (!sess) {
             ogs_error("No Session : ESM message type%d, PTI%d",
                     message->esm.h.message_type, pti);
-            ogs_assert(OGS_OK ==
-                nas_eps_send_attach_reject(mme_ue,
+            r = nas_eps_send_attach_reject(mme_ue,
                     OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED,
-                    OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                    OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return NULL;
         }
     }

open5gs_2.5.5.100.a8f8.tar.xz/src/mme/mme-gtp-path.c -> open5gs_2.5.5.101.6895.tar.xz/src/mme/mme-gtp-path.c Changed

open5gs_2.5.5.100.a8f8.tar.xz/src/mme/mme-path.c -> open5gs_2.5.5.101.6895.tar.xz/src/mme/mme-path.c Changed

@@ -26,6 +26,7 @@
 
 void mme_send_delete_session_or_detach(mme_ue_t *mme_ue)
 {
+    int r;
     ogs_assert(mme_ue);
 
     switch (mme_ue->detach_type) {
@@ -35,7 +36,9 @@
             mme_gtp_send_delete_all_sessions(
                     mme_ue, OGS_GTP_DELETE_SEND_DETACH_ACCEPT);
         } else {
-            ogs_assert(OGS_OK == nas_eps_send_detach_accept(mme_ue));
+            r = nas_eps_send_detach_accept(mme_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
         break;
 
@@ -94,6 +97,7 @@
 
 void mme_send_delete_session_or_mme_ue_context_release(mme_ue_t *mme_ue)
 {
+    int r;
     ogs_assert(mme_ue);
 
     if (SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
@@ -102,10 +106,11 @@
     } else {
         enb_ue_t *enb_ue = enb_ue_cycle(mme_ue->enb_ue);
         if (enb_ue) {
-            ogs_assert(OGS_OK ==
-                s1ap_send_ue_context_release_command(enb_ue,
+            r = s1ap_send_ue_context_release_command(enb_ue,
                     S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                    S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
+                    S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         } else {
             ogs_warn("%s No S1 Context", mme_ue->imsi_bcd);
         }
@@ -114,6 +119,7 @@
 
 void mme_send_release_access_bearer_or_ue_context_release(enb_ue_t *enb_ue)
 {
+    int r;
     mme_ue_t *mme_ue = NULL;
     ogs_assert(enb_ue);
 
@@ -125,15 +131,17 @@
                 mme_ue, OGS_GTP_RELEASE_SEND_UE_CONTEXT_RELEASE_COMMAND));
     } else {
         ogs_debug("No UE Context");
-        ogs_assert(OGS_OK ==
-            s1ap_send_ue_context_release_command(enb_ue,
+        r = s1ap_send_ue_context_release_command(enb_ue,
                 S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0));
+                S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
     }
 }
 
 void mme_send_after_paging(mme_ue_t *mme_ue, bool failed)
 {
+    int r;
     mme_bearer_t *bearer = NULL;
 
     ogs_assert(mme_ue);
@@ -168,8 +176,9 @@
                 mme_gtp_send_create_bearer_response(
                     bearer, OGS_GTP2_CAUSE_UNABLE_TO_PAGE_UE));
         } else {
-            ogs_assert(OGS_OK ==
-                nas_eps_send_activate_dedicated_bearer_context_request(bearer));
+            r = nas_eps_send_activate_dedicated_bearer_context_request(bearer);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
         break;
     case MME_PAGING_TYPE_UPDATE_BEARER:
@@ -190,12 +199,13 @@
                 goto cleanup;
             }
 
-            ogs_assert(OGS_OK ==
-                nas_eps_send_modify_bearer_context_request(bearer,
+            r = nas_eps_send_modify_bearer_context_request(bearer,
                     (xact->update_flags &
                         OGS_GTP_MODIFY_QOS_UPDATE) ? 1 : 0,
                     (xact->update_flags &
-                        OGS_GTP_MODIFY_TFT_UPDATE) ? 1 : 0));
+                        OGS_GTP_MODIFY_TFT_UPDATE) ? 1 : 0);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
         break;
     case MME_PAGING_TYPE_DELETE_BEARER:
@@ -210,8 +220,9 @@
                 mme_gtp_send_delete_bearer_response(
                     bearer, OGS_GTP2_CAUSE_UNABLE_TO_PAGE_UE));
         } else {
-            ogs_assert(OGS_OK ==
-                nas_eps_send_deactivate_bearer_context_request(bearer));
+            r = nas_eps_send_deactivate_bearer_context_request(bearer);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
         break;
     case MME_PAGING_TYPE_CS_CALL_SERVICE:
@@ -239,7 +250,9 @@
             /* Nothing */
             ogs_warn("MME-initiated Detach cannot be invoked");
         } else {
-            ogs_assert(OGS_OK == nas_eps_send_detach_request(mme_ue));
+            r = nas_eps_send_detach_request(mme_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             if (MME_P_TMSI_IS_AVAILABLE(mme_ue)) {
                 ogs_assert(OGS_OK == sgsap_send_detach_indication(mme_ue));
             } else {

open5gs_2.5.5.100.a8f8.tar.xz/src/mme/mme-s11-handler.c -> open5gs_2.5.5.101.6895.tar.xz/src/mme/mme-s11-handler.c Changed

@@ -81,7 +81,7 @@
         ogs_gtp_xact_t *xact, mme_ue_t *mme_ue_from_teid,
         ogs_gtp2_create_session_response_t *rsp)
 {
-    int rv, i;
+    int i, r, rv;
     uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
     uint8_t session_cause = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
     uint8_t bearer_cause = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
@@ -151,8 +151,11 @@
         if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) {
             ogs_error("%s Attach reject Cause:%d",
                     mme_ue->imsi_bcd, session_cause);
-            ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_NETWORK_FAILURE, OGS_NAS_ESM_CAUSE_NETWORK_FAILURE));
+            r = nas_eps_send_attach_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_NETWORK_FAILURE,
+                    OGS_NAS_ESM_CAUSE_NETWORK_FAILURE);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
         mme_send_delete_session_or_mme_ue_context_release(mme_ue);
         return;
@@ -216,9 +219,11 @@
         if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) {
             ogs_error("%s Attach reject Cause:%d",
                     mme_ue->imsi_bcd, session_cause);
-            ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue,
+            r = nas_eps_send_attach_reject(mme_ue,
                     OGS_NAS_EMM_CAUSE_NETWORK_FAILURE,
-                    OGS_NAS_ESM_CAUSE_NETWORK_FAILURE));
+                    OGS_NAS_ESM_CAUSE_NETWORK_FAILURE);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
         mme_send_delete_session_or_mme_ue_context_release(mme_ue);
         return;
@@ -246,9 +251,11 @@
                     mme_ue->imsi_bcd, bearer_cause);
             if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) {
                 ogs_error("%s Attach reject", mme_ue->imsi_bcd);
-                ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue,
+                r = nas_eps_send_attach_reject(mme_ue,
                         OGS_NAS_EMM_CAUSE_NETWORK_FAILURE,
-                        OGS_NAS_ESM_CAUSE_NETWORK_FAILURE));
+                        OGS_NAS_ESM_CAUSE_NETWORK_FAILURE);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             mme_send_delete_session_or_mme_ue_context_release(mme_ue);
             return;
@@ -264,8 +271,11 @@
         ogs_error("%s GTP Cause VALUE:%d", mme_ue->imsi_bcd, session_cause);
         if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) {
             ogs_error("%s Attach reject", mme_ue->imsi_bcd);
-            ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_NETWORK_FAILURE, OGS_NAS_ESM_CAUSE_NETWORK_FAILURE));
+            r = nas_eps_send_attach_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_NETWORK_FAILURE,
+                    OGS_NAS_ESM_CAUSE_NETWORK_FAILURE);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
         mme_send_delete_session_or_mme_ue_context_release(mme_ue);
         return;
@@ -395,15 +405,17 @@
         } else {
             ogs_assert(OGS_PDU_SESSION_TYPE_IS_VALID(
                         session->paa.session_type));
-            ogs_assert(OGS_OK ==
-                nas_eps_send_attach_accept(mme_ue));
+            r = nas_eps_send_attach_accept(mme_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
 
     } else if (create_action == OGS_GTP_CREATE_IN_UPLINK_NAS_TRANSPORT) {
         ogs_assert(OGS_PDU_SESSION_TYPE_IS_VALID(session->paa.session_type));
-        ogs_assert(OGS_OK ==
-            nas_eps_send_activate_default_bearer_context_request(
-                bearer, create_action));
+        r = nas_eps_send_activate_default_bearer_context_request(
+                bearer, create_action);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
     } else if (create_action == OGS_GTP_CREATE_IN_PATH_SWITCH_REQUEST) {
 
         GTP_COUNTER_CHECK(mme_ue, GTP_COUNTER_CREATE_SESSION_BY_PATH_SWITCH,
@@ -411,7 +423,9 @@
                     mme_timer_cfg(MME_TIMER_S11_HOLDING)->duration);
 
             sgw_ue_associate_mme_ue(target_ue, mme_ue);
-            ogs_assert(OGS_OK == s1ap_send_path_switch_ack(mme_ue, true));
+            r = s1ap_send_path_switch_ack(mme_ue, true);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         );
 
     } else {
@@ -424,7 +438,7 @@
         ogs_gtp_xact_t *xact, mme_ue_t *mme_ue_from_teid,
         ogs_gtp2_modify_bearer_response_t *rsp)
 {
-    int rv;
+    int r, rv;
     uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
     uint8_t session_cause = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
     int modify_action = 0;
@@ -511,10 +525,14 @@
 
     switch (modify_action) {
     case OGS_GTP_MODIFY_IN_PATH_SWITCH_REQUEST:
-        ogs_assert(OGS_OK == s1ap_send_path_switch_ack(mme_ue, false));
+        r = s1ap_send_path_switch_ack(mme_ue, false);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         break;
     case OGS_GTP_MODIFY_IN_E_RAB_MODIFICATION:
-        ogs_assert(OGS_OK == s1ap_send_e_rab_modification_confirm(mme_ue));
+        r = s1ap_send_e_rab_modification_confirm(mme_ue);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         break;
     default:
         break;
@@ -525,7 +543,7 @@
         ogs_gtp_xact_t *xact, mme_ue_t *mme_ue_from_teid,
         ogs_gtp2_delete_session_response_t *rsp)
 {
-    int rv;
+    int r, rv;
     uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
     int action = 0;
     sgw_ue_t *source_ue = NULL, *target_ue = NULL;
@@ -601,7 +619,9 @@
 
     } else if (action == OGS_GTP_DELETE_SEND_DETACH_ACCEPT) {
         if (mme_sess_count(mme_ue) == 1) /* Last Session */ {
-            ogs_assert(OGS_OK == nas_eps_send_detach_accept(mme_ue));
+            r = nas_eps_send_detach_accept(mme_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
 
     } else if (action ==
@@ -609,8 +629,9 @@
         mme_bearer_t *bearer = mme_default_bearer_in_sess(sess);
         ogs_expect_or_return(bearer);
 
-        ogs_assert(OGS_OK ==
-            nas_eps_send_deactivate_bearer_context_request(bearer));
+        r = nas_eps_send_deactivate_bearer_context_request(bearer);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         /*
          * mme_sess_remove() should not be called here.
@@ -631,10 +652,11 @@
                 }
             } else {
                 ogs_assert(mme_ue->enb_ue);
-                ogs_assert(OGS_OK ==
-                    s1ap_send_ue_context_release_command(mme_ue->enb_ue,
+                r = s1ap_send_ue_context_release_command(mme_ue->enb_ue,
                     S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                    S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
+                    S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
         }
 
@@ -645,10 +667,11 @@
 
             enb_ue = enb_ue_cycle(mme_ue->enb_ue);
             if (enb_ue) {
-                ogs_assert(OGS_OK ==
-                    s1ap_send_ue_context_release_command(enb_ue,
+                r = s1ap_send_ue_context_release_command(enb_ue,
                         S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                        S1AP_UE_CTX_REL_S1_REMOVE_AND_UNLINK, 0));
+                        S1AP_UE_CTX_REL_S1_REMOVE_AND_UNLINK, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             } else
                 ogs_error("ENB-S1 Context has already been removed");
         }
@@ -659,10 +682,11 @@
                     &mme_ue->pdn_connectivity_request);
             if (rv != OGS_OK) {
                 ogs_error("nas_eps_send_emm_to_esm() failed");
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_attach_reject(mme_ue,
+                r = nas_eps_send_attach_reject(mme_ue,
                         OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED,
-                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }

open5gs_2.5.5.100.a8f8.tar.xz/src/mme/mme-s6a-handler.c -> open5gs_2.5.5.101.6895.tar.xz/src/mme/mme-s6a-handler.c Changed

@@ -39,6 +39,7 @@
 uint8_t mme_s6a_handle_aia(
         mme_ue_t *mme_ue, ogs_diam_s6a_message_t *s6a_message)
 {
+    int r;
     ogs_diam_s6a_aia_message_t *aia_message = NULL;
     ogs_diam_e_utran_vector_t *e_utran_vector = NULL;
 
@@ -66,7 +67,9 @@
     if (mme_ue->nas_eps.ksi == OGS_NAS_KSI_NO_KEY_IS_AVAILABLE)
         mme_ue->nas_eps.ksi = 0;
 
-    ogs_assert(OGS_OK == nas_eps_send_authentication_request(mme_ue));
+    r = nas_eps_send_authentication_request(mme_ue);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 
     return OGS_NAS_EMM_CAUSE_REQUEST_ACCEPTED;
 }
@@ -77,7 +80,7 @@
     ogs_diam_s6a_ula_message_t *ula_message = NULL;
     ogs_subscription_data_t *subscription_data = NULL;
     ogs_slice_data_t *slice_data = NULL;
-    int rv, num_of_session;
+    int r, rv, num_of_session;
 
     ogs_assert(mme_ue);
     ogs_assert(s6a_message);
@@ -115,9 +118,10 @@
             return OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED;
         }
     } else if (mme_ue->nas_eps.type == MME_EPS_TYPE_TAU_REQUEST) {
-        ogs_assert(OGS_OK ==
-            nas_eps_send_tau_accept(mme_ue,
-                S1AP_ProcedureCode_id_InitialContextSetup));
+        r = nas_eps_send_tau_accept(mme_ue,
+                S1AP_ProcedureCode_id_InitialContextSetup);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
     } else {
         ogs_error("Invalid Type%d", mme_ue->nas_eps.type);
         return OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED;
@@ -199,6 +203,7 @@
 
 void mme_s6a_handle_clr(mme_ue_t *mme_ue, ogs_diam_s6a_message_t *s6a_message)
 {
+    int r;
     ogs_diam_s6a_clr_message_t *clr_message = NULL;
     ogs_assert(mme_ue);
     ogs_assert(s6a_message);
@@ -260,9 +265,13 @@
          */
         if (ECM_IDLE(mme_ue)) {
             MME_STORE_PAGING_INFO(mme_ue, MME_PAGING_TYPE_DETACH_TO_UE, NULL);
-            ogs_assert(OGS_OK == s1ap_send_paging(mme_ue, S1AP_CNDomain_ps));
+            r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         } else {
-            ogs_assert(OGS_OK == nas_eps_send_detach_request(mme_ue));
+            r = nas_eps_send_detach_request(mme_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             if (MME_P_TMSI_IS_AVAILABLE(mme_ue)) {
                 ogs_assert(OGS_OK == sgsap_send_detach_indication(mme_ue));
             } else {

open5gs_2.5.5.100.a8f8.tar.xz/src/mme/mme-sm.c -> open5gs_2.5.5.101.6895.tar.xz/src/mme/mme-sm.c Changed

@@ -62,7 +62,7 @@
 
     ogs_s1ap_message_t s1ap_message;
     ogs_pkbuf_t *pkbuf = NULL;
-    int rc;
+    int rc, r;
 
     ogs_nas_eps_message_t nas_message;
     enb_ue_t *enb_ue = NULL;
@@ -196,10 +196,11 @@
             ogs_fsm_dispatch(&enb->sm, e);
         } else {
             ogs_warn("Cannot decode S1AP message");
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication(
+            r = s1ap_send_error_indication(
                     enb, NULL, NULL, S1AP_Cause_PR_protocol,
-                    S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message));
+                    S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
 
         ogs_s1ap_free(&s1ap_message);
@@ -217,7 +218,9 @@
             pkbuf = e->pkbuf;
             ogs_assert(pkbuf);
 
-            ogs_expect(OGS_OK == s1ap_send_to_enb_ue(enb_ue, pkbuf));
+            r = s1ap_send_to_enb_ue(enb_ue, pkbuf);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             ogs_timer_delete(e->timer);
             break;
         case MME_TIMER_S1_HOLDING:
@@ -251,11 +254,12 @@
             if (!mme_ue) {
                 mme_ue = mme_ue_add(enb_ue);
                 if (mme_ue == NULL) {
-                    ogs_expect(OGS_OK ==
-                        s1ap_send_ue_context_release_command(enb_ue,
+                    r = s1ap_send_ue_context_release_command(enb_ue,
                             S1AP_Cause_PR_misc,
                             S1AP_CauseMisc_control_processing_overload,
-                            S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0));
+                            S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     ogs_pkbuf_free(pkbuf);
                     return;
                 }
@@ -296,10 +300,11 @@
                 /* De-associate S1 with NAS/EMM */
                 enb_ue_deassociate(mme_ue->enb_ue);
 
-                ogs_assert(OGS_OK ==
-                    s1ap_send_ue_context_release_command(mme_ue->enb_ue,
+                r = s1ap_send_ue_context_release_command(mme_ue->enb_ue,
                         S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                        S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0));
+                        S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             enb_ue_associate_mme_ue(enb_ue, mme_ue);
         }
@@ -409,14 +414,16 @@
                     ogs_error("S1 context has already been removed");
                     break;
                 }
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_attach_reject(mme_ue, emm_cause,
-                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                r = nas_eps_send_attach_reject(mme_ue, emm_cause,
+                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
-                ogs_assert(OGS_OK ==
-                    s1ap_send_ue_context_release_command(enb_ue,
+                r = s1ap_send_ue_context_release_command(enb_ue,
                         S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
+                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
         case OGS_DIAM_S6A_CMD_CODE_UPDATE_LOCATION:
@@ -429,14 +436,16 @@
                     ogs_error("S1 context has already been removed");
                     break;
                 }
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_attach_reject(mme_ue, emm_cause,
-                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                r = nas_eps_send_attach_reject(mme_ue, emm_cause,
+                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
-                ogs_assert(OGS_OK ==
-                    s1ap_send_ue_context_release_command(enb_ue,
+                r = s1ap_send_ue_context_release_command(enb_ue,
                         S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
+                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
 
             mme_ue->location_updated_but_not_canceled_yet = true;

open5gs_2.5.5.100.a8f8.tar.xz/src/mme/nas-path.c -> open5gs_2.5.5.101.6895.tar.xz/src/mme/nas-path.c Changed

@@ -28,16 +28,21 @@
 
 int nas_eps_send_to_enb(mme_ue_t *mme_ue, ogs_pkbuf_t *pkbuf)
 {
+    int rv;
+
     ogs_assert(pkbuf);
 
     mme_ue = mme_ue_cycle(mme_ue);
     if (!mme_ue) {
-        ogs_warn("UE(mme-ue) context has already been removed");
+        ogs_error("UE(mme-ue) context has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
-    return s1ap_send_to_enb_ue(mme_ue->enb_ue, pkbuf);
+    rv = s1ap_send_to_enb_ue(mme_ue->enb_ue, pkbuf);
+    ogs_expect(rv == OGS_OK);
+
+    return rv;
 }
 
 int nas_eps_send_emm_to_esm(mme_ue_t *mme_ue,
@@ -75,20 +80,23 @@
 
     mme_ue = mme_ue_cycle(mme_ue);
     if (!mme_ue) {
-        ogs_warn("UE(mme-ue) context has already been removed");
+        ogs_error("UE(mme-ue) context has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
     enb_ue = enb_ue_cycle(mme_ue->enb_ue);
     if (!enb_ue) {
-        ogs_warn("S1 context has already been removed");
+        ogs_error("S1 context has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
     s1apbuf = s1ap_build_downlink_nas_transport(enb_ue, pkbuf);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_downlink_nas_transport() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_enb(mme_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -116,19 +124,31 @@
 
     esmbuf = esm_build_activate_default_bearer_context_request(
                 sess, OGS_GTP_CREATE_IN_ATTACH_REQUEST);
-    ogs_expect_or_return_val(esmbuf, OGS_ERROR);
+    if (!esmbuf) {
+        ogs_error("esm_build_activate_default_bearer_context_request() failed");
+        return OGS_ERROR;
+    }
 
     emmbuf = emm_build_attach_accept(mme_ue, esmbuf);
-    ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+    if (!emmbuf) {
+        ogs_error("emm_build_attach_accept() failed");
+        return OGS_ERROR;
+    }
 
     CLEAR_MME_UE_TIMER(mme_ue->t3450);
     mme_ue->t3450.pkbuf = ogs_pkbuf_copy(emmbuf);
-    ogs_expect_or_return_val(mme_ue->t3450.pkbuf, OGS_ERROR);
+    if (!mme_ue->t3450.pkbuf) {
+        ogs_error("ogs_pkbuf_copy(mme_ue->t3450.pkbuf) failed");
+        return OGS_ERROR;
+    }
     ogs_timer_start(mme_ue->t3450.timer,
             mme_timer_cfg(MME_TIMER_T3450)->duration);
 
     s1apbuf = s1ap_build_initial_context_setup_request(mme_ue, emmbuf);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_initial_context_setup_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_enb(mme_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -143,7 +163,11 @@
     mme_sess_t *sess = NULL;
     ogs_pkbuf_t *esmbuf = NULL, *emmbuf = NULL;
 
-    ogs_expect_or_return_val(mme_ue, OGS_ERROR);
+    mme_ue = mme_ue_cycle(mme_ue);
+    if (!mme_ue) {
+        ogs_error("UE(mme-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("%s Attach reject", mme_ue->imsi_bcd);
     ogs_debug("    Cause%d", emm_cause);
@@ -152,13 +176,19 @@
     if (sess) {
         esmbuf = esm_build_pdn_connectivity_reject(
                     sess, esm_cause, OGS_GTP_CREATE_IN_ATTACH_REQUEST);
-        ogs_expect_or_return_val(esmbuf, OGS_ERROR);
+        if (!esmbuf) {
+            ogs_error("esm_build_pdn_connectivity_reject() failed");
+            return OGS_ERROR;
+        }
     }
 
     emmbuf = emm_build_attach_reject(emm_cause, esmbuf);
-    ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+    if (!emmbuf) {
+        ogs_error("emm_build_attach_reject() failed");
+        return OGS_ERROR;
+    }
     rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -174,19 +204,24 @@
 
     if (mme_ue->t3470.pkbuf) {
         emmbuf = mme_ue->t3470.pkbuf;
-        ogs_expect_or_return_val(emmbuf, OGS_ERROR);
     } else {
         emmbuf = emm_build_identity_request(mme_ue);
-        ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+        if (!emmbuf) {
+            ogs_error("emm_build_identity_request() failed");
+            return OGS_ERROR;
+        }
     }
 
     mme_ue->t3470.pkbuf = ogs_pkbuf_copy(emmbuf);
-    ogs_expect_or_return_val(mme_ue->t3470.pkbuf, OGS_ERROR);
+    if (!mme_ue->t3470.pkbuf) {
+        ogs_error("ogs_pkbuf_copy(mme_ue->t3470.pkbuf) failed");
+        return OGS_ERROR;
+    }
     ogs_timer_start(mme_ue->t3470.timer, 
             mme_timer_cfg(MME_TIMER_T3470)->duration);
 
     rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -202,19 +237,24 @@
 
     if (mme_ue->t3460.pkbuf) {
         emmbuf = mme_ue->t3460.pkbuf;
-        ogs_expect_or_return_val(emmbuf, OGS_ERROR);
     } else {
         emmbuf = emm_build_authentication_request(mme_ue);
-        ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+        if (!emmbuf) {
+            ogs_error("emm_build_authentication_request() failed");
+            return OGS_ERROR;
+        }
     }
 
     mme_ue->t3460.pkbuf = ogs_pkbuf_copy(emmbuf);
-    ogs_expect_or_return_val(mme_ue->t3460.pkbuf, OGS_ERROR);
+    if (!mme_ue->t3460.pkbuf) {
+        ogs_error("ogs_pkbuf_copy(mme_ue->t3460.pkbuf) failed");
+        return OGS_ERROR;
+    }
     ogs_timer_start(mme_ue->t3460.timer, 
             mme_timer_cfg(MME_TIMER_T3460)->duration);
 
     rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -230,19 +270,24 @@
 
     if (mme_ue->t3460.pkbuf) {
         emmbuf = mme_ue->t3460.pkbuf;
-        ogs_expect_or_return_val(emmbuf, OGS_ERROR);
     } else {
         emmbuf = emm_build_security_mode_command(mme_ue);
-        ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+        if (!emmbuf) {
+            ogs_error("emm_build_security_mode_command() failed");
+            return OGS_ERROR;
+        }
     }
 
     mme_ue->t3460.pkbuf = ogs_pkbuf_copy(emmbuf);
-    ogs_expect_or_return_val(mme_ue->t3460.pkbuf, OGS_ERROR);

open5gs_2.5.5.100.a8f8.tar.xz/src/mme/s1ap-handler.c -> open5gs_2.5.5.101.6895.tar.xz/src/mme/s1ap-handler.c Changed

@@ -68,7 +68,7 @@
 void s1ap_handle_s1_setup_request(mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i, j;
+    int i, j, r;
 
     S1AP_InitiatingMessage_t *initiatingMessage = NULL;
     S1AP_S1SetupRequest_t *S1SetupRequest = NULL;
@@ -163,7 +163,9 @@
         group = S1AP_Cause_PR_misc;
         cause = S1AP_CauseMisc_unspecified;
 
-        ogs_assert(OGS_OK == s1ap_send_s1_setup_failure(enb, group, cause));
+        r = s1ap_send_s1_setup_failure(enb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -173,7 +175,9 @@
         group = S1AP_Cause_PR_misc;
         cause = S1AP_CauseMisc_unspecified;
 
-        ogs_assert(OGS_OK == s1ap_send_s1_setup_failure(enb, group, cause));
+        r = s1ap_send_s1_setup_failure(enb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -183,17 +187,21 @@
         group = S1AP_Cause_PR_misc;
         cause = S1AP_CauseMisc_unknown_PLMN;
 
-        ogs_assert(OGS_OK == s1ap_send_s1_setup_failure(enb, group, cause));
+        r = s1ap_send_s1_setup_failure(enb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     enb->state.s1_setup_success = true;
-    ogs_assert(OGS_OK == s1ap_send_s1_setup_response(enb));
+    r = s1ap_send_s1_setup_response(enb);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 }
 
 void s1ap_handle_initial_ue_message(mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
-    int i;
+    int i, r;
     char bufOGS_ADDRSTRLEN;
 
     S1AP_InitiatingMessage_t *initiatingMessage = NULL;
@@ -251,19 +259,21 @@
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
     enb_ue = enb_ue_find_by_enb_ue_s1ap_id(enb, *ENB_UE_S1AP_ID);
     if (!enb_ue) {
         enb_ue = enb_ue_add(enb, *ENB_UE_S1AP_ID);
         if (enb_ue == NULL) {
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication(enb, NULL, NULL,
+            r = s1ap_send_error_indication(enb, NULL, NULL,
                     S1AP_Cause_PR_misc,
-                    S1AP_CauseMisc_control_processing_overload));
+                    S1AP_CauseMisc_control_processing_overload);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -313,10 +323,11 @@
                     /* De-associate S1 with NAS/EMM */
                     enb_ue_deassociate(mme_ue->enb_ue);
 
-                    ogs_assert(OGS_OK ==
-                        s1ap_send_ue_context_release_command(mme_ue->enb_ue,
+                    r = s1ap_send_ue_context_release_command(mme_ue->enb_ue,
                             S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                            S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0));
+                            S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 }
                 enb_ue_associate_mme_ue(enb_ue, mme_ue);
             }
@@ -325,25 +336,28 @@
 
     if (!NAS_PDU) {
         ogs_error("No NAS_PDU");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!TAI) {
         ogs_error("No TAI");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!EUTRAN_CGI) {
         ogs_error("No EUTRAN_CGI");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -371,15 +385,17 @@
         enb_ue->enb_ue_s1ap_id, enb_ue->mme_ue_s1ap_id,
         enb_ue->saved.tai.tac, enb_ue->saved.e_cgi.cell_id);
 
-    s1ap_send_to_nas(enb_ue,
+    r = s1ap_send_to_nas(enb_ue,
             S1AP_ProcedureCode_id_initialUEMessage, NAS_PDU);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 }
 
 void s1ap_handle_uplink_nas_transport(
         mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     S1AP_InitiatingMessage_t *initiatingMessage = NULL;
     S1AP_UplinkNASTransport_t *UplinkNASTransport = NULL;
@@ -436,9 +452,10 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -446,18 +463,20 @@
     if (!enb_ue) {
         ogs_error("No eNB UE Context : MME_UE_S1AP_ID%lld",
                 (long long)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -466,25 +485,28 @@

open5gs_2.5.5.100.a8f8.tar.xz/src/mme/s1ap-path.c -> open5gs_2.5.5.101.6895.tar.xz/src/mme/s1ap-path.c Changed

@@ -55,16 +55,16 @@
 
     enb = mme_enb_cycle(enb);
     if (!enb) {
-        ogs_warn("eNB has already been removed");
+        ogs_error("eNB has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
     ogs_assert(enb->sctp.sock);
     if (enb->sctp.sock->fd == INVALID_SOCKET) {
         ogs_fatal("eNB SCTP socket has already been destroyed");
         ogs_log_hexdump(OGS_LOG_FATAL, pkbuf->data, pkbuf->len);
-        ogs_assert_if_reached();
+        ogs_pkbuf_free(pkbuf);
         return OGS_ERROR;
     }
 
@@ -84,16 +84,20 @@
 
 int s1ap_send_to_enb_ue(enb_ue_t *enb_ue, ogs_pkbuf_t *pkbuf)
 {
+    int rv;
     ogs_assert(pkbuf);
 
     enb_ue = enb_ue_cycle(enb_ue);
     if (!enb_ue) {
-        ogs_warn("S1 context has already been removed");
+        ogs_error("S1 context has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
-    return s1ap_send_to_enb(enb_ue->enb, pkbuf, enb_ue->enb_ostream_id);
+    rv = s1ap_send_to_enb(enb_ue->enb, pkbuf, enb_ue->enb_ostream_id);
+    ogs_expect(rv == OGS_OK);
+
+    return rv;
 }
 
 int s1ap_delayed_send_to_enb_ue(
@@ -118,10 +122,10 @@
 
         return OGS_OK;
     } else {
-        mme_enb_t *enb = NULL;
-        enb = enb_ue->enb;
-        ogs_assert(enb);
-        return s1ap_send_to_enb_ue(enb_ue, pkbuf);
+        int rv = s1ap_send_to_enb_ue(enb_ue, pkbuf);
+        ogs_expect(rv == OGS_OK);
+
+        return rv;
     }
 }
 
@@ -154,6 +158,7 @@
 int s1ap_send_to_nas(enb_ue_t *enb_ue,
         S1AP_ProcedureCode_t procedureCode, S1AP_NAS_PDU_t *nasPdu)
 {
+    int rv;
     ogs_nas_eps_security_header_t *sh = NULL;
     ogs_nas_security_header_type_t security_header_type;
 
@@ -244,9 +249,11 @@
             ogs_pkbuf_free(nasbuf);
             return OGS_ERROR;
         }
-        return s1ap_send_to_esm(
+        rv = s1ap_send_to_esm(
                 mme_ue, nasbuf, security_header_type.type,
                 OGS_GTP_CREATE_IN_UPLINK_NAS_TRANSPORT);
+        ogs_expect(rv == OGS_OK);
+        return rv;
     } else {
         ogs_error("Unknown/Unimplemented NAS Protocol discriminator 0x%02x",
                   h->protocol_discriminator);
@@ -262,7 +269,10 @@
 
     ogs_debug("S1-Setup response");
     s1ap_buffer = s1ap_build_setup_rsp();
-    ogs_expect_or_return_val(s1ap_buffer, OGS_ERROR);
+    if (!s1ap_buffer) {
+        ogs_error("s1ap_build_setup_rsp() failed");
+        return OGS_ERROR;
+    }
 
     rv = s1ap_send_to_enb(enb, s1ap_buffer, S1AP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -278,7 +288,10 @@
 
     ogs_debug("S1-Setup failure");
     s1ap_buffer = s1ap_build_setup_failure(group, cause, S1AP_TimeToWait_v10s);
-    ogs_expect_or_return_val(s1ap_buffer, OGS_ERROR);
+    if (!s1ap_buffer) {
+        ogs_error("s1ap_build_setup_failure() failed");
+        return OGS_ERROR;
+    }
 
     rv = s1ap_send_to_enb(enb, s1ap_buffer, S1AP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -295,7 +308,10 @@
 
     ogs_debug("InitialContextSetupRequest");
     s1apbuf = s1ap_build_initial_context_setup_request(mme_ue, NULL);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_initial_context_setup_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_enb(mme_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -312,7 +328,10 @@
 
     ogs_debug("UEContextModificationRequest");
     s1apbuf = s1ap_build_ue_context_modification_request(mme_ue);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_ue_context_modification_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_enb(mme_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -340,7 +359,10 @@
             group, (int)cause, action, (int)duration);
 
     s1apbuf = s1ap_build_ue_context_release_command(enb_ue, group, cause);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_ue_context_release_command() failed");
+        return OGS_ERROR;
+    }
 
     rv = s1ap_delayed_send_to_enb_ue(enb_ue, s1apbuf, duration);
     ogs_expect(rv == OGS_OK);
@@ -369,14 +391,23 @@
                     s1apbuf = mme_ue->t3413.pkbuf;
                 } else {
                     s1apbuf = s1ap_build_paging(mme_ue, cn_domain);
-                    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+                    if (!s1apbuf) {
+                        ogs_error("s1ap_build_paging() failed");
+                        return OGS_ERROR;
+                    }
                 }
 
                 mme_ue->t3413.pkbuf = ogs_pkbuf_copy(s1apbuf);
-                ogs_expect_or_return_val(mme_ue->t3413.pkbuf, OGS_ERROR);
+                if (!mme_ue->t3413.pkbuf) {
+                    ogs_error("ogs_pkbuf_copy() failed");
+                    return OGS_ERROR;
+                }
 
                 rv = s1ap_send_to_enb(enb, s1apbuf, S1AP_NON_UE_SIGNALLING);
-                ogs_expect_or_return_val(rv == OGS_OK, rv);
+                if (rv != OGS_OK) {
+                    ogs_error("s1ap_send_to_enb() failed");
+                    return rv;
+                }
             }
         }
     }
@@ -400,7 +431,10 @@
 
     ogs_debug("MMEConfigurationTransfer");
     s1apbuf = s1ap_build_mme_configuration_transfer(SONConfigurationTransfer);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_mme_configuration_transfer() failed");
+        return OGS_ERROR;
+    }
 
     rv = s1ap_send_to_enb(target_enb, s1apbuf, S1AP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -417,7 +451,10 @@
 
     ogs_debug("E-RABModificationConfirm");
     s1apbuf = s1ap_build_e_rab_modification_confirm(mme_ue);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_e_rab_modification_confirm() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_enb(mme_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -436,7 +473,10 @@
     ogs_debug("PathSwitchAcknowledge");
     s1apbuf = s1ap_build_path_switch_ack(
                 mme_ue, e_rab_to_switched_in_uplink_list);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_path_switch_ack() failed");
+        return OGS_ERROR;
+    }

open5gs_2.5.5.100.a8f8.tar.xz/src/mme/sbc-handler.c -> open5gs_2.5.5.101.6895.tar.xz/src/mme/sbc-handler.c Changed

@@ -26,7 +26,7 @@
 {
     ogs_pkbuf_t *s1apbuf = NULL;
     mme_enb_t *enb = NULL;
-    int i, j, flag;
+    int i, j, flag, r;
 
     /* Find enB with matched TAI */
     ogs_list_for_each(&mme_self()->enb_list, enb) {
@@ -48,11 +48,15 @@
         if (flag) {
             /* Build S1AP Write Replace Warning Request message */
             s1apbuf = s1ap_build_write_replace_warning_request(sbc_pws);
-            ogs_expect_or_return(s1apbuf);
+            if (!s1apbuf) {
+                ogs_error("s1ap_build_kill_request() failed");
+                return;
+            }
 
             /* Send to enb */
-            ogs_expect(s1ap_send_to_enb(
-                    enb, s1apbuf, S1AP_NON_UE_SIGNALLING) == OGS_OK);
+            r = s1ap_send_to_enb(enb, s1apbuf, S1AP_NON_UE_SIGNALLING);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
     }
 }
@@ -61,7 +65,7 @@
 {
     ogs_pkbuf_t *s1apbuf = NULL;
     mme_enb_t *enb = NULL;
-    int i, j, flag;
+    int i, j, flag, r;
 
     /* Find enB with matched TAI */
     ogs_list_for_each(&mme_self()->enb_list, enb) {
@@ -83,11 +87,15 @@
         if (flag) {
             /* Build S1AP Kill request message */
             s1apbuf = s1ap_build_kill_request(sbc_pws);
-            ogs_expect_or_return(s1apbuf);
+            if (!s1apbuf) {
+                ogs_error("s1ap_build_kill_request() failed");
+                return;
+            }
 
             /* Send to enb */
-            ogs_expect(s1ap_send_to_enb(
-                    enb, s1apbuf, S1AP_NON_UE_SIGNALLING) == OGS_OK);
+            r = s1ap_send_to_enb(enb, s1apbuf, S1AP_NON_UE_SIGNALLING);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
     }
 }

open5gs_2.5.5.100.a8f8.tar.xz/src/mme/sgsap-handler.c -> open5gs_2.5.5.101.6895.tar.xz/src/mme/sgsap-handler.c Changed

@@ -30,6 +30,7 @@
 
 void sgsap_handle_location_update_accept(mme_vlr_t *vlr, ogs_pkbuf_t *pkbuf)
 {
+    int r;
     ogs_tlv_t *root = NULL, *iter = NULL;
     mme_ue_t *mme_ue = NULL;
 
@@ -116,21 +117,24 @@
         ogs_debug("    P-TMSI0x%08x", mme_ue->p_tmsi);
     }
 
-    ogs_assert(OGS_OK ==
-        nas_eps_send_attach_accept(mme_ue));
+    r = nas_eps_send_attach_accept(mme_ue);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 
     return;
 
 error:
-    ogs_assert(OGS_OK ==
-        nas_eps_send_attach_reject(mme_ue,
+    r = nas_eps_send_attach_reject(mme_ue,
             OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED,
-            OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+            OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
     mme_send_delete_session_or_mme_ue_context_release(mme_ue);
 }
 
 void sgsap_handle_location_update_reject(mme_vlr_t *vlr, ogs_pkbuf_t *pkbuf)
 {
+    int r;
     ogs_tlv_t *root = NULL, *iter = NULL;
     mme_ue_t *mme_ue = NULL;
 
@@ -203,9 +207,10 @@
                     ogs_plmn_id_hexdump(&lai->nas_plmn_id), lai->lac);
     }
 
-    ogs_assert(OGS_OK ==
-        nas_eps_send_attach_reject(mme_ue,
-            emm_cause, OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+    r = nas_eps_send_attach_reject(mme_ue,
+            emm_cause, OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
     mme_send_delete_session_or_mme_ue_context_release(mme_ue);
 
     return;
@@ -277,6 +282,7 @@
 
 void sgsap_handle_paging_request(mme_vlr_t *vlr, ogs_pkbuf_t *pkbuf)
 {
+    int r;
     ogs_tlv_t *root = NULL, *iter = NULL;
     mme_ue_t *mme_ue = NULL;
 
@@ -354,22 +360,25 @@
                 /* UE will respond Extended Service Request in PS CNDomain*/
                 MME_STORE_PAGING_INFO(mme_ue,
                         MME_PAGING_TYPE_CS_CALL_SERVICE, NULL);
-                ogs_assert(OGS_OK ==
-                    s1ap_send_paging(mme_ue, S1AP_CNDomain_cs));
+                r = s1ap_send_paging(mme_ue, S1AP_CNDomain_cs);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
             } else if (SMS_SERVICE_INDICATOR(mme_ue)) {
                 /* UE will respond Service Request in PS CNDomain*/
                 MME_STORE_PAGING_INFO(mme_ue,
                         MME_PAGING_TYPE_SMS_SERVICE, NULL);
-                ogs_assert(OGS_OK ==
-                    s1ap_send_paging(mme_ue, S1AP_CNDomain_ps));
+                r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             } else
                 goto paging_reject;
 
         } else {
             if (CS_CALL_SERVICE_INDICATOR(mme_ue)) {
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_cs_service_notification(mme_ue));
+                r = nas_eps_send_cs_service_notification(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             } else if (SMS_SERVICE_INDICATOR(mme_ue)) {
                 ogs_assert(OGS_OK ==
                     sgsap_send_service_request(
@@ -395,6 +404,7 @@
 
 void sgsap_handle_downlink_unitdata(mme_vlr_t *vlr, ogs_pkbuf_t *pkbuf)
 {
+    int r;
     ogs_tlv_t *root = NULL, *iter = NULL;
     mme_ue_t *mme_ue = NULL;
 
@@ -455,9 +465,10 @@
             nas_message_container_buffer,
             nas_message_container_length);
 
-    ogs_assert(OGS_OK ==
-        nas_eps_send_downlink_nas_transport(mme_ue,
-            nas_message_container_buffer, nas_message_container_length));
+    r = nas_eps_send_downlink_nas_transport(mme_ue,
+            nas_message_container_buffer, nas_message_container_length);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 }
 
 void sgsap_handle_reset_indication(mme_vlr_t *vlr, ogs_pkbuf_t *pkbuf)

open5gs_2.5.5.100.a8f8.tar.xz/src/mme/sgsap-path.c -> open5gs_2.5.5.101.6895.tar.xz/src/mme/sgsap-path.c Changed

@@ -120,7 +120,10 @@
     ogs_debug("    IMSI%s", mme_ue->imsi_bcd);
 
     pkbuf = sgsap_build_location_update_request(mme_ue);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_location_update_request() failed");
+        return OGS_ERROR;
+    }
     rv = sgsap_send_to_vlr(mme_ue, pkbuf);
     ogs_expect(rv == OGS_OK);
 
@@ -137,7 +140,10 @@
     ogs_debug("    IMSI%s", mme_ue->imsi_bcd);
 
     pkbuf = sgsap_build_tmsi_reallocation_complete(mme_ue);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_tmsi_reallocation_complete() failed");
+        return OGS_ERROR;
+    }
     rv = sgsap_send_to_vlr(mme_ue, pkbuf);
     ogs_expect(rv == OGS_OK);
 
@@ -151,7 +157,10 @@
     ogs_assert(mme_ue);
 
     pkbuf = sgsap_build_detach_indication(mme_ue);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_detach_indication() failed");
+        return OGS_ERROR;
+    }
     rv = sgsap_send_to_vlr(mme_ue, pkbuf);
     ogs_expect(rv == OGS_OK);
 
@@ -168,7 +177,10 @@
     ogs_debug("    IMSI%s", mme_ue->imsi_bcd);
 
     pkbuf = sgsap_build_mo_csfb_indication(mme_ue);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_mo_csfb_indication() failed");
+        return OGS_ERROR;
+    }
     rv = sgsap_send_to_vlr(mme_ue, pkbuf);
     ogs_expect(rv == OGS_OK);
 
@@ -187,7 +199,10 @@
     pkbuf = sgsap_build_paging_reject(
                 &mme_ue->nas_mobile_identity_imsi,
                 SGSAP_IE_IMSI_LEN, sgs_cause);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_paging_reject() failed");
+        return OGS_ERROR;
+    }
     rv = sgsap_send_to_vlr(mme_ue, pkbuf);
     ogs_expect(rv == OGS_OK);
 
@@ -206,7 +221,10 @@
     ogs_debug("    EMM_MODE%d", emm_mode);
 
     pkbuf = sgsap_build_service_request(mme_ue, emm_mode);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_service_request() failed");
+        return OGS_ERROR;
+    }
     rv = sgsap_send_to_vlr(mme_ue, pkbuf);
     ogs_expect(rv == OGS_OK);
 
@@ -222,7 +240,10 @@
     ogs_debug("SGSAP RESET-ACK");
 
     pkbuf = sgsap_build_reset_ack(vlr);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_reset_ack() failed");
+        return OGS_ERROR;
+    }
     rv =  sgsap_send_to_vlr_with_sid(vlr, pkbuf, 0);
     ogs_expect(rv == OGS_OK);
 
@@ -243,7 +264,10 @@
             nas_message_container->buffer, nas_message_container->length);
 
     pkbuf = sgsap_build_uplink_unidata(mme_ue, nas_message_container);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_uplink_unidata() failed");
+        return OGS_ERROR;
+    }
     rv = sgsap_send_to_vlr(mme_ue, pkbuf);
     ogs_expect(rv == OGS_OK);
 
@@ -261,7 +285,10 @@
     ogs_debug("    CAUSE%d", sgs_cause);
 
     pkbuf = sgsap_build_ue_unreachable(mme_ue, sgs_cause);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_ue_unreachable() failed");
+        return OGS_ERROR;
+    }
     rv = sgsap_send_to_vlr(mme_ue, pkbuf);
     ogs_expect(rv == OGS_OK);

open5gs_2.5.5.100.a8f8.tar.xz/src/nrf/sbi-path.c -> open5gs_2.5.5.101.6895.tar.xz/src/nrf/sbi-path.c Changed

@@ -84,11 +84,17 @@
 
     ogs_assert(subscription_data);
     client = subscription_data->client;
-    ogs_expect_or_return_val(client, false);
+    if (!client) {
+        ogs_error("No Client");
+        return false;
+    }
 
     request = nrf_nnrf_nfm_build_nf_status_notify(
                 subscription_data, event, nf_instance);
-    ogs_expect_or_return_val(request, false);
+    if (!request) {
+        ogs_error("nrf_nnrf_nfm_build_nf_status_notify() failed");
+        return false;
+    }
 
     rc = ogs_sbi_send_request_to_client(
             client, client_notify_cb, request, NULL);
@@ -103,6 +109,7 @@
         OpenAPI_notification_event_type_e event,
         ogs_sbi_nf_instance_t *nf_instance)
 {
+    bool rc;
     ogs_sbi_subscription_data_t *subscription_data = NULL;
 
     ogs_assert(nf_instance);
@@ -135,10 +142,12 @@
                 continue;
         }
 
-        ogs_expect_or_return_val(true ==
-            nrf_nnrf_nfm_send_nf_status_notify(
-                subscription_data, event, nf_instance),
-            false);
+        rc = nrf_nnrf_nfm_send_nf_status_notify(
+                subscription_data, event, nf_instance);
+        if (rc == false) {
+            ogs_error("nrf_nnrf_nfm_send_nf_status_notify() failed");
+            return rc;
+        }
     }
 
     return true;

open5gs_2.5.5.100.a8f8.tar.xz/src/pcf/sbi-path.c -> open5gs_2.5.5.101.6895.tar.xz/src/pcf/sbi-path.c Changed

@@ -139,7 +139,10 @@
     xact = ogs_sbi_xact_add(
             sbi_object, service_type, discovery_option,
             build, context, data);
-    ogs_expect_or_return_val(xact, false);
+    if (!xact) {
+        ogs_error("ogs_sbi_xact_add() failed");
+        return false;
+    }
 
     xact->assoc_stream = stream;
 
@@ -182,7 +185,10 @@
     ogs_assert(service_type);
 
     xact = ogs_sbi_xact_add(&sess->sbi, service_type, NULL, NULL, NULL, NULL);
-    ogs_expect_or_return_val(xact, false);
+    if (!xact) {
+        ogs_error("ogs_sbi_xact_add() failed");
+        return false;
+    }
 
     xact->assoc_stream = stream;
 
@@ -265,7 +271,10 @@
     ogs_assert(client);
 
     request = pcf_namf_callback_build_am_policy_control(pcf_ue, NULL);
-    ogs_expect_or_return_val(request, false);
+    if (!request) {
+        ogs_error("pcf_namf_callback_build_am_policy_control() failed");
+        return false;
+    }
 
     rc = ogs_sbi_send_request_to_client(
             client, client_notify_cb, request, NULL);
@@ -289,7 +298,10 @@
 
     request = pcf_nsmf_callback_build_smpolicycontrol_update(
                 sess, SmPolicyDecision);
-    ogs_expect_or_return_val(request, false);
+    if (!request) {
+        ogs_error("pcf_nsmf_callback_build_smpolicycontrol_update() failed");
+        return false;
+    }
 
     rc = ogs_sbi_send_request_to_client(
             client, client_notify_cb, request, NULL);
@@ -314,7 +326,10 @@
 
     request = pcf_nsmf_callback_build_smpolicycontrol_update(
                 sess, SmPolicyDecision);
-    ogs_expect_or_return_val(request, false);
+    if (!request) {
+        ogs_error("pcf_nsmf_callback_build_smpolicycontrol_update() failed");
+        return false;
+    }
 
     rc = ogs_sbi_send_request_to_client(
             client, client_delete_notify_cb, request, app_session);
@@ -336,7 +351,10 @@
     ogs_assert(client);
 
     request = pcf_nsmf_callback_build_smpolicycontrol_terminate(sess, NULL);
-    ogs_expect_or_return_val(request, false);
+    if (!request) {
+        ogs_error("pcf_nsmf_callback_build_smpolicycontrol_terminate() failed");
+        return false;
+    }
 
     rc = ogs_sbi_send_request_to_client(
             client, client_notify_cb, request, NULL);
@@ -358,7 +376,11 @@
     ogs_assert(client);
 
     request = pcf_naf_callback_build_policyauthorization_terminate(app, NULL);
-    ogs_expect_or_return_val(request, false);
+    if (!request) {
+        ogs_error("pcf_naf_callback_build_policyauthorization_terminate() "
+                "failed");
+        return false;
+    }
 
     rc = ogs_sbi_send_request_to_client(
             client, client_notify_cb, request, NULL);

open5gs_2.5.5.100.a8f8.tar.xz/src/smf/sbi-path.c -> open5gs_2.5.5.101.6895.tar.xz/src/smf/sbi-path.c Changed