@@ -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-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg

 Architecture: any

-Version: 2.4.8.202207220002

+Version: 2.4.8.202207230002

 Maintainer: Harald Welte <laforge@gnumonks.org>

 Uploaders: Sukchan Lee <acetcom@gmail.com>

 Homepage: https://open5gs.org

@@ -30,8 +30,8 @@

  open5gs-udr deb net optional arch=any

  open5gs-upf deb net optional arch=any

 Checksums-Sha1:

- b9efa502536ebab6ef50e36aa019d66b254e8eba 11456560 open5gs_2.4.8.202207220002.tar.xz

+ 2cf53104f8228b150818d61a9090c6060e3a4c02 11456616 open5gs_2.4.8.202207230002.tar.xz

 Checksums-Sha256:

- ed1cafb29ea9c5520eac58f97f01622e6fd70b567d6506b2f7d93d4d8655b5d4 11456560 open5gs_2.4.8.202207220002.tar.xz

+ 9b4fa72d6af7269d7708858335fadc841216646912c7f4005869d3d806424a5d 11456616 open5gs_2.4.8.202207230002.tar.xz

 Files:

- 3e733ed0047a55252a9e5be45a3073d8 11456560 open5gs_2.4.8.202207220002.tar.xz

+ bb963db6fbbccfe0d55489c3738c5433 11456616 open5gs_2.4.8.202207230002.tar.xz

​

@@ -1,8 +1,8 @@

-open5gs (2.4.8.202207220002) UNRELEASED; urgency=medium

+open5gs (2.4.8.202207230002) UNRELEASED; urgency=medium

   * Snapshot build

- -- Sukchan Lee <acetcom@gmail.com>  Fri, 22 Jul 2022 00:09:03 +0000

+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 23 Jul 2022 00:09:16 +0000

 open5gs (2.4.8) unstable; urgency=medium

​

@@ -31,7 +31,7 @@

 Package: open5gs-common

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${shlibs:Depends},

          ${misc:Depends}

 Description: 5G Core and EPC (Shared Files)

  Open5GS is a C-language implementation of 5G Core and EPC

@@ -43,7 +43,7 @@

 Package: open5gs-mme

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: MME (Mobility Management Entity)

@@ -58,7 +58,7 @@

 Package: open5gs-sgwc

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: SGW-C (Serving Gateway - Control Plane)

@@ -72,7 +72,7 @@

 Package: open5gs-smf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: SMF (Session Management Function)

@@ -84,7 +84,7 @@

 Package: open5gs-amf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: AMF (Access and Mobility Management Function)

@@ -96,7 +96,7 @@

 Package: open5gs-sgwu

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: SGW-U (Serving Gateway - User Plane)

@@ -110,7 +110,7 @@

 Package: open5gs-upf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${shlibs:Depends},

          ${misc:Depends},

          udev,

          open5gs-common (= ${binary:Version})

@@ -123,7 +123,7 @@

 Package: open5gs-hss

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${shlibs:Depends},

          ${misc:Depends},

          mongodb-org | mongodb,

          open5gs-common (= ${binary:Version})

@@ -140,7 +140,7 @@

 Package: open5gs-pcrf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${shlibs:Depends},

          ${misc:Depends},

          mongodb-org | mongodb,

          open5gs-common (= ${binary:Version})

@@ -156,7 +156,7 @@

 Package: open5gs-nrf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: NRF (Network Repository Function)

@@ -168,7 +168,7 @@

 Package: open5gs-ausf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: AUSF (Authentication Server Function)

@@ -180,7 +180,7 @@

 Package: open5gs-udm

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: UDM (Unified Data Management)

@@ -192,7 +192,7 @@

 Package: open5gs-pcf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: PCF (Policy Control Function)

@@ -204,7 +204,7 @@

 Package: open5gs-nssf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: NSSF (Network Slice Selection Function)

@@ -216,7 +216,7 @@

 Package: open5gs-bsf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: BSF (Binding Support Function)

