Osmocom Open Build Service

open5gs_2.7.5.4661.7b40.202505042026.dsc -> open5gs_2.7.5.4666.3b53.202505052026.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-sepp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
 Architecture: any
-Version: 2.7.5.4661.7b40.202505042026
+Version: 2.7.5.4666.3b53.202505052026
 Maintainer: Harald Welte <laforge@gnumonks.org>
 Uploaders: Sukchan Lee <acetcom@gmail.com>
 Homepage: https://open5gs.org
@@ -32,8 +32,8 @@
  open5gs-udr deb net optional arch=any
  open5gs-upf deb net optional arch=any
 Checksums-Sha1:
- 04439c331bf90f578899046b38d3dba4fd6d33dd 14537920 open5gs_2.7.5.4661.7b40.202505042026.tar.xz
+ 355d4a05897af17d58fcfd0eb53fb3dc4e07b4ef 14538596 open5gs_2.7.5.4666.3b53.202505052026.tar.xz
 Checksums-Sha256:
- eba874c84b79b7ef49ee0b4e80bf05c9fdc7a4db4e8c2727c164b55b6bd93b5c 14537920 open5gs_2.7.5.4661.7b40.202505042026.tar.xz
+ 3036c39a0c8b1c2ef9de3ce5d6dc588a237f375b150cf0b3603690b7f70cd934 14538596 open5gs_2.7.5.4666.3b53.202505052026.tar.xz
 Files:
- 826b1323df4eea9cf82f37096f9d29ce 14537920 open5gs_2.7.5.4661.7b40.202505042026.tar.xz
+ 64c10d48a8b9ddfff57a09a976546b39 14538596 open5gs_2.7.5.4666.3b53.202505052026.tar.xz

open5gs_2.7.5.4661.7b40.202505042026.tar.xz/.tarball-version -> open5gs_2.7.5.4666.3b53.202505052026.tar.xz/.tarball-version Changed

open5gs_2.7.5.4661.7b40.202505042026.tar.xz/debian/changelog -> open5gs_2.7.5.4666.3b53.202505052026.tar.xz/debian/changelog Changed

open5gs_2.7.5.4661.7b40.202505042026.tar.xz/lib/ipfw/ogs-ipfw.c -> open5gs_2.7.5.4666.3b53.202505052026.tar.xz/lib/ipfw/ogs-ipfw.c Changed

open5gs_2.7.5.4661.7b40.202505042026.tar.xz/src/amf/nsmf-handler.c -> open5gs_2.7.5.4666.3b53.202505052026.tar.xz/src/amf/nsmf-handler.c Changed

@@ -586,15 +586,19 @@
                  * 6. UEContextReleaseComplete
                  */
                 ogs_warn("PDUSessionResourceSetupResponse(Unsuccessful)");
