Osmocom Open Build Service

commit_a99a76d916c35453bb837fa07cd943c8508fcf10.txt Added

commit_e9aaceee98f89c86ad593e09c3f4892d0cfde268.txt Deleted

open5gs_2.4.11.9.e9aac.dsc -> open5gs_2.4.11.10.a99a7.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-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
 Architecture: any
-Version: 2.4.11.9.e9aac
+Version: 2.4.11.10.a99a7
 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:
- 158fb595a4cee23f7fbe36d9cb9475fe25b5f7e2 11469960 open5gs_2.4.11.9.e9aac.tar.xz
+ d0f70edd732b8c32b7f668bba1826358a9cd1197 11471160 open5gs_2.4.11.10.a99a7.tar.xz
 Checksums-Sha256:
- 12402e7c1f0c80b4efeabd5b37b30015df7e4065b48a7b36f4fc01be7dd53616 11469960 open5gs_2.4.11.9.e9aac.tar.xz
+ 7f423f0cc2e22dd7298ed91c5620441b13e15f5177836544190bfd01fdb79d35 11471160 open5gs_2.4.11.10.a99a7.tar.xz
 Files:
- 4d2cf87b37c17fced69ce074c163be76 11469960 open5gs_2.4.11.9.e9aac.tar.xz
+ 3cba8fb47cdd8e6199ee87efbc11ccd3 11471160 open5gs_2.4.11.10.a99a7.tar.xz

open5gs_2.4.11.9.e9aac.tar.xz/.tarball-version -> open5gs_2.4.11.10.a99a7.tar.xz/.tarball-version Changed

open5gs_2.4.11.9.e9aac.tar.xz/debian/changelog -> open5gs_2.4.11.10.a99a7.tar.xz/debian/changelog Changed

open5gs_2.4.11.9.e9aac.tar.xz/lib/sbi/message.c -> open5gs_2.4.11.10.a99a7.tar.xz/lib/sbi/message.c Changed

@@ -179,6 +179,10 @@
         OpenAPI_termination_notification_free(message->TerminationNotification);
     if (message->DeregistrationData)
         OpenAPI_deregistration_data_free(message->DeregistrationData);
+    if (message->SDMSubscription)
+        OpenAPI_sdm_subscription_free(message->SDMSubscription);
+    if (message->ModificationNotification)
+        OpenAPI_modification_notification_free(message->ModificationNotification);
 
     /* HTTP Part */
     for (i = 0; i < message->num_of_part; i++) {
@@ -1022,6 +1026,15 @@
         item = OpenAPI_deregistration_data_convertToJSON(
                 message->DeregistrationData);
         ogs_assert(item);
+    } else if (message->SDMSubscription) {
+        item = OpenAPI_sdm_subscription_convertToJSON(
+                message->SDMSubscription);
+        ogs_assert(item);
+    }
+    else if (message->ModificationNotification) {
+        item = OpenAPI_modification_notification_convertToJSON(
+            message->ModificationNotification);
+        ogs_assert(item);
     }
 
     if (item) {
@@ -1326,6 +1339,15 @@
                 }
                 break;
 
+            CASE(OGS_SBI_RESOURCE_NAME_SDM_SUBSCRIPTIONS)
+                message->SDMSubscription =
+                    OpenAPI_sdm_subscription_parseFromJSON(item);
+                if (!message->SDMSubscription) {
+                    rv = OGS_ERROR;
+                    ogs_error("JSON parse error");
+                }
+                break;
+
             DEFAULT
                 rv = OGS_ERROR;
                 ogs_error("Unknown resource name %s",
@@ -1867,6 +1889,15 @@
                     rv = OGS_ERROR;
                     ogs_error("JSON parse error");
                 }
+                break;
+
+            CASE(OGS_SBI_RESOURCE_NAME_SDMSUBSCRIPTION_NOTIFY)
+                message->ModificationNotification =
+                    OpenAPI_modification_notification_parseFromJSON(item);
+                if (!message->ModificationNotification) {
+                    rv = OGS_ERROR;
+                    ogs_error("JSON parse error");
+                }
                 break;
 
             DEFAULT

open5gs_2.4.11.9.e9aac.tar.xz/lib/sbi/message.h -> open5gs_2.4.11.10.a99a7.tar.xz/lib/sbi/message.h Changed

@@ -95,6 +95,7 @@
 #define OGS_SBI_RESOURCE_NAME_UE_CONTEXT_IN_SMF_DATA "ue-context-in-smf-data"
 #define OGS_SBI_RESOURCE_NAME_SMF_SELECTION_SUBSCRIPTION_DATA \
                                             "smf-selection-subscription-data"