@@ -228,7 +228,7 @@

 Package: open5gs-udr

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: UDR (Unified Data Repository)

@@ -240,7 +240,7 @@

 Package: open5gs

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${misc:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${misc:Depends},

          open5gs-common (= ${binary:Version}),

          open5gs-mme (= ${binary:Version}),

          open5gs-sgwc (= ${binary:Version}),

@@ -266,7 +266,7 @@

 Package: open5gs-dbg

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207220002), ${misc:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207230002), ${misc:Depends},

          open5gs (= ${binary:Version})

 Description: Debug symbols for Open5GS

  Open5GS is a C-language implementation of 5G Core and EPC

​

@@ -1341,6 +1341,26 @@

     }

 }

+void ogs_sbi_select_nf_by_instanceid(

+        ogs_sbi_object_t *sbi_object, OpenAPI_nf_type_e nf_type, void *state,

+        char *nf_instance_id)

+{

+    ogs_sbi_nf_instance_t *nf_instance = NULL;

+

+    ogs_assert(sbi_object);

+    ogs_assert(nf_type);

+    ogs_assert(state);

+

+    ogs_list_for_each(&ogs_sbi_self()->nf_instance_list, nf_instance) {

+        if (OGS_FSM_CHECK(&nf_instance->sm, state) &&

+            (nf_instance->nf_type == nf_type) &&

+            (!(strcmp(nf_instance->id, nf_instance_id)))) {

+            OGS_SBI_SETUP_NF(sbi_object, nf_type, nf_instance);

+            break;

+        }

+    }

+}

+

 bool ogs_sbi_client_associate(ogs_sbi_nf_instance_t *nf_instance)

 {

     ogs_sbi_client_t *client = NULL;

​

@@ -339,6 +339,9 @@

 void ogs_sbi_select_nf(

         ogs_sbi_object_t *sbi_object, OpenAPI_nf_type_e nf_type, void *state);

+void ogs_sbi_select_nf_by_instanceid(

+    ogs_sbi_object_t *sbi_object, OpenAPI_nf_type_e nf_type, void *state,

+    char *nf_instance_id);

 void ogs_sbi_object_free(ogs_sbi_object_t *sbi_object);

​

@@ -480,6 +480,26 @@

     return request;

 }

+ogs_sbi_request_t *ogs_nnrf_nfm_build_profile_retrieve(char *nf_instance_id)

+{

+    ogs_sbi_message_t message;

+    ogs_sbi_request_t *request = NULL;

+

+    ogs_assert(nf_instance_id);

+

+    memset(&message, 0, sizeof(message));

+    message.h.method = (char *)OGS_SBI_HTTP_METHOD_GET;

+    message.h.service.name = (char *)OGS_SBI_SERVICE_NAME_NNRF_NFM;

+    message.h.api.version = (char *)OGS_SBI_API_V1;

+    message.h.resource.component0 =

+        (char *)OGS_SBI_RESOURCE_NAME_NF_INSTANCES;

+    message.h.resource.component1 = nf_instance_id;

+

+    request = ogs_sbi_build_request(&message);

+

+    return request;

+}

+

 ogs_sbi_request_t *ogs_nnrf_disc_build_discover(

         OpenAPI_nf_type_e target_nf_type, OpenAPI_nf_type_e requester_nf_type)

 {

​

@@ -34,6 +34,7 @@

         ogs_sbi_subscription_t *subscription);

 ogs_sbi_request_t *ogs_nnrf_nfm_build_status_unsubscribe(

         ogs_sbi_subscription_t *subscription);

+ogs_sbi_request_t *ogs_nnrf_nfm_build_profile_retrieve(char *nf_instance_id);

 ogs_sbi_request_t *ogs_nnrf_disc_build_discover(

         OpenAPI_nf_type_e target_nf_type, OpenAPI_nf_type_e requester_nf_type);

​