-                ogs_assert(ran_ue);
-                ogs_assert(ran_ue->deactivation.group);
+                if (ran_ue) {
+                    ogs_assert(ran_ue->deactivation.group);
 
-                r = ngap_send_ran_ue_context_release_command(ran_ue,
-                        ran_ue->deactivation.group,
-                        ran_ue->deactivation.cause,
-                        NGAP_UE_CTX_REL_NG_REMOVE_AND_UNLINK, 0);
-                ogs_expect(r == OGS_OK);
-                ogs_assert(r != OGS_ERROR);
+                    r = ngap_send_ran_ue_context_release_command(ran_ue,
+                            ran_ue->deactivation.group,
+                            ran_ue->deactivation.cause,
+                            NGAP_UE_CTX_REL_NG_REMOVE_AND_UNLINK, 0);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
+                } else {
+                    ogs_warn("%s RAN-NG Context has already been removed",
+                            amf_ue->supi);
+                }
 
             } else if (state == AMF_UPDATE_SM_CONTEXT_MODIFIED) {
                 /*
@@ -625,15 +629,19 @@
                  */
 
                 if (AMF_SESSION_SYNC_DONE(amf_ue, state)) {
-                    ogs_assert(ran_ue);
-                    ogs_assert(ran_ue->deactivation.group);
+                    if (ran_ue) {
+                        ogs_assert(ran_ue->deactivation.group);
 
-                    r = ngap_send_ran_ue_context_release_command(ran_ue,
-                            ran_ue->deactivation.group,
-                            ran_ue->deactivation.cause,
-                            NGAP_UE_CTX_REL_NG_REMOVE_AND_UNLINK, 0);
-                    ogs_expect(r == OGS_OK);
-                    ogs_assert(r != OGS_ERROR);
+                        r = ngap_send_ran_ue_context_release_command(ran_ue,
+                                ran_ue->deactivation.group,
+                                ran_ue->deactivation.cause,
+                                NGAP_UE_CTX_REL_NG_REMOVE_AND_UNLINK, 0);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
+                    } else {
+                        ogs_warn("%s RAN-NG Context has already been removed",
+                                amf_ue->supi);
+                    }
                 }
 
             } else if (state == AMF_UPDATE_SM_CONTEXT_REGISTRATION_REQUEST) {

open5gs_2.7.5.4661.7b40.202505042026.tar.xz/src/mme/s1ap-build.c -> open5gs_2.7.5.4666.3b53.202505052026.tar.xz/src/mme/s1ap-build.c Changed

@@ -372,30 +372,39 @@
 
     if (bearer->qos.mbr.downlink || bearer->qos.mbr.uplink ||
         bearer->qos.gbr.downlink || bearer->qos.gbr.uplink) {
-        ogs_assert(bearer->qos.mbr.downlink);
-        ogs_assert(bearer->qos.mbr.uplink);
-        ogs_assert(bearer->qos.gbr.downlink);
-        ogs_assert(bearer->qos.gbr.uplink);
-
-        ogs_debug("    MBRDL:%lld,UL:%lld",
-            (long long)bearer->qos.mbr.downlink,
-            (long long)bearer->qos.mbr.uplink);
-        ogs_debug("    GBRDL:%lld,UL:%lld",
-            (long long)bearer->qos.gbr.downlink,
-            (long long)bearer->qos.gbr.uplink);
-
-        gbrQosInformation =
-                CALLOC(1, sizeof(struct S1AP_GBR_QosInformation));
-        asn_uint642INTEGER(&gbrQosInformation->e_RAB_MaximumBitrateDL,
-                bearer->qos.mbr.downlink);
-        asn_uint642INTEGER(&gbrQosInformation->e_RAB_MaximumBitrateUL,
-                bearer->qos.mbr.uplink);
-        asn_uint642INTEGER(&gbrQosInformation->
-                e_RAB_GuaranteedBitrateDL, bearer->qos.gbr.downlink);
-        asn_uint642INTEGER(&gbrQosInformation->
-                e_RAB_GuaranteedBitrateUL, bearer->qos.gbr.uplink);
-        e_rab->e_RABlevelQoSParameters.gbrQosInformation =
-                gbrQosInformation;
+        if (bearer->qos.mbr.downlink && bearer->qos.mbr.uplink &&
+            bearer->qos.gbr.downlink && bearer->qos.gbr.uplink) {
+
+            ogs_debug("    MBRDL:%lld,UL:%lld",
+                (long long)bearer->qos.mbr.downlink,
+                (long long)bearer->qos.mbr.uplink);
+            ogs_debug("    GBRDL:%lld,UL:%lld",
+                (long long)bearer->qos.gbr.downlink,
+                (long long)bearer->qos.gbr.uplink);
+
+            gbrQosInformation =
+                    CALLOC(1, sizeof(struct S1AP_GBR_QosInformation));
+            asn_uint642INTEGER(&gbrQosInformation->e_RAB_MaximumBitrateDL,
+                    bearer->qos.mbr.downlink);
+            asn_uint642INTEGER(&gbrQosInformation->e_RAB_MaximumBitrateUL,
+                    bearer->qos.mbr.uplink);
+            asn_uint642INTEGER(&gbrQosInformation->
+                    e_RAB_GuaranteedBitrateDL, bearer->qos.gbr.downlink);
+            asn_uint642INTEGER(&gbrQosInformation->
+                    e_RAB_GuaranteedBitrateUL, bearer->qos.gbr.uplink);
+            e_rab->e_RABlevelQoSParameters.gbrQosInformation =
+                    gbrQosInformation;
+
+        } else {
+            ogs_error("Missing one or more MBR/GBR parameters; "
+                    "defaulting to Non-GBR flow ");
+            ogs_error("    MBRDL:%lld,UL:%lld",
+                (long long)bearer->qos.mbr.downlink,
+                (long long)bearer->qos.mbr.uplink);
+            ogs_error("    GBRDL:%lld,UL:%lld",
+                (long long)bearer->qos.gbr.downlink,
+                (long long)bearer->qos.gbr.uplink);
+        }
     }
 
     rv = ogs_asn_ip_to_BIT_STRING(
@@ -1141,21 +1150,31 @@
 
     if (bearer->qos.mbr.downlink || bearer->qos.mbr.uplink ||
         bearer->qos.gbr.downlink || bearer->qos.gbr.uplink) {
-        ogs_assert(bearer->qos.mbr.downlink);
-        ogs_assert(bearer->qos.mbr.uplink);
-        ogs_assert(bearer->qos.gbr.downlink);
-        ogs_assert(bearer->qos.gbr.uplink);
-
-        gbrQosInformation = CALLOC(1, sizeof(S1AP_GBR_QosInformation_t));
-        asn_uint642INTEGER(&gbrQosInformation->e_RAB_MaximumBitrateDL,
-                bearer->qos.mbr.downlink);
-        asn_uint642INTEGER(&gbrQosInformation->e_RAB_MaximumBitrateUL,
-                bearer->qos.mbr.uplink);
-        asn_uint642INTEGER(&gbrQosInformation->e_RAB_GuaranteedBitrateDL,
-                bearer->qos.gbr.downlink);
-        asn_uint642INTEGER(&gbrQosInformation->e_RAB_GuaranteedBitrateUL,
-                bearer->qos.gbr.uplink);
-        e_rab->e_RABlevelQoSParameters.gbrQosInformation = gbrQosInformation;
+        if (bearer->qos.mbr.downlink && bearer->qos.mbr.uplink &&
+            bearer->qos.gbr.downlink && bearer->qos.gbr.uplink) {
+
+            gbrQosInformation = CALLOC(1, sizeof(S1AP_GBR_QosInformation_t));
+            asn_uint642INTEGER(&gbrQosInformation->e_RAB_MaximumBitrateDL,
+                    bearer->qos.mbr.downlink);
+            asn_uint642INTEGER(&gbrQosInformation->e_RAB_MaximumBitrateUL,
+                    bearer->qos.mbr.uplink);
+            asn_uint642INTEGER(&gbrQosInformation->e_RAB_GuaranteedBitrateDL,
+                    bearer->qos.gbr.downlink);
+            asn_uint642INTEGER(&gbrQosInformation->e_RAB_GuaranteedBitrateUL,
+                    bearer->qos.gbr.uplink);
+            e_rab->e_RABlevelQoSParameters.gbrQosInformation =
+                gbrQosInformation;
+
+        } else {
+            ogs_error("Missing one or more MBR/GBR parameters; "
+                    "defaulting to Non-GBR flow ");
+            ogs_error("    MBRDL:%lld,UL:%lld",
+                (long long)bearer->qos.mbr.downlink,
+                (long long)bearer->qos.mbr.uplink);
+            ogs_error("    GBRDL:%lld,UL:%lld",
+                (long long)bearer->qos.gbr.downlink,
+                (long long)bearer->qos.gbr.uplink);
+        }
     }
 
     rv = ogs_asn_ip_to_BIT_STRING(

open5gs_2.7.5.4661.7b40.202505042026.tar.xz/src/nrf/nf-sm.c -> open5gs_2.7.5.4666.3b53.202505052026.tar.xz/src/nrf/nf-sm.c Changed

@@ -81,7 +81,7 @@
 
 void nrf_nf_state_will_register(ogs_fsm_t *s, nrf_event_t *e)
 {
-    bool handled;
+    bool handled = false;
     ogs_sbi_nf_instance_t *nf_instance = NULL;
 
     ogs_sbi_stream_t *stream = NULL;
@@ -128,7 +128,9 @@
 
                     handled = nrf_nnrf_handle_nf_register(
                             nf_instance, stream, message);
-                    if (handled == false)
+                    if (handled == true)
+                        OGS_FSM_TRAN(s, nrf_nf_state_registered);
+                    else
                         OGS_FSM_TRAN(s, nrf_nf_state_exception);
                     break;
 
@@ -139,6 +141,7 @@
                         ogs_sbi_server_send_error(stream,
                             OGS_SBI_HTTP_STATUS_METHOD_NOT_ALLOWED, message,
                             "Invalid HTTP method", message->h.method, NULL));
+                    OGS_FSM_TRAN(s, nrf_nf_state_exception);
                 END
                 break;
 
@@ -150,6 +153,7 @@
                         OGS_SBI_HTTP_STATUS_METHOD_NOT_ALLOWED, message,
                         "Invalid resource name",
                         message->h.resource.component0, NULL));
+                OGS_FSM_TRAN(s, nrf_nf_state_exception);
             END
             break;
 
@@ -161,9 +165,8 @@
                     OGS_SBI_HTTP_STATUS_METHOD_NOT_ALLOWED, message,
                     "Invalid resource name", message->h.service.name,
                     NULL));
