Osmocom Open Build Service

commit_2ce9f2b27edf2ad004f5cf816422eb8639592d87.txt Deleted

commit_33960bbb66b4ea2b5d36c2302e34cf2818deedea.txt Added

open5gs_2.7.2.4572.2ce9.dsc -> open5gs_2.7.2.4573.3396.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.2.4572.2ce9
+Version: 2.7.2.4573.3396
 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:
- 2fed6a348badc0825ad348f0d72a2afb92838979 14515436 open5gs_2.7.2.4572.2ce9.tar.xz
+ d033feb8ea18a80a364bae2ba020494f2792076a 14516436 open5gs_2.7.2.4573.3396.tar.xz
 Checksums-Sha256:
- c3ead6dca374759e52d39d6c5ca3a97c64760c8eea514134dd2c25827668420e 14515436 open5gs_2.7.2.4572.2ce9.tar.xz
+ 791b7d82f262b77a476769619cffecd1ffc9eb9d6ca3d48ad3b1244153c29821 14516436 open5gs_2.7.2.4573.3396.tar.xz
 Files:
- 1568bbbeeba0dfecea82c2f855b40e4e 14515436 open5gs_2.7.2.4572.2ce9.tar.xz
+ 2773d17ed9240fd504379c5e8c11ea33 14516436 open5gs_2.7.2.4573.3396.tar.xz

open5gs_2.7.2.4572.2ce9.tar.xz/.tarball-version -> open5gs_2.7.2.4573.3396.tar.xz/.tarball-version Changed

open5gs_2.7.2.4572.2ce9.tar.xz/debian/changelog -> open5gs_2.7.2.4573.3396.tar.xz/debian/changelog Changed

open5gs_2.7.2.4572.2ce9.tar.xz/lib/sbi/conv.c -> open5gs_2.7.2.4573.3396.tar.xz/lib/sbi/conv.c Changed

@@ -1205,6 +1205,35 @@
     OpenAPI_list_free(PlmnList);
 }
 