@@ -141,6 +141,51 @@

     return ogs_sbi_scp_send_request(client, client->cb, request, nf_instance);

 }

+bool ogs_sbi_discover_by_nf_instanceid_and_send(ogs_sbi_xact_t *xact,

+        ogs_fsm_handler_t nf_state_registered, ogs_sbi_client_cb_f client_cb,

+        char *nf_instance_id)

+{

+    ogs_sbi_nf_instance_t *nf_instance = NULL;

+

+    ogs_assert(xact);

+    ogs_assert(xact->sbi_object);

+    ogs_assert(xact->target_nf_type);

+    ogs_assert(nf_state_registered);

+    ogs_assert(client_cb);

+    ogs_assert(nf_instance_id);

+

+    /* Target NF-Instance - search by NF Instance Id */

+    ogs_assert(xact->target_nf_type != OpenAPI_nf_type_NRF);

+    ogs_sbi_select_nf_by_instanceid(

+        xact->sbi_object, xact->target_nf_type, nf_state_registered,

+        nf_instance_id);

+

+    nf_instance = OGS_SBI_NF_INSTANCE(

+            xact->sbi_object, xact->target_nf_type);

+

+    if (nf_instance) {

+        return ogs_sbi_send(nf_instance, client_cb, xact);

+    }

+

+    /* NRF NF-Instance */

+    nf_instance = OGS_SBI_NF_INSTANCE(xact->sbi_object, OpenAPI_nf_type_NRF);

+    if (!nf_instance) {

+        ogs_sbi_select_nf(

+                xact->sbi_object, OpenAPI_nf_type_NRF, nf_state_registered);

+        nf_instance = OGS_SBI_NF_INSTANCE(

+                xact->sbi_object, OpenAPI_nf_type_NRF);

+    }

+

+    if (nf_instance) {

+        ogs_warn("Try to retrieve %s", nf_instance_id);

+        return ogs_nnrf_nfm_send_nf_profile_retrieve(nf_instance,

+                nf_instance_id, xact);

+    }

+

+    ogs_error("Cannot retrieve %s", nf_instance_id);

+    return false;

+}

+

 bool ogs_nnrf_nfm_send_nf_update(ogs_sbi_nf_instance_t *nf_instance)

 {

     ogs_sbi_request_t *request = NULL;

@@ -171,6 +216,24 @@

     return ogs_sbi_scp_send_request(client, client->cb, request, nf_instance);

 }

+bool ogs_nnrf_nfm_send_nf_profile_retrieve(ogs_sbi_nf_instance_t *nf_instance,

+        char *nf_instance_id, void *data)

+{

+    ogs_sbi_request_t *request = NULL;

+    ogs_sbi_client_t *client = NULL;

+

+    ogs_assert(nf_instance);

+    client = nf_instance->client;

+    ogs_assert(client);

+    ogs_assert(nf_instance_id);

+

+    request = ogs_nnrf_nfm_build_profile_retrieve(nf_instance_id);

+    ogs_expect_or_return_val(request, false);

+

+    return ogs_sbi_client_send_request(

+            client, client->cb, request, data);

+}

+

 bool ogs_nnrf_nfm_send_nf_status_subscribe(ogs_sbi_client_t *client,

         OpenAPI_nf_type_e req_nf_type, char *req_nf_instance_id,

         OpenAPI_nf_type_e subscr_cond_nf_type)

​

@@ -30,11 +30,16 @@

         ogs_sbi_client_cb_f client_cb, ogs_sbi_xact_t *xact);

 bool ogs_sbi_discover_and_send(ogs_sbi_xact_t *xact,

         ogs_fsm_handler_t nf_state_registered, ogs_sbi_client_cb_f client_cb);