+            OGS_FSM_TRAN(s, nrf_nf_state_exception);
         END
-
-        OGS_FSM_TRAN(s, nrf_nf_state_registered);
         break;
 
     default:
@@ -175,7 +178,6 @@
                 message, "Unknown event", nrf_event_get_name(e),
                 NULL));
         OGS_FSM_TRAN(s, nrf_nf_state_exception);
-        break;
     }
 }
 
@@ -278,6 +280,7 @@
                         ogs_sbi_server_send_error(stream,
                             OGS_SBI_HTTP_STATUS_METHOD_NOT_ALLOWED, message,
                             "Invalid HTTP method", message->h.method, NULL));
+                    OGS_FSM_TRAN(s, nrf_nf_state_exception);
                 END
                 break;
 
@@ -289,6 +292,7 @@
                         OGS_SBI_HTTP_STATUS_METHOD_NOT_ALLOWED, message,
                         "Invalid resource name",
                         message->h.resource.component0, NULL));
+                OGS_FSM_TRAN(s, nrf_nf_state_exception);
             END
             break;
 
@@ -300,6 +304,7 @@
                     OGS_SBI_HTTP_STATUS_METHOD_NOT_ALLOWED, message,
                     "Invalid resource name", message->h.service.name,
                     NULL));
+            OGS_FSM_TRAN(s, nrf_nf_state_exception);
         END
         break;
 