+/**
+ * Compares an ogs_plmn_id_t structure with an OpenAPI_plmn_id_t structure.
+ *
+ * @param plmn_list The PLMN-ID in ogs_plmn_id_t format.
+ * @param PlmnList The PLMN-ID in OpenAPI_plmn_id_t format.
+ * @return true if the PLMN-IDs are equal; otherwise, false.
+ */
+bool ogs_sbi_compare_plmn_list(
+        ogs_plmn_id_t *plmn_id, OpenAPI_plmn_id_t *PlmnId)
+{
+    ogs_plmn_id_t temp_plmn_id;
+
+    ogs_assert(plmn_id);
+    ogs_assert(PlmnId);
+    ogs_assert(PlmnId->mcc);
+    ogs_assert(PlmnId->mnc);
+
+    /* Convert OpenAPI_plmn_id_t to ogs_plmn_id_t */
+    ogs_sbi_parse_plmn_id(&temp_plmn_id, PlmnId);
+
+    /* Compare MCC and MNC values */
+    if (ogs_plmn_id_mcc(plmn_id) == ogs_plmn_id_mcc(&temp_plmn_id) &&
+        ogs_plmn_id_mnc(plmn_id) == ogs_plmn_id_mnc(&temp_plmn_id)) {
+        return true;
+    }
+
+    return false;
+}
+
 OpenAPI_plmn_id_nid_t *ogs_sbi_build_plmn_id_nid(ogs_plmn_id_t *plmn_id)
 {
     OpenAPI_plmn_id_nid_t *PlmnIdNid = NULL;

open5gs_2.7.2.4572.2ce9.tar.xz/lib/sbi/conv.h -> open5gs_2.7.2.4573.3396.tar.xz/lib/sbi/conv.h Changed

open5gs_2.7.2.4572.2ce9.tar.xz/lib/sbi/message.h -> open5gs_2.7.2.4573.3396.tar.xz/lib/sbi/message.h Changed

open5gs_2.7.2.4572.2ce9.tar.xz/src/nrf/nnrf-handler.c -> open5gs_2.7.2.4573.3396.tar.xz/src/nrf/nnrf-handler.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -25,6 +25,15 @@
 static void handle_nf_discover_search_result(
         OpenAPI_search_result_t *SearchResult);
 
+/**
+ * Handles NF registration in NRF. Validates the PLMN-ID against configured
+ * serving PLMN-IDs and registers the NF instance if valid.
+ *
+ * @param nf_instance The NF instance being registered.
+ * @param stream The SBI stream for communication.
+ * @param recvmsg The received SBI message.
+ * @return true if registration is successful; otherwise, false.
+ */
 bool nrf_nnrf_handle_nf_register(ogs_sbi_nf_instance_t *nf_instance,
         ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
 {
@@ -33,6 +42,10 @@
 
     OpenAPI_nf_profile_t *NFProfile = NULL;
 
+    OpenAPI_lnode_t *node = NULL;
+    bool plmn_valid = false;
+    int i;
+
     ogs_assert(nf_instance);
     ogs_assert(stream);
     ogs_assert(recvmsg);
@@ -73,6 +86,41 @@
         return false;
     }
 
+    /* Validate the PLMN-ID against configured serving PLMN-IDs */
+    if (NFProfile->plmn_list) {
+        /* Set PLMN status to invalid */
+        plmn_valid = false;
+
+        if (ogs_local_conf()->num_of_serving_plmn_id > 0 && NFProfile->plmn_list) {
+            OpenAPI_list_for_each(NFProfile->plmn_list, node) {
+                OpenAPI_plmn_id_t *PlmnId = node->data;
+                if (PlmnId == NULL) {
+                    continue;
+                }
+                for (i = 0; i < ogs_local_conf()->num_of_serving_plmn_id; i++) {
+                    if (ogs_sbi_compare_plmn_list(
+                                &ogs_local_conf()->serving_plmn_idi,
+                                PlmnId) == true) {
+                        plmn_valid = true;
+                        break;
+                    }
+                }
+                if (plmn_valid) {
+                    break;
+                }
+            }
+        }
+
+        /* Reject the registration if PLMN-ID is invalid */
+        if (!plmn_valid) {
+            ogs_error("PLMN-ID in NFProfile is not allowed");
+            ogs_assert(true == ogs_sbi_server_send_error(
+                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, recvmsg,
+                "PLMN-ID not allowed", NULL, NULL));
+            return false;
+        }
+    }
+
     ogs_nnrf_nfm_handle_nf_profile(nf_instance, NFProfile);
 
     ogs_sbi_client_associate(nf_instance);
@@ -146,7 +194,6 @@
         if (ogs_local_conf()->num_of_serving_plmn_id &&
                 NFProfile->plmn_list == NULL) {
             OpenAPI_list_t *PlmnIdList = NULL;
-            int i;
 
             PlmnIdList = OpenAPI_list_create();
             ogs_assert(PlmnIdList);
@@ -208,6 +255,10 @@
     ogs_assert(stream);
     ogs_assert(recvmsg);
 
+    cJSON *plmn_array = NULL, *plmn_item = NULL;
+    bool plmn_valid = false;
+    int i;
+
     SWITCH(recvmsg->h.method)
     CASE(OGS_SBI_HTTP_METHOD_PUT)
         return nrf_nnrf_handle_nf_register(
@@ -224,14 +275,14 @@
             return false;
         }
 
+        /* Iterate through the PatchItemList */
         OpenAPI_list_for_each(PatchItemList, node) {
             OpenAPI_patch_item_t *patch_item = node->data;
             if (!patch_item) {
                 ogs_error("No PatchItem");
-                ogs_assert(true ==
-                    ogs_sbi_server_send_error(stream,
-                        OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                        recvmsg, "No PatchItem", NULL, NULL));
+                ogs_assert(true == ogs_sbi_server_send_error(
+                    stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, recvmsg,
+                    "No PatchItem", NULL, NULL));
                 return false;
             }
 
@@ -246,6 +297,102 @@
                 break;
             CASE(OGS_SBI_PATCH_PATH_LOAD)
                 break;
+            CASE(OGS_SBI_PATCH_PATH_PLMN_LIST)
+                /* Ensure the value is not null and is a valid JSON array */
+                if (patch_item->value && patch_item->value->json) {
+                    /* Set PLMN status to invalid */
+                    plmn_valid = false;
+
+                    plmn_array = patch_item->value->json;
+                    if (!cJSON_IsArray(plmn_array)) {
+                        ogs_error("Value for /plmnList is not a JSON array");
+                        ogs_assert(true == ogs_sbi_server_send_error(
+                            stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, recvmsg,
+                            "Invalid value for /plmnList", NULL, NULL));
+                        return false;
+                    }
+
+                    /* Clear existing PLMN data in nf_instance */
+                    memset(nf_instance->plmn_id, 0,
+                            sizeof(nf_instance->plmn_id));
+                    nf_instance->num_of_plmn_id = 0;
+
+                    /* Iterate through the JSON array of PLMN IDs */
+                    cJSON_ArrayForEach(plmn_item, plmn_array) {
+                        OpenAPI_plmn_id_t plmn_id;
+                        memset(&plmn_id, 0, sizeof(plmn_id));
+
+                        if (nf_instance->num_of_plmn_id >=
+                                OGS_ARRAY_SIZE(nf_instance->plmn_id)) {
+                            ogs_error("Exceeded maximum number of PLMN IDs");
+                            ogs_assert(true == ogs_sbi_server_send_error(
+                                stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                                recvmsg,
+                                "Too many PLMN IDs", NULL, NULL));
+                            return false;
+                        }
+
+                        /* Parse the PLMN item */
+                        plmn_id.mcc = cJSON_GetObjectItem(plmn_item, "mcc")
+                                           ? cJSON_GetStringValue(
+                                                 cJSON_GetObjectItem(
+                                                     plmn_item, "mcc"))
+                                           : NULL;
+                        plmn_id.mnc = cJSON_GetObjectItem(plmn_item, "mnc")
+                                           ? cJSON_GetStringValue(
+                                                 cJSON_GetObjectItem(
+                                                     plmn_item, "mnc"))
+                                           : NULL;
+
+                        if (!plmn_id.mcc || !plmn_id.mnc) {
+                            ogs_error(
+                                "Invalid PLMN item in /plmnList update");
+                            ogs_assert(true ==
+                                       ogs_sbi_server_send_error(
+                                           stream,
+                                           OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                                           recvmsg,
+                                           "Invalid PLMN item", NULL,
+                                           NULL));
+                            return false;
+                        }
+
+                        /*
+                         * Convert OpenAPI_plmn_id_t to ogs_plmn_id_t
+                         * and store in nf_instance
+                         */
+                        ogs_sbi_parse_plmn_id(
+                                &nf_instance->
+                                    plmn_idnf_instance->num_of_plmn_id,
+                                &plmn_id);
+                        nf_instance->num_of_plmn_id++;
+
+                        /* Compare with the serving PLMN list */
+                        for (i = 0;
+                             i < ogs_local_conf()->num_of_serving_plmn_id;
+                             i++) {
+                            if (ogs_sbi_compare_plmn_list(
+                                        &ogs_local_conf()->serving_plmn_idi,
+                                        &plmn_id) == true) {
+                                plmn_valid = true;
+                                break;
+                            }
+                        }
+                        if (plmn_valid) {

Changes of Revision 566