+#define OGS_SBI_RESOURCE_NAME_SDM_SUBSCRIPTIONS     "sdm-subscriptions"
 
 #define OGS_SBI_RESOURCE_NAME_SECURITY_INFORMATION  "security-information"
 #define OGS_SBI_RESOURCE_NAME_GENERATE_AUTH_DATA    "generate-auth-data"
@@ -126,6 +127,8 @@
 #define OGS_SBI_RESOURCE_NAME_SM_CONTEXT_STATUS     "sm-context-status"
 #define OGS_SBI_RESOURCE_NAME_AM_POLICY_NOTIFY      "am-policy-notify"
 #define OGS_SBI_RESOURCE_NAME_DEREG_NOTIFY          "dereg-notify"
+#define OGS_SBI_RESOURCE_NAME_SDMSUBSCRIPTION_NOTIFY \
+                                            "sdmsubscription-notify"
 
 #define OGS_SBI_RESOURCE_NAME_POLICIES              "policies"
 #define OGS_SBI_RESOURCE_NAME_SM_POLICIES           "sm-policies"
@@ -452,6 +455,8 @@
     OpenAPI_sm_policy_notification_t *SmPolicyNotification;
     OpenAPI_termination_notification_t *TerminationNotification;
     OpenAPI_deregistration_data_t *DeregistrationData;
+    OpenAPI_sdm_subscription_t *SDMSubscription;
+    OpenAPI_modification_notification_t *ModificationNotification;
 
     ogs_sbi_links_t *links;

open5gs_2.4.11.9.e9aac.tar.xz/lib/sbi/ogs-sbi.h -> open5gs_2.4.11.10.a99a7.tar.xz/lib/sbi/ogs-sbi.h Changed

open5gs_2.4.11.9.e9aac.tar.xz/src/amf/amf-sm.c -> open5gs_2.4.11.10.a99a7.tar.xz/src/amf/amf-sm.c Changed

open5gs_2.4.11.9.e9aac.tar.xz/src/amf/context.c -> open5gs_2.4.11.10.a99a7.tar.xz/src/amf/context.c Changed

open5gs_2.4.11.9.e9aac.tar.xz/src/amf/context.h -> open5gs_2.4.11.10.a99a7.tar.xz/src/amf/context.h Changed

open5gs_2.4.11.9.e9aac.tar.xz/src/amf/gmm-sm.c -> open5gs_2.4.11.10.a99a7.tar.xz/src/amf/gmm-sm.c Changed