+bool ogs_sbi_discover_by_nf_instanceid_and_send(ogs_sbi_xact_t *xact,

+        ogs_fsm_handler_t nf_state_registered, ogs_sbi_client_cb_f client_cb,

+        char *nf_instance_id);

 bool ogs_nnrf_nfm_send_nf_register(

         ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_request_t *(*build)(void));

 bool ogs_nnrf_nfm_send_nf_update(ogs_sbi_nf_instance_t *nf_instance);

 bool ogs_nnrf_nfm_send_nf_de_register(ogs_sbi_nf_instance_t *nf_instance);

+bool ogs_nnrf_nfm_send_nf_profile_retrieve(ogs_sbi_nf_instance_t *nf_instance,

+        char *nf_instance_id, void *data);

 bool ogs_nnrf_nfm_send_nf_status_subscribe(ogs_sbi_client_t *client,

         OpenAPI_nf_type_e req_nf_type, char *req_nf_instance_id,

​

@@ -791,8 +791,8 @@

             ogs_assert(ret == 0);

             mme_ue->network_access_mode = hdr->avp_value->i32;

         } else {

-            ogs_error("no_Network-Access-Mode");

-            error++;

+       mme_ue->network_access_mode = 0;

+            ogs_warn("no subscribed Network-Access-Mode, defaulting to PACKET_AND_CIRCUIT (0)");

         }

         /* AVP: 'AMBR'(1435)

​

@@ -1658,6 +1658,8 @@

     if (sess->pcf_id)

         ogs_free(sess->pcf_id);

+    if (sess->serving_nf_id)

+        ogs_free(sess->serving_nf_id);

     /* Free SBI object memory */

     ogs_sbi_object_free(&sess->sbi);

​

@@ -300,6 +300,9 @@

     /* PCF ID */

     char            *pcf_id;

+    /* Serving NF (AMF) Id */

+    char            *serving_nf_id;

+

     /* Integrity protection maximum data rate */

     struct {

         uint8_t mbr_dl;

​

@@ -346,3 +346,76 @@

         ogs_assert(true == smf_sbi_send(nf_instance, xact));

     }

 }

+

+void smf_nnrf_handle_nf_profile_retrieve(

+        ogs_sbi_xact_t *xact, ogs_sbi_message_t *recvmsg)

+{

+    ogs_sbi_object_t *sbi_object = NULL;

+    ogs_sbi_nf_instance_t *nf_instance = NULL;

+

+    OpenAPI_nf_profile_t *NFProfile = NULL;

+    bool handled;

+

+    ogs_assert(xact);

+    sbi_object = xact->sbi_object;

+    ogs_assert(sbi_object);

+    ogs_assert(recvmsg);

+

+    NFProfile = recvmsg->NFProfile;

+    if (!NFProfile) {

+        ogs_error("No NFProfile");

+        return;

+    }

+

+    nf_instance = ogs_sbi_nf_instance_find(NFProfile->nf_instance_id);

+    if (!nf_instance) {

+        nf_instance = ogs_sbi_nf_instance_add();

+        ogs_assert(nf_instance);

+        ogs_sbi_nf_instance_set_id(nf_instance, NFProfile->nf_instance_id);

+

+        smf_nf_fsm_init(nf_instance);

+

+        ogs_info("%s (NF-discover) NF registered", nf_instance->id);

+    } else {

+        nf_instance->reference_count++;

+

+        OGS_FSM_TRAN(&nf_instance->sm, smf_nf_state_registered);

+        ogs_fsm_dispatch(&nf_instance->sm, NULL);

+

+        ogs_warn("%s (NF-discover) NF has already been added",

+                NFProfile->nf_instance_id);

+    }

+

+    if (NF_INSTANCE_IS_OTHERS(nf_instance->id)) {

+        smf_sess_t *sess = NULL;

+

+        handled = ogs_sbi_nnrf_handle_nf_profile(

+                    nf_instance, NFProfile, NULL, NULL);

+        if (!handled) {

+            ogs_error("ogs_sbi_nnrf_handle_nf_profile() failed %s",

+                    nf_instance->id);

+            SMF_NF_INSTANCE_CLEAR("NRF-discover", nf_instance);

+            return;

+        }

+

+        handled = ogs_sbi_client_associate(nf_instance);

+        if (!handled) {

+            ogs_error("%s Cannot assciate NF EndPoint", nf_instance->id);

+            SMF_NF_INSTANCE_CLEAR("NRF-discover", nf_instance);

+            return;

+        }

+

+        sess = (smf_sess_t *)sbi_object;

+        ogs_assert(sess);

+        smf_sess_select_nf(sess, nf_instance->nf_type);

+

+        ogs_info("%s (NF-discover) NF Profile updated", nf_instance->id);

+    }

+

+    if (!nf_instance) {

+        ogs_error("(NF discover) No %s",

+                OpenAPI_nf_type_ToString(xact->target_nf_type));

+    } else {

+        ogs_assert(true == smf_sbi_send(nf_instance, xact));

+    }

+}