@@ -312,7 +317,6 @@
                 message, "Unknown event", nrf_event_get_name(e),
                 NULL));
         OGS_FSM_TRAN(s, nrf_nf_state_exception);
-        break;
     }
 }

open5gs_2.7.5.4661.7b40.202505042026.tar.xz/src/nrf/nrf-sm.c -> open5gs_2.7.5.4666.3b53.202505052026.tar.xz/src/nrf/nrf-sm.c Changed

open5gs_2.7.5.4661.7b40.202505042026.tar.xz/src/smf/ngap-build.c -> open5gs_2.7.5.4666.3b53.202505052026.tar.xz/src/smf/ngap-build.c Changed

@@ -260,23 +260,33 @@
 
         if (qos_flow->qos.mbr.downlink || qos_flow->qos.mbr.uplink ||
             qos_flow->qos.gbr.downlink || qos_flow->qos.gbr.uplink) {
-            ogs_assert(qos_flow->qos.mbr.downlink);
-            ogs_assert(qos_flow->qos.mbr.uplink);
-            ogs_assert(qos_flow->qos.gbr.downlink);
-            ogs_assert(qos_flow->qos.gbr.uplink);
-
-            qosFlowLevelQosParameters->gBR_QosInformation =
-                gBR_QosInformation = CALLOC(1, sizeof(*gBR_QosInformation));
-            ogs_assert(gBR_QosInformation);
-
-            asn_uint642INTEGER(&gBR_QosInformation->maximumFlowBitRateDL,
-                    qos_flow->qos.mbr.downlink);
-            asn_uint642INTEGER(&gBR_QosInformation->maximumFlowBitRateUL,
-                    qos_flow->qos.mbr.uplink);
-            asn_uint642INTEGER(&gBR_QosInformation->
-                    guaranteedFlowBitRateDL, qos_flow->qos.gbr.downlink);
-            asn_uint642INTEGER(&gBR_QosInformation->
-                    guaranteedFlowBitRateUL, qos_flow->qos.gbr.uplink);
+
+            if (qos_flow->qos.mbr.downlink && qos_flow->qos.mbr.uplink &&
+                qos_flow->qos.gbr.downlink && qos_flow->qos.gbr.uplink) {
+
+                qosFlowLevelQosParameters->gBR_QosInformation =
+                    gBR_QosInformation = CALLOC(1, sizeof(*gBR_QosInformation));
+                ogs_assert(gBR_QosInformation);
+
+                asn_uint642INTEGER(&gBR_QosInformation->maximumFlowBitRateDL,
+                        qos_flow->qos.mbr.downlink);
+                asn_uint642INTEGER(&gBR_QosInformation->maximumFlowBitRateUL,
+                        qos_flow->qos.mbr.uplink);
+                asn_uint642INTEGER(&gBR_QosInformation->
+                        guaranteedFlowBitRateDL, qos_flow->qos.gbr.downlink);
+                asn_uint642INTEGER(&gBR_QosInformation->
+                        guaranteedFlowBitRateUL, qos_flow->qos.gbr.uplink);
+
+            } else {
+                ogs_error("Missing one or more MBR/GBR parameters; "
+                        "defaulting to Non-GBR flow ");
+                ogs_error("    MBRDL:%lld,UL:%lld",
+                    (long long)qos_flow->qos.mbr.downlink,
+                    (long long)qos_flow->qos.mbr.uplink);
+                ogs_error("    GBRDL:%lld,UL:%lld",
+                    (long long)qos_flow->qos.gbr.downlink,
+                    (long long)qos_flow->qos.gbr.uplink);
+            }
         }
     }
 