@@ -988,6 +988,7 @@
             SWITCH(sbi_message->h.resource.component1)
             CASE(OGS_SBI_RESOURCE_NAME_REGISTRATIONS)
                 if (sbi_message->res_status != OGS_SBI_HTTP_STATUS_CREATED &&
+                    sbi_message->res_status != OGS_SBI_HTTP_STATUS_NO_CONTENT &&
                     sbi_message->res_status != OGS_SBI_HTTP_STATUS_OK) {
                     ogs_error("%s HTTP response error %d",
                             amf_ue->supi, sbi_message->res_status);
@@ -1027,7 +1028,9 @@
             CASE(OGS_SBI_RESOURCE_NAME_AM_DATA)
             CASE(OGS_SBI_RESOURCE_NAME_SMF_SELECT_DATA)
             CASE(OGS_SBI_RESOURCE_NAME_UE_CONTEXT_IN_SMF_DATA)
-                if (sbi_message->res_status != OGS_SBI_HTTP_STATUS_OK) {
+            CASE(OGS_SBI_RESOURCE_NAME_SDM_SUBSCRIPTIONS)
+                if ((sbi_message->res_status != OGS_SBI_HTTP_STATUS_OK) &&
+                    (sbi_message->res_status != OGS_SBI_HTTP_STATUS_CREATED)) {
                     ogs_error("%s HTTP response error %d",
                             amf_ue->supi, sbi_message->res_status);
                     ogs_assert(OGS_OK ==

open5gs_2.4.11.9.e9aac.tar.xz/src/amf/namf-handler.c -> open5gs_2.4.11.10.a99a7.tar.xz/src/amf/namf-handler.c Changed

@@ -606,3 +606,114 @@
 
     return OGS_OK;
 }
+
+int amf_namf_callback_handle_sdm_data_change_notify(
+        ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
+{
+    int status = OGS_SBI_HTTP_STATUS_NO_CONTENT;
+
+    amf_ue_t *amf_ue = NULL;
+
+    ogs_sbi_message_t sendmsg;
+    ogs_sbi_response_t *response = NULL;
+
+    OpenAPI_modification_notification_t *ModificationNotification;
+    OpenAPI_lnode_t *node;
+
+    char *ueid = NULL;
+    char *res_name = NULL;
+
+    ogs_assert(stream);
+    ogs_assert(recvmsg);
+
+    ModificationNotification = recvmsg->ModificationNotification;
+    if (!ModificationNotification) {
+        status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+        ogs_error("%s No ModificationNotification", amf_ue->supi);
+        goto cleanup;
+    }
+
+
+    OpenAPI_list_for_each(ModificationNotification->notify_items, node)
+    {
+        OpenAPI_notify_item_t *item = node->data;
+
+        char *saveptr = NULL;
+
+        ueid = ogs_sbi_parse_uri(item->resource_id, "/", &saveptr);
+        if (!ueid) {
+            status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+            ogs_error("%s No UeId", item->resource_id);
+            goto cleanup;
+        }
+
+        amf_ue = amf_ue_find_by_supi(ueid);
+        if (!amf_ue) {
+            status = OGS_SBI_HTTP_STATUS_NOT_FOUND;
+            ogs_error("Cannot find SUPI %s", ueid);
+            goto cleanup;
+        }
+
+        res_name = ogs_sbi_parse_uri(NULL, "/", &saveptr);
+        if (!res_name) {
+            status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+            ogs_error("%s No Resource Name", item->resource_id);
+            goto cleanup;
+        }
+
+        SWITCH(res_name)
+        CASE(OGS_SBI_RESOURCE_NAME_AM_DATA)
+            OpenAPI_lnode_t *node_ci;
+
+            OpenAPI_list_for_each(item->changes, node_ci)
+            {
+                /*
+                OpenAPI_change_item_t *item_change = node_ci->data;
+                item_change->path;
+                item_change->from;
+                item_change->new_value;
+                item_change->orig_value;
+                */
+                /*
+                switch (item_change->op) {
+                    case OpenAPI_change_type_ADD:
+                        break;
+                    case OpenAPI_change_type_MOVE:
+                        break;
+                    case OpenAPI_change_type__REMOVE:
+                        break;
+                    case OpenAPI_change_type_REPLACE:
+                        break;
+                    default:
+                        break;
+                }
+                */
+            }
+            break;
+        DEFAULT
+            status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+            ogs_error("Unknown Resource Name: %s", res_name);
+            goto cleanup;
+        END
+
+        ogs_free(ueid);
+        ogs_free(res_name);
+
+        ueid = NULL;
+        res_name = NULL;
+    }
+
+cleanup:
+    if (ueid)
+        ogs_free(ueid);
+    if (res_name)
+        ogs_free(res_name);
+
+    memset(&sendmsg, 0, sizeof(sendmsg));
+
+    response = ogs_sbi_build_response(&sendmsg, status);
+    ogs_assert(response);
+    ogs_assert(true == ogs_sbi_server_send_response(stream, response));
+
+    return OGS_OK;
+}

open5gs_2.4.11.9.e9aac.tar.xz/src/amf/namf-handler.h -> open5gs_2.4.11.10.a99a7.tar.xz/src/amf/namf-handler.h Changed

open5gs_2.4.11.9.e9aac.tar.xz/src/amf/nudm-build.c -> open5gs_2.4.11.10.a99a7.tar.xz/src/amf/nudm-build.c Changed

@@ -137,3 +137,63 @@
 
     return request;
 }
+
+ogs_sbi_request_t *amf_nudm_sdm_build_subscription(amf_ue_t *amf_ue, void *data)
+{
+    ogs_sbi_message_t message;
+    ogs_sbi_header_t header;
+    ogs_sbi_request_t *request = NULL;
+    ogs_sbi_server_t *server = NULL;
+
+    OpenAPI_sdm_subscription_t SDMSubscription;
+
+    char *monres = NULL;
+
+    ogs_assert(amf_ue);
+    ogs_assert(amf_ue->supi);
+    ogs_assert(data);
+
+    memset(&message, 0, sizeof(message));
+    message.h.method = (char *)OGS_SBI_HTTP_METHOD_POST;
+    message.h.service.name = (char *)OGS_SBI_SERVICE_NAME_NUDM_SDM;
+    message.h.api.version = (char *)OGS_SBI_API_V2;
+    message.h.resource.component0 = amf_ue->supi;
+    message.h.resource.component1 =
+            (char *)OGS_SBI_RESOURCE_NAME_SDM_SUBSCRIPTIONS;
+
+    memset(&SDMSubscription, 0, sizeof(SDMSubscription));
+
+    SDMSubscription.nf_instance_id = ogs_sbi_self()->nf_instance->id;
+
+    server = ogs_list_first(&ogs_sbi_self()->server_list);
+    ogs_assert(server);
+
+    memset(&header, 0, sizeof(header));
+    header.service.name = (char *)OGS_SBI_SERVICE_NAME_NAMF_CALLBACK;
+    header.api.version = (char *)OGS_SBI_API_V1;
+    header.resource.component0 = amf_ue->supi;
+    header.resource.component1 =
+            (char *)OGS_SBI_RESOURCE_NAME_SDMSUBSCRIPTION_NOTIFY;
+    SDMSubscription.callback_reference =
+            ogs_sbi_server_uri(server, &header);
+    ogs_assert(SDMSubscription.callback_reference);
+
+    SDMSubscription.monitored_resource_uris = OpenAPI_list_create();
+
+    monres = ogs_msprintf("%s/%s", amf_ue->supi, (char *)data);
+    ogs_assert(monres);
+
+    OpenAPI_list_add(SDMSubscription.monitored_resource_uris, monres);
+    SDMSubscription.implicit_unsubscribe = 1;
+
+    message.SDMSubscription = &SDMSubscription;
+
+    request = ogs_sbi_build_request(&message);
+    ogs_assert(request);
+
+    ogs_free(monres);
+    OpenAPI_list_free(SDMSubscription.monitored_resource_uris);
+    ogs_free(SDMSubscription.callback_reference);
+
+    return request;
+}

open5gs_2.4.11.9.e9aac.tar.xz/src/amf/nudm-build.h -> open5gs_2.4.11.10.a99a7.tar.xz/src/amf/nudm-build.h Changed

open5gs_2.4.11.9.e9aac.tar.xz/src/amf/nudm-handler.c -> open5gs_2.4.11.10.a99a7.tar.xz/src/amf/nudm-handler.c Changed

@@ -220,6 +220,69 @@
         break;
 
     CASE(OGS_SBI_RESOURCE_NAME_UE_CONTEXT_IN_SMF_DATA)
+
+        if (amf_ue->data_change_subscription_id) {
+            /* we already have a SDM subscription to UDM; continue without
+             * subscribing again */
+            ogs_assert(true ==
+                amf_ue_sbi_discover_and_send(
+                    OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL, NULL,
+                    amf_npcf_am_policy_control_build_create, amf_ue, NULL));
+        }
+        else {
+            ogs_assert(true ==
+                amf_ue_sbi_discover_and_send(
+                    OGS_SBI_SERVICE_TYPE_NUDM_SDM, NULL,
+                    amf_nudm_sdm_build_subscription, amf_ue,
+                    (char *)OGS_SBI_RESOURCE_NAME_AM_DATA));
+        }
+        break;
+
+    CASE(OGS_SBI_RESOURCE_NAME_SDM_SUBSCRIPTIONS)
+
+        int rv;
+        ogs_sbi_message_t message;
+        ogs_sbi_header_t header;
+
+        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));
+            return OGS_ERROR;
+        }
+
+        memset(&header, 0, sizeof(header));
+        header.uri = recvmsg->http.location;
+
+        rv = ogs_sbi_parse_header(&message, &header);
+        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));
+            return OGS_ERROR;
+        }
+
+        if (!message.h.resource.component2) {
+            ogs_error("%s No Subscription ID %s",
+                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));
+            return OGS_ERROR;
+        }
+
+        if (amf_ue->data_change_subscription_id)
+            ogs_free(amf_ue->data_change_subscription_id);
+        amf_ue->data_change_subscription_id =
+            ogs_strdup(message.h.resource.component2);
+
+        ogs_sbi_header_free(&header);
+
         ogs_assert(true ==
             amf_ue_sbi_discover_and_send(
                 OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL, NULL,

open5gs_2.4.11.9.e9aac.tar.xz/src/udm/context.c -> open5gs_2.4.11.10.a99a7.tar.xz/src/udm/context.c Changed

open5gs_2.4.11.9.e9aac.tar.xz/src/udm/context.h -> open5gs_2.4.11.10.a99a7.tar.xz/src/udm/context.h Changed

open5gs_2.4.11.9.e9aac.tar.xz/src/udm/nudm-handler.c -> open5gs_2.4.11.10.a99a7.tar.xz/src/udm/nudm-handler.c Changed

@@ -479,3 +479,85 @@
 
     return true;
 }
+
+bool udm_nudm_sdm_handle_subscription_create(
+    udm_ue_t *udm_ue, ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
+{
+    ogs_sbi_message_t sendmsg;
+    ogs_sbi_response_t *response = NULL;
+    ogs_sbi_server_t *server = NULL;
+    ogs_sbi_header_t header;
+
+    OpenAPI_sdm_subscription_t *SDMSubscription = NULL;
+
+    ogs_assert(udm_ue);
+    ogs_assert(stream);
+    ogs_assert(recvmsg);
+
+    SDMSubscription = recvmsg->SDMSubscription;
+    if (!SDMSubscription) {
+        ogs_error("%s No SDMSubscription", udm_ue->supi);
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                recvmsg, "No SDMSubscription", udm_ue->supi));
+        return false;
+    }
+
+    if (!SDMSubscription->nf_instance_id) {
+        ogs_error("%s No nfInstanceId", udm_ue->supi);
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                recvmsg, "No nfInstanceId", udm_ue->supi));
+        return false;
+    }
+
+    if (!SDMSubscription->callback_reference) {
+        ogs_error("%s No callbackReference", udm_ue->supi);
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                recvmsg, "No callbackReference", udm_ue->supi));
+        return false;
+    }
+
+    if ((!SDMSubscription->monitored_resource_uris) &&
+        (!SDMSubscription->monitored_resource_uris->count)) {
+        ogs_error("%s No monitoredResourceUris", udm_ue->supi);
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                recvmsg, "No monitoredResourceUris", udm_ue->supi));
+        return false;
+    }
+
+    if (udm_ue->data_change_callback_uri)
+        ogs_free(udm_ue->data_change_callback_uri);
+    udm_ue->data_change_callback_uri =
+        ogs_strdup(SDMSubscription->callback_reference);
+
+
+    server = ogs_sbi_server_from_stream(stream);
+    ogs_assert(server);
+
+    memset(&header, 0, sizeof(header));
+    header.service.name = (char *)OGS_SBI_SERVICE_NAME_NUDM_SDM;
+    header.api.version = (char *)OGS_SBI_API_V2;
+    header.resource.component0 = udm_ue->supi;
+    header.resource.component1 =
+            (char *)OGS_SBI_RESOURCE_NAME_SDM_SUBSCRIPTIONS;
+    /* TODO: subscription id */
+    header.resource.component2 = udm_ue->ctx_id;
+
+    memset(&sendmsg, 0, sizeof(sendmsg));
+    sendmsg.http.location = ogs_sbi_server_uri(server, &header);
+
+    sendmsg.SDMSubscription = OpenAPI_sdm_subscription_copy(
+            sendmsg.SDMSubscription, SDMSubscription);
+
+    response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_CREATED);
+    ogs_assert(response);
+    ogs_sbi_server_send_response(stream, response);
+
+    ogs_free(sendmsg.http.location);
+    OpenAPI_sdm_subscription_free(sendmsg.SDMSubscription);
+
+    return true;
+}