​

@@ -36,6 +36,8 @@

 void smf_nnrf_handle_nf_discover(

         ogs_sbi_xact_t *xact, ogs_sbi_message_t *recvmsg);

+void smf_nnrf_handle_nf_profile_retrieve(

+        ogs_sbi_xact_t *xact, ogs_sbi_message_t *recvmsg);

 #ifdef __cplusplus

 }

​

@@ -197,6 +197,12 @@

         ogs_assert(sess->pcf_id);

     }

+    if (SmContextCreateData->serving_nf_id) {

+        if (sess->serving_nf_id) ogs_free(sess->serving_nf_id);

+        sess->serving_nf_id = ogs_strdup(SmContextCreateData->serving_nf_id);

+        ogs_assert(sess->serving_nf_id);

+    }

+

     /*

      * NOTE : The pkbuf created in the SBI message will be removed

      *        from ogs_sbi_message_free().

​

@@ -200,8 +200,13 @@

     xact->state = param->state;

-    ogs_sbi_discover_and_send(xact,

-            (ogs_fsm_handler_t)smf_nf_state_registered, client_cb);

+    if (ogs_sbi_discover_by_nf_instanceid_and_send(xact,

+            (ogs_fsm_handler_t)smf_nf_state_registered, client_cb,

+            sess->serving_nf_id) != true)

+    {

+        ogs_error("smf_namf_comm_send_n1_n2_message_transfer() failed");

+        ogs_sbi_xact_remove(xact);

+    }

 }

 void smf_sbi_send_sm_context_create_error(

​

@@ -658,12 +658,27 @@

             SWITCH(sbi_message.h.resource.component0)

             CASE(OGS_SBI_RESOURCE_NAME_NF_INSTANCES)

-                nf_instance = e->sbi.data;

-                ogs_assert(nf_instance);

-                ogs_assert(OGS_FSM_STATE(&nf_instance->sm));

-                e->sbi.message = &sbi_message;

-                ogs_fsm_dispatch(&nf_instance->sm, e);

+                SWITCH(sbi_message.h.method)

+                CASE(OGS_SBI_HTTP_METHOD_GET)

+                    sbi_xact = e->sbi.data;

+                    ogs_assert(sbi_xact);

+

+                    if (sbi_message.res_status == OGS_SBI_HTTP_STATUS_OK)

+                        smf_nnrf_handle_nf_profile_retrieve(

+                            sbi_xact, &sbi_message);

+                    else

+                        ogs_error("HTTP response error %d",

+                                sbi_message.res_status);

+                    break;

+                DEFAULT

+                    nf_instance = e->sbi.data;

+                    ogs_assert(nf_instance);

+                    ogs_assert(OGS_FSM_STATE(&nf_instance->sm));

+

+                    e->sbi.message = &sbi_message;

+                    ogs_fsm_dispatch(&nf_instance->sm, e);

+                END

                 break;

             CASE(OGS_SBI_RESOURCE_NAME_SUBSCRIPTIONS)

​