@@ -355,22 +365,32 @@
         if (qos_presence == true &&
             (qos_flow->qos.mbr.downlink || qos_flow->qos.mbr.uplink ||
              qos_flow->qos.gbr.downlink || qos_flow->qos.gbr.uplink)) {
-            ogs_assert(qos_flow->qos.mbr.downlink);
-            ogs_assert(qos_flow->qos.mbr.uplink);
-            ogs_assert(qos_flow->qos.gbr.downlink);
-            ogs_assert(qos_flow->qos.gbr.uplink);
-
-            qosFlowLevelQosParameters->gBR_QosInformation =
-                gBR_QosInformation = CALLOC(1, sizeof(*gBR_QosInformation));
-
-            asn_uint642INTEGER(&gBR_QosInformation->maximumFlowBitRateDL,
-                    qos_flow->qos.mbr.downlink);
-            asn_uint642INTEGER(&gBR_QosInformation->maximumFlowBitRateUL,
-                    qos_flow->qos.mbr.uplink);
-            asn_uint642INTEGER(&gBR_QosInformation->
-                    guaranteedFlowBitRateDL, qos_flow->qos.gbr.downlink);
-            asn_uint642INTEGER(&gBR_QosInformation->
-                    guaranteedFlowBitRateUL, qos_flow->qos.gbr.uplink);
+
+            if (qos_flow->qos.mbr.downlink && qos_flow->qos.mbr.uplink &&
+                qos_flow->qos.gbr.downlink && qos_flow->qos.gbr.uplink) {
+
+                qosFlowLevelQosParameters->gBR_QosInformation =
+                    gBR_QosInformation = CALLOC(1, sizeof(*gBR_QosInformation));
+
+                asn_uint642INTEGER(&gBR_QosInformation->maximumFlowBitRateDL,
+                        qos_flow->qos.mbr.downlink);
+                asn_uint642INTEGER(&gBR_QosInformation->maximumFlowBitRateUL,
+                        qos_flow->qos.mbr.uplink);
+                asn_uint642INTEGER(&gBR_QosInformation->
+                        guaranteedFlowBitRateDL, qos_flow->qos.gbr.downlink);
+                asn_uint642INTEGER(&gBR_QosInformation->
+                        guaranteedFlowBitRateUL, qos_flow->qos.gbr.uplink);
+
+            } else {
+                ogs_error("Missing one or more MBR/GBR parameters; "
+                        "defaulting to Non-GBR flow ");
+                ogs_error("    MBRDL:%lld,UL:%lld",
+                    (long long)qos_flow->qos.mbr.downlink,
+                    (long long)qos_flow->qos.mbr.uplink);
+                ogs_error("    GBRDL:%lld,UL:%lld",
+                    (long long)qos_flow->qos.gbr.downlink,
+                    (long long)qos_flow->qos.gbr.uplink);
+            }
         }
     }

open5gs_2.7.5.4661.7b40.202505042026.tar.xz/src/udm/udm-sm.c -> open5gs_2.7.5.4666.3b53.202505052026.tar.xz/src/udm/udm-sm.c Changed

open5gs_2.7.5.4661.7b40.202505042026.tar.xz/src/udm/ue-sm.c -> open5gs_2.7.5.4666.3b53.202505052026.tar.xz/src/udm/ue-sm.c Changed

Changes of Revision 1046