open5gs_2.4.11.9.e9aac.tar.xz/src/udm/nudm-handler.h -> open5gs_2.4.11.10.a99a7.tar.xz/src/udm/nudm-handler.h Changed

open5gs_2.4.11.9.e9aac.tar.xz/src/udm/ue-sm.c -> open5gs_2.4.11.10.a99a7.tar.xz/src/udm/ue-sm.c Changed

@@ -163,6 +163,23 @@
                             "Invalid resource name", message->h.method));
                 END
                 break;
+
+            CASE(OGS_SBI_HTTP_METHOD_POST)
+                SWITCH(message->h.resource.component1)
+                CASE(OGS_SBI_RESOURCE_NAME_SDM_SUBSCRIPTIONS)
+                    udm_nudm_sdm_handle_subscription_create(
+                            udm_ue, stream, message);
+                    break;
+
+                DEFAULT
+                    ogs_error("%s Invalid resource name %s",
+                            udm_ue->suci, message->h.resource.component1);
+                    ogs_assert(true ==
+                        ogs_sbi_server_send_error(stream,
+                            OGS_SBI_HTTP_STATUS_BAD_REQUEST, message,
+                            "Invalid resource name", message->h.method));
+                END
+                break;
             DEFAULT
                 ogs_error("%s Invalid HTTP method %s",
                         udm_ue->supi, message->h.method);

Changes of Revision 14