Osmocom Open Build Service

commit_939b311b2d534d1e3b022f8db3f448d434e306ab.txt Deleted

commit_b9a3157467c86581c7cdef244f2674dcfa6cd250.txt Added

open5gs_2.6.1.26.939b3.dsc Deleted

@@ -1,38 +0,0 @@
-Format: 3.0 (native)
-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.6.1.26.939b3
-Maintainer: Harald Welte <laforge@gnumonks.org>
-Uploaders: Sukchan Lee <acetcom@gmail.com>
-Homepage: https://open5gs.org
-Standards-Version: 4.3.0
-Vcs-Browser: https://github.com/open5gs/open5gs
-Vcs-Git: git://github.com/open5gs/open5gs
-Build-Depends: debhelper (>= 11), git, pkg-config, meson (>= 0.43.0), cmake, flex, bison, libgnutls28-dev, libgcrypt-dev, libssl-dev, libidn11-dev, libmongoc-dev, libbson-dev, libsctp-dev, libyaml-dev, libmicrohttpd-dev, libcurl4-gnutls-dev, libnghttp2-dev, libtins-dev, libtalloc-dev
-Package-List:
- open5gs deb net optional arch=any
- open5gs-amf deb net optional arch=any
- open5gs-ausf deb net optional arch=any
- open5gs-bsf deb net optional arch=any
- open5gs-common deb net optional arch=any
- open5gs-dbg deb net optional arch=any
- open5gs-hss deb net optional arch=any
- open5gs-mme deb net optional arch=any
- open5gs-nrf deb net optional arch=any
- open5gs-nssf deb net optional arch=any
- open5gs-pcf deb net optional arch=any
- open5gs-pcrf deb net optional arch=any
- open5gs-scp deb net optional arch=any
- open5gs-sgwc deb net optional arch=any
- open5gs-sgwu deb net optional arch=any
- open5gs-smf deb net optional arch=any
- open5gs-udm deb net optional arch=any
- open5gs-udr deb net optional arch=any
- open5gs-upf deb net optional arch=any
-Checksums-Sha1:
- bd31c11fffcb2a34f8a3c844ae37f9a78241a1bc 14111796 open5gs_2.6.1.26.939b3.tar.xz
-Checksums-Sha256:
- afd945a3cef416dff318c68e4d8a0dc1386a303db447a0a9dce68e8fe8e0bcde 14111796 open5gs_2.6.1.26.939b3.tar.xz
-Files:
- 0b9775b2039d1c4fe2e5fefad1e7b4fe 14111796 open5gs_2.6.1.26.939b3.tar.xz

open5gs_2.6.1.27.b9a3.dsc Added

@@ -0,0 +1,38 @@
+Format: 3.0 (native)
+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.6.1.27.b9a3
+Maintainer: Harald Welte <laforge@gnumonks.org>
+Uploaders: Sukchan Lee <acetcom@gmail.com>
+Homepage: https://open5gs.org
+Standards-Version: 4.3.0
+Vcs-Browser: https://github.com/open5gs/open5gs
+Vcs-Git: git://github.com/open5gs/open5gs
+Build-Depends: debhelper (>= 11), git, pkg-config, meson (>= 0.43.0), cmake, flex, bison, libgnutls28-dev, libgcrypt-dev, libssl-dev, libidn11-dev, libmongoc-dev, libbson-dev, libsctp-dev, libyaml-dev, libmicrohttpd-dev, libcurl4-gnutls-dev, libnghttp2-dev, libtins-dev, libtalloc-dev
+Package-List:
+ open5gs deb net optional arch=any
+ open5gs-amf deb net optional arch=any
+ open5gs-ausf deb net optional arch=any
+ open5gs-bsf deb net optional arch=any
+ open5gs-common deb net optional arch=any
+ open5gs-dbg deb net optional arch=any
+ open5gs-hss deb net optional arch=any
+ open5gs-mme deb net optional arch=any
+ open5gs-nrf deb net optional arch=any
+ open5gs-nssf deb net optional arch=any
+ open5gs-pcf deb net optional arch=any
+ open5gs-pcrf deb net optional arch=any
+ open5gs-scp deb net optional arch=any
+ open5gs-sgwc deb net optional arch=any
+ open5gs-sgwu deb net optional arch=any
+ open5gs-smf deb net optional arch=any
+ open5gs-udm deb net optional arch=any
+ open5gs-udr deb net optional arch=any
+ open5gs-upf deb net optional arch=any
+Checksums-Sha1:
+ e43def5aa87a9b7e3a81c24aae0b15f6beb4b495 14113196 open5gs_2.6.1.27.b9a3.tar.xz
+Checksums-Sha256:
+ 0f1ff0f463d862f4982ae7948220b8290da61988b9f46bcb8ffdf4f6711914d0 14113196 open5gs_2.6.1.27.b9a3.tar.xz
+Files:
+ a19ed7eb09eff6114a8f0f0a9d889899 14113196 open5gs_2.6.1.27.b9a3.tar.xz

open5gs_2.6.1.26.939b3.tar.xz/.tarball-version -> open5gs_2.6.1.27.b9a3.tar.xz/.tarball-version Changed

open5gs_2.6.1.26.939b3.tar.xz/debian/changelog -> open5gs_2.6.1.27.b9a3.tar.xz/debian/changelog Changed

open5gs_2.6.1.26.939b3.tar.xz/lib/pfcp/build.c -> open5gs_2.6.1.27.b9a3.tar.xz/lib/pfcp/build.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -36,7 +36,7 @@
     req = &pfcp_message->pfcp_heartbeat_request;
 
     req->recovery_time_stamp.presence = 1;
-    req->recovery_time_stamp.u32 = ogs_pfcp_self()->pfcp_started;
+    req->recovery_time_stamp.u32 = ogs_pfcp_self()->local_recovery;
 
     pfcp_message->h.type = type;
     pkbuf = ogs_pfcp_build_msg(pfcp_message);
@@ -64,7 +64,7 @@
     rsp = &pfcp_message->pfcp_heartbeat_response;
 
     rsp->recovery_time_stamp.presence = 1;
-    rsp->recovery_time_stamp.u32 = ogs_pfcp_self()->pfcp_started;
+    rsp->recovery_time_stamp.u32 = ogs_pfcp_self()->local_recovery;
 
     pfcp_message->h.type = type;
     pkbuf = ogs_pfcp_build_msg(pfcp_message);
@@ -105,7 +105,7 @@
     req->node_id.len = node_id_len;
 
     req->recovery_time_stamp.presence = 1;
-    req->recovery_time_stamp.u32 = ogs_pfcp_self()->pfcp_started;
+    req->recovery_time_stamp.u32 = ogs_pfcp_self()->local_recovery;
 
     req->cp_function_features.presence = 1;
     req->cp_function_features.u8 = ogs_pfcp_self()->cp_function_features.octet5;
@@ -153,7 +153,7 @@
     rsp->cause.u8 = cause;
 
     rsp->recovery_time_stamp.presence = 1;
-    rsp->recovery_time_stamp.u32 = ogs_pfcp_self()->pfcp_started;
+    rsp->recovery_time_stamp.u32 = ogs_pfcp_self()->local_recovery;
 
     rsp->cp_function_features.presence = 1;
     rsp->cp_function_features.u8 = ogs_pfcp_self()->cp_function_features.octet5;
@@ -202,7 +202,7 @@
     req->node_id.len = node_id_len;
 
     req->recovery_time_stamp.presence = 1;
-    req->recovery_time_stamp.u32 = ogs_pfcp_self()->pfcp_started;
+    req->recovery_time_stamp.u32 = ogs_pfcp_self()->local_recovery;
 
     ogs_assert(ogs_pfcp_self()->up_function_features_len);
     req->up_function_features.presence = 1;
@@ -273,7 +273,7 @@
     rsp->cause.u8 = cause;
 
     rsp->recovery_time_stamp.presence = 1;
-    rsp->recovery_time_stamp.u32 = ogs_pfcp_self()->pfcp_started;
+    rsp->recovery_time_stamp.u32 = ogs_pfcp_self()->local_recovery;
 
     ogs_assert(ogs_pfcp_self()->up_function_features_len);
     rsp->up_function_features.presence = 1;

open5gs_2.6.1.26.939b3.tar.xz/lib/pfcp/context.c -> open5gs_2.6.1.27.b9a3.tar.xz/lib/pfcp/context.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -44,7 +44,7 @@
     /* Initialize SMF context */
     memset(&self, 0, sizeof(ogs_pfcp_context_t));
 
-    self.pfcp_started = ogs_time_ntp32_now();
+    self.local_recovery = ogs_time_ntp32_now();
 
     ogs_log_install_domain(&__ogs_pfcp_domain, "pfcp", ogs_core()->log.level);
 
@@ -455,9 +455,6 @@
                         uint64_t nr_cell_idOGS_MAX_NUM_OF_CELL_ID = {0,};
                         int num_of_nr_cell_id = 0;
 
-                        /* full list RR enabled by default */
-                        uint8_t rr_enable = 1;
-
                         if (ogs_yaml_iter_type(&pfcp_array) ==
                                 YAML_MAPPING_NODE) {
                             memcpy(&pfcp_iter, &pfcp_array,
@@ -621,9 +618,6 @@
                                 } while (
                                     ogs_yaml_iter_type(&nr_cell_id_iter) ==
                                         YAML_SEQUENCE_NODE);
-                            } else if (!strcmp(pfcp_key, "rr")) {
-                                const char *v = ogs_yaml_iter_value(&pfcp_iter);
-                                if (v) rr_enable = atoi(v);
                             } else
                                 ogs_warn("unknown key `%s`", pfcp_key);
                         }
@@ -664,7 +658,6 @@
                             memcpy(node->nr_cell_id, nr_cell_id,
                                     sizeof(node->nr_cell_id));
 
-                        node->rr_enable = rr_enable;
                     } while (ogs_yaml_iter_type(&pfcp_array) ==
                             YAML_SEQUENCE_NODE);
                 }

open5gs_2.6.1.26.939b3.tar.xz/lib/pfcp/context.h -> open5gs_2.6.1.27.b9a3.tar.xz/lib/pfcp/context.h Changed

open5gs_2.6.1.26.939b3.tar.xz/lib/pfcp/handler.c -> open5gs_2.6.1.27.b9a3.tar.xz/lib/pfcp/handler.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -24,7 +24,27 @@
         ogs_pfcp_heartbeat_request_t *req)
 {
     int rv;
+    ogs_assert(node);
     ogs_assert(xact);
+    ogs_assert(req);
+
+    if (req->recovery_time_stamp.presence == 0) {
+        ogs_error("No Recovery Time Stamp");
+        return false;
+    }
+
+    if (node->remote_recovery == 0 ||
+        node->remote_recovery == req->recovery_time_stamp.u32) {
+    } else if (node->remote_recovery < req->recovery_time_stamp.u32) {
+        ogs_error("Remote PFCP restarted %u<%u in Heartbeat REQ",
+            node->remote_recovery, req->recovery_time_stamp.u32);
+        node->restoration_required = true;
+    } else if (node->remote_recovery > req->recovery_time_stamp.u32) {
+        ogs_error("Invalid Recovery Time Stamp %u>%u in Heartbeat REQ",
+        node->remote_recovery, req->recovery_time_stamp.u32);
+    }
+
+    node->remote_recovery = req->recovery_time_stamp.u32;
 
     rv = ogs_pfcp_send_heartbeat_response(xact);
     if (rv != OGS_OK) {
@@ -39,9 +59,30 @@
         ogs_pfcp_node_t *node, ogs_pfcp_xact_t *xact,
         ogs_pfcp_heartbeat_response_t *rsp)
 {
+    ogs_assert(node);
     ogs_assert(xact);
+    ogs_assert(rsp);
+
     ogs_pfcp_xact_commit(xact);
 
+    if (rsp->recovery_time_stamp.presence == 0) {
+        ogs_error("No Recovery Time Stamp");
+        return false;
+    }
+
+    if (node->remote_recovery == 0 ||
+        node->remote_recovery == rsp->recovery_time_stamp.u32) {
+    } else if (node->remote_recovery < rsp->recovery_time_stamp.u32) {
+        ogs_error("Remote PFCP restarted %u<%u in Heartbeat RSP",
+            node->remote_recovery, rsp->recovery_time_stamp.u32);
+        node->restoration_required = true;
+    } else if (node->remote_recovery > rsp->recovery_time_stamp.u32) {
+        ogs_error("Invalid Recovery Time Stamp %u>%u in Heartbeat RSP",
+        node->remote_recovery, rsp->recovery_time_stamp.u32);
+    }
+
+    node->remote_recovery = rsp->recovery_time_stamp.u32;
+
     ogs_timer_start(node->t_no_heartbeat,
             ogs_app()->time.message.pfcp.no_heartbeat_duration);

open5gs_2.6.1.26.939b3.tar.xz/lib/pfcp/handler.h -> open5gs_2.6.1.27.b9a3.tar.xz/lib/pfcp/handler.h Changed

open5gs_2.6.1.26.939b3.tar.xz/lib/pfcp/path.c -> open5gs_2.6.1.27.b9a3.tar.xz/lib/pfcp/path.c Changed

open5gs_2.6.1.26.939b3.tar.xz/lib/pfcp/xact.c -> open5gs_2.6.1.27.b9a3.tar.xz/lib/pfcp/xact.c Changed

open5gs_2.6.1.26.939b3.tar.xz/lib/pfcp/xact.h -> open5gs_2.6.1.27.b9a3.tar.xz/lib/pfcp/xact.h Changed

open5gs_2.6.1.26.939b3.tar.xz/src/amf/context.c -> open5gs_2.6.1.27.b9a3.tar.xz/src/amf/context.c Changed

open5gs_2.6.1.26.939b3.tar.xz/src/amf/context.h -> open5gs_2.6.1.27.b9a3.tar.xz/src/amf/context.h Changed

@@ -490,6 +490,19 @@
     bool n1_released;
     bool n2_released;
 
+    /*
+     * To check if Reactivation Request has been used.
+     *
+     * During the PFCP recovery process,
+     * when a Reactivation Request is sent to PDU session release command,
+     * the UE simultaneously sends PDU session release complete and
+     * PDU session establishment request.
+     *
+     * In this case, old_gsm_type is PDU session release command and
+     * current_gsm_type is PDU session establishment request.
+     */
+    uint8_t old_gsm_type, current_gsm_type;
+
     struct {
         ogs_pkbuf_t *pdu_session_resource_setup_request;
         ogs_pkbuf_t *pdu_session_resource_modification_command;
@@ -762,6 +775,7 @@
         sbi_object = &sess->sbi; \
         ogs_assert(sbi_object); \
         \
+        ogs_error("AMF_SESS_CLEAR"); \
         if (ogs_list_count(&sbi_object->xact_list)) { \
             ogs_error("SBI running %d", \
                     ogs_list_count(&sbi_object->xact_list)); \

open5gs_2.6.1.26.939b3.tar.xz/src/amf/gmm-handler.c -> open5gs_2.6.1.27.b9a3.tar.xz/src/amf/gmm-handler.c Changed

open5gs_2.6.1.26.939b3.tar.xz/src/amf/namf-handler.c -> open5gs_2.6.1.27.b9a3.tar.xz/src/amf/namf-handler.c Changed

open5gs_2.6.1.26.939b3.tar.xz/src/amf/nsmf-handler.c -> open5gs_2.6.1.27.b9a3.tar.xz/src/amf/nsmf-handler.c Changed

@@ -565,7 +565,7 @@
                  * 1. PDUSessionResourceReleaseResponse
                  * 2. /nsmf-pdusession/v1/sm-contexts/{smContextRef}/modify
                  */
-                ogs_debug("%s:%d Receive Update SM context(N2-RELEASED)",
+                ogs_info("%s:%d Receive Update SM context(N2-RELEASED)",
                         amf_ue->supi, sess->psi);
 
                 sess->n2_released = true;
@@ -577,7 +577,7 @@
                  * 2. /nsmf-pdusession/v1/sm-contexts/{smContextRef}/modify
                  */
 
-                ogs_debug("%s:%d Receive Update SM context(N1-RELEASED)",
+                ogs_info("%s:%d Receive Update SM context(N1-RELEASED)",
                         amf_ue->supi, sess->psi);
 
                 sess->n1_released = true;
@@ -729,11 +729,15 @@
              * Remove 'amf_sess_t' context to call
              *   amf_nsmf_pdusession_handle_release_sm_context().
              */
+            ogs_info("%s:%d:%d%d:%d:%s "
+                    "/nsmf-pdusession/v1/sm-contexts/{smContextRef}/modify",
+                    amf_ue->supi, sess->psi, state,
+                    sess->n1_released, sess->n2_released,
+                    OpenAPI_resource_status_ToString(sess->resource_status));
+
             if (sess->n1_released == true &&
                 sess->n2_released == true &&
                 sess->resource_status == OpenAPI_resource_status_RELEASED) {
-
-                ogs_debug("%s:%d SM context remove", amf_ue->supi, sess->psi);
                 amf_nsmf_pdusession_handle_release_sm_context(
                         sess, AMF_RELEASE_SM_CONTEXT_NO_STATE);
             }
@@ -844,7 +848,37 @@
     amf_ue = sess->amf_ue;
     ogs_assert(amf_ue);
 
-    amf_sess_remove(sess);
+    /*
+     * To check if Reactivation Request has been used.
+     *
+     * During the PFCP recovery process,
+     * when a Reactivation Request is sent to PDU session release command,
+     * the UE simultaneously sends PDU session release complete and
+     * PDU session establishment request.
+     *
+     * In this case, old_gsm_type is PDU session release command and
+     * current_gsm_type is PDU session establishment request.
+     */
+    if (sess->old_gsm_type == OGS_NAS_5GS_PDU_SESSION_RELEASE_COMPLETE &&
+        sess->current_gsm_type ==
+            OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REQUEST) {
+        ogs_error("%s:%d Do not remove Session due to Reactivation-requested",
+                amf_ue->supi, sess->psi);
+
+        /* Initialize the context instead of using amf_sess_remove() */
+
+        sess->old_gsm_type = 0;
+        sess->current_gsm_type = 0;
+
+        sess->n1_released = false;
+        sess->n2_released = false;
+        sess->resource_status = OpenAPI_resource_status_NULL;
+
+    } else {
+        ogs_info("%s:%d Release SM Context state:%d",
+                amf_ue->supi, sess->psi, state);
+        amf_sess_remove(sess);
+    }
 
     if (state == AMF_RELEASE_SM_CONTEXT_REGISTRATION_ACCEPT) {
         /*

open5gs_2.6.1.26.939b3.tar.xz/src/pcf/context.c -> open5gs_2.6.1.27.b9a3.tar.xz/src/pcf/context.c Changed

open5gs_2.6.1.26.939b3.tar.xz/src/sgwc/pfcp-sm.c -> open5gs_2.6.1.27.b9a3.tar.xz/src/sgwc/pfcp-sm.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -124,6 +124,16 @@
         ogs_assert(xact);
 
         switch (message->h.type) {
+        case OGS_PFCP_HEARTBEAT_REQUEST_TYPE:
+            ogs_expect(true ==
+                ogs_pfcp_handle_heartbeat_request(node, xact,
+                    &message->pfcp_heartbeat_request));
+            break;
+        case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE:
+            ogs_expect(true ==
+                ogs_pfcp_handle_heartbeat_response(node, xact,
+                    &message->pfcp_heartbeat_response));
+            break;
         case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE:
             ogs_pfcp_cp_handle_association_setup_request(node, xact,
                     &message->pfcp_association_setup_request);
@@ -174,6 +184,13 @@
             OGS_PORT(&node->addr));
         ogs_timer_start(node->t_no_heartbeat,
                 ogs_app()->time.message.pfcp.no_heartbeat_duration);
+        ogs_assert(OGS_OK ==
+            ogs_pfcp_send_heartbeat_request(node, node_timeout));
+
+        if (node->restoration_required == true) {
+            node->restoration_required = false;
+            ogs_error("PFCP restoration");
+        }
         break;
     case OGS_FSM_EXIT_SIG:
         ogs_info("PFCP de-associated %s:%d",
@@ -200,12 +217,12 @@
 
         switch (message->h.type) {
         case OGS_PFCP_HEARTBEAT_REQUEST_TYPE:
-            ogs_assert(true ==
+            ogs_expect(true ==
                 ogs_pfcp_handle_heartbeat_request(node, xact,
                     &message->pfcp_heartbeat_request));
             break;
         case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE:
-            ogs_assert(true ==
+            ogs_expect(true ==
                 ogs_pfcp_handle_heartbeat_response(node, xact,
                     &message->pfcp_heartbeat_response));
             break;

open5gs_2.6.1.26.939b3.tar.xz/src/sgwu/context.c -> open5gs_2.6.1.27.b9a3.tar.xz/src/sgwu/context.c Changed

open5gs_2.6.1.26.939b3.tar.xz/src/sgwu/pfcp-sm.c -> open5gs_2.6.1.27.b9a3.tar.xz/src/sgwu/pfcp-sm.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -20,6 +20,7 @@
 #include "pfcp-path.h"
 #include "sxa-handler.h"
 
+static void pfcp_restoration(ogs_pfcp_node_t *node);
 static void node_timeout(ogs_pfcp_xact_t *xact, void *data);
 
 void sgwu_pfcp_state_initial(ogs_fsm_t *s, sgwu_event_t *e)
@@ -120,6 +121,16 @@
         ogs_assert(xact);
 
         switch (message->h.type) {
+        case OGS_PFCP_HEARTBEAT_REQUEST_TYPE:
+            ogs_expect(true ==
+                ogs_pfcp_handle_heartbeat_request(node, xact,
+                    &message->pfcp_heartbeat_request));
+            break;
+        case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE:
+            ogs_expect(true ==
+                ogs_pfcp_handle_heartbeat_response(node, xact,
+                    &message->pfcp_heartbeat_response));
+            break;
         case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE:
             ogs_pfcp_up_handle_association_setup_request(node, xact,
                     &message->pfcp_association_setup_request);
@@ -170,6 +181,14 @@
             OGS_PORT(&node->addr));
         ogs_timer_start(node->t_no_heartbeat,
                 ogs_app()->time.message.pfcp.no_heartbeat_duration);
+        ogs_assert(OGS_OK ==
+            ogs_pfcp_send_heartbeat_request(node, node_timeout));
+
+        if (node->restoration_required == true) {
+            pfcp_restoration(node);
+            node->restoration_required = false;
+            ogs_error("PFCP restoration");
+        }
         break;
     case OGS_FSM_EXIT_SIG:
         ogs_info("PFCP de-associated %s:%d",
@@ -188,14 +207,60 @@
 
         switch (message->h.type) {
         case OGS_PFCP_HEARTBEAT_REQUEST_TYPE:
-            ogs_assert(true ==
+            ogs_expect(true ==
                 ogs_pfcp_handle_heartbeat_request(node, xact,
                     &message->pfcp_heartbeat_request));
+            if (node->restoration_required == true) {
+                if (node->t_association) {
+        /*
+         * node->t_association that the PFCP entity attempts an association.
+         *
+         * In this case, even if Remote PFCP entity is restarted,
+         * PFCP restoration must be performed after PFCP association.
+         *
+         * Otherwise, Session related PFCP cannot be initiated
+         * because the peer PFCP entity is in a de-associated state.
+         */
+                    OGS_FSM_TRAN(s, sgwu_pfcp_state_will_associate);
+                } else {
+
+        /*
+         * If the peer PFCP entity is performing the association,
+         * Restoration can be performed immediately.
+         */
+                    pfcp_restoration(node);
+                    node->restoration_required = false;
+                    ogs_error("PFCP restoration");
+                }
+            }
             break;
         case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE:
-            ogs_assert(true ==
+            ogs_expect(true ==
                 ogs_pfcp_handle_heartbeat_response(node, xact,
                     &message->pfcp_heartbeat_response));
+            if (node->restoration_required == true) {
+                if (node->t_association) {
+        /*
+         * node->t_association that the PFCP entity attempts an association.
+         *
+         * In this case, even if Remote PFCP entity is restarted,
+         * PFCP restoration must be performed after PFCP association.
+         *
+         * Otherwise, Session related PFCP cannot be initiated
+         * because the peer PFCP entity is in a de-associated state.
+         */
+                    OGS_FSM_TRAN(s, sgwu_pfcp_state_will_associate);
+                } else {
+
+        /*
+         * If the peer PFCP entity is performing the association,
+         * Restoration can be performed immediately.
+         */
+                    pfcp_restoration(node);
+                    node->restoration_required = false;
+                    ogs_error("PFCP restoration");
+                }
+            }
             break;
         case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE:
             ogs_warn("PFCPREQ has already been associated %s:%d",
@@ -288,6 +353,19 @@
     }
 }
 
+static void pfcp_restoration(ogs_pfcp_node_t *node)
+{
+    sgwu_sess_t *sess = NULL, *next = NULL;
+
+    ogs_list_for_each_safe(&sgwu_self()->sess_list, next, sess) {
+        if (node == sess->pfcp_node) {
+            ogs_info("DELETION: F-SEIDUP:0x%lx CP:0x%lx",
+                (long)sess->sgwu_sxa_seid, (long)sess->sgwc_sxa_f_seid.seid);
+            sgwu_sess_remove(sess);
+        }
+    }
+}
+
 static void node_timeout(ogs_pfcp_xact_t *xact, void *data)
 {
     int rv;

open5gs_2.6.1.26.939b3.tar.xz/src/smf/pfcp-sm.c -> open5gs_2.6.1.27.b9a3.tar.xz/src/smf/pfcp-sm.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -22,6 +22,7 @@
 
 #include "n4-handler.h"
 
+static void reselect_upf(ogs_pfcp_node_t *node);
 static void node_timeout(ogs_pfcp_xact_t *xact, void *data);
 
 void smf_pfcp_state_initial(ogs_fsm_t *s, smf_event_t *e)
@@ -126,6 +127,16 @@
         ogs_assert(xact);
 
         switch (message->h.type) {
+        case OGS_PFCP_HEARTBEAT_REQUEST_TYPE:
+            ogs_expect(true ==
+                ogs_pfcp_handle_heartbeat_request(node, xact,
+                    &message->pfcp_heartbeat_request));
+            break;
+        case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE:
+            ogs_expect(true ==
+                ogs_pfcp_handle_heartbeat_response(node, xact,
+                    &message->pfcp_heartbeat_response));
+            break;
         case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE:
             ogs_pfcp_cp_handle_association_setup_request(node, xact,
                     &message->pfcp_association_setup_request);
@@ -176,6 +187,14 @@
             OGS_PORT(&node->addr));
         ogs_timer_start(node->t_no_heartbeat,
                 ogs_app()->time.message.pfcp.no_heartbeat_duration);
+        ogs_assert(OGS_OK ==
+            ogs_pfcp_send_heartbeat_request(node, node_timeout));
+
+        if (node->restoration_required == true) {
+            /* PFCP Restoration is being performed after PFCP association */
+            node->restoration_required = false;
+            ogs_error("PFCP restoration");
+        }
         break;
     case OGS_FSM_EXIT_SIG:
         ogs_info("PFCP de-associated %s:%d",
@@ -204,14 +223,57 @@
 
         switch (message->h.type) {
         case OGS_PFCP_HEARTBEAT_REQUEST_TYPE:
-            ogs_assert(true ==
+            ogs_expect(true ==
                 ogs_pfcp_handle_heartbeat_request(node, xact,
                     &message->pfcp_heartbeat_request));
+            if (node->restoration_required == true) {
+                if (node->t_association) {
+        /*
+         * node->t_association that the PFCP entity attempts an association.
+         *
+         * In this case, even if Remote PFCP entity is restarted,
+         * PFCP restoration must be performed after PFCP association.
+         *
+         * Otherwise, Session related PFCP cannot be initiated
+         * because the peer PFCP entity is in a de-associated state.
+         */
+                    OGS_FSM_TRAN(s, smf_pfcp_state_will_associate);
+                } else {
+
+        /*
+         * If the peer PFCP entity is performing the association,
+         * Restoration can be performed immediately.
+         */
+                    node->restoration_required = false;
+                    ogs_error("PFCP restoration");
+                }
+            }
             break;
         case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE:
-            ogs_assert(true ==
+            ogs_expect(true ==
                 ogs_pfcp_handle_heartbeat_response(node, xact,
                     &message->pfcp_heartbeat_response));
+            if (node->restoration_required == true) {
+        /*
+         * node->t_association that the PFCP entity attempts an association.
+         *
+         * In this case, even if Remote PFCP entity is restarted,
+         * PFCP restoration must be performed after PFCP association.
+         *
+         * Otherwise, Session related PFCP cannot be initiated
+         * because the peer PFCP entity is in a de-associated state.
+         */
+                if (node->t_association) {
+                    OGS_FSM_TRAN(s, smf_pfcp_state_will_associate);
+                } else {
+        /*
+         * If the peer PFCP entity is performing the association,
+         * Restoration can be performed immediately.
+         */
+                    node->restoration_required = false;
+                    ogs_error("PFCP restoration");
+                }
+            }
             break;
         case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE:
             ogs_warn("PFCPREQ has already been associated %s:%d",
@@ -347,34 +409,48 @@
     }
 }
 
-static void node_timeout(ogs_pfcp_xact_t *xact, void *data)
+static void reselect_upf(ogs_pfcp_node_t *node)
 {
-    int r, rv;
-
-    smf_event_t *e = NULL;
-    uint8_t type;
-    ogs_pfcp_node_t *node = NULL;
+    int r;
     smf_ue_t *smf_ue = NULL, *next_ue = NULL;;
+    ogs_pfcp_node_t *iter = NULL;
 
-    ogs_assert(xact);
-    type = xact->seq0.type;
+    ogs_assert(node);
 
-    switch (type) {
-    case OGS_PFCP_HEARTBEAT_REQUEST_TYPE:
-        node = data;
-        ogs_assert(node);
+    if (node->restoration_required == true) {
+        ogs_error("UPF has already been restarted");
+        return;
+    }
+
+    ogs_list_for_each(&ogs_pfcp_self()->pfcp_peer_list, iter) {
+        if (iter == node)
+            continue;
+        if (OGS_FSM_CHECK(&iter->sm, smf_pfcp_state_associated))
+            break;
+    }
 
-        ogs_list_for_each_safe(&smf_self()->smf_ue_list, next_ue, smf_ue) {
-            smf_sess_t *sess = NULL, *next_sess = NULL;;
-            ogs_assert(smf_ue);
+    if (iter == NULL) {
+        ogs_error("No UPF avaiable");
+        return;
+    }
 
-            ogs_list_for_each_safe(&smf_ue->sess_list, next_sess, sess) {
-                ogs_assert(sess);
+    ogs_list_for_each_safe(&smf_self()->smf_ue_list, next_ue, smf_ue) {
+        smf_sess_t *sess = NULL, *next_sess = NULL;;
+        ogs_assert(smf_ue);
+
+        ogs_list_for_each_safe(&smf_ue->sess_list, next_sess, sess) {
+            ogs_assert(sess);
+            if (sess->epc) {
+                ogs_error("%s:%s EPC restoration is not implemented",
+                        smf_ue->imsi_bcd, sess->session.name);
+            } else {
                 ogs_assert(sess->sm_context_ref);
 
                 if (node == sess->pfcp_node) {
                     smf_npcf_smpolicycontrol_param_t param;
 
+                    ogs_info("%s:%d SMF-initiated Deletion",
+                            smf_ue->supi, sess->psi);
                     ogs_assert(sess->sm_context_ref);
                     memset(&param, 0, sizeof(param));
                     r = smf_sbi_discover_and_send(
@@ -387,6 +463,35 @@
                 }
             }
         }
+    }
+}
+
+static void node_timeout(ogs_pfcp_xact_t *xact, void *data)
+{
+    int rv;
+
+    smf_event_t *e = NULL;
+    uint8_t type;
+
+    ogs_assert(xact);
+    type = xact->seq0.type;
+
+    switch (type) {
+    case OGS_PFCP_HEARTBEAT_REQUEST_TYPE:
+        ogs_assert(data);
+
+
+    /*
+     * The code below is not secure.
+     * Session does not differentiate between EPC and 5GC.
+     * And, it does not check whether there are other PFCP Nodes.
+     *
+     * So, UPF redundancy will be implemented later.
+     *
+     * We plan to do this again after testing with restoration first
+     * in case peer PFCP restarts.
+     */
+        reselect_upf(data);
 
         e = smf_event_new(SMF_EVT_N4_NO_HEARTBEAT);
         e->pfcp_node = data;

open5gs_2.6.1.26.939b3.tar.xz/src/upf/context.c -> open5gs_2.6.1.27.b9a3.tar.xz/src/upf/context.c Changed

open5gs_2.6.1.26.939b3.tar.xz/src/upf/pfcp-sm.c -> open5gs_2.6.1.27.b9a3.tar.xz/src/upf/pfcp-sm.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -25,6 +25,7 @@
 #include "pfcp-path.h"
 #include "n4-handler.h"
 
+static void pfcp_restoration(ogs_pfcp_node_t *node);
 static void node_timeout(ogs_pfcp_xact_t *xact, void *data);
 
 void upf_pfcp_state_initial(ogs_fsm_t *s, upf_event_t *e)
@@ -125,6 +126,16 @@
         ogs_assert(xact);
 
         switch (message->h.type) {
+        case OGS_PFCP_HEARTBEAT_REQUEST_TYPE:
+            ogs_expect(true ==
+                ogs_pfcp_handle_heartbeat_request(node, xact,
+                    &message->pfcp_heartbeat_request));
+            break;
+        case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE:
+            ogs_expect(true ==
+                ogs_pfcp_handle_heartbeat_response(node, xact,
+                    &message->pfcp_heartbeat_response));
+            break;
         case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE:
             ogs_pfcp_up_handle_association_setup_request(node, xact,
                     &message->pfcp_association_setup_request);
@@ -175,6 +186,14 @@
             OGS_PORT(&node->addr));
         ogs_timer_start(node->t_no_heartbeat,
                 ogs_app()->time.message.pfcp.no_heartbeat_duration);
+        ogs_assert(OGS_OK ==
+            ogs_pfcp_send_heartbeat_request(node, node_timeout));
+
+        if (node->restoration_required == true) {
+            pfcp_restoration(node);
+            node->restoration_required = false;
+            ogs_error("PFCP restoration");
+        }
         break;
     case OGS_FSM_EXIT_SIG:
         ogs_info("PFCP de-associated %s:%d",
@@ -193,14 +212,59 @@
 
         switch (message->h.type) {
         case OGS_PFCP_HEARTBEAT_REQUEST_TYPE:
-            ogs_assert(true ==
+            ogs_expect(true ==
                 ogs_pfcp_handle_heartbeat_request(node, xact,
                     &message->pfcp_heartbeat_request));
+            if (node->restoration_required == true) {
+                if (node->t_association) {
+        /*
+         * node->t_association that the PFCP entity attempts an association.
+         *
+         * In this case, even if Remote PFCP entity is restarted,
+         * PFCP restoration must be performed after PFCP association.
+         *
+         * Otherwise, Session related PFCP cannot be initiated
+         * because the peer PFCP entity is in a de-associated state.
+         */
+                    OGS_FSM_TRAN(s, upf_pfcp_state_will_associate);
+                } else {
+
+        /*
+         * If the peer PFCP entity is performing the association,
+         * Restoration can be performed immediately.
+         */
+                    pfcp_restoration(node);
+                    node->restoration_required = false;
+                    ogs_error("PFCP restoration");
+                }
+            }
             break;
         case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE:
-            ogs_assert(true ==
+            ogs_expect(true ==
                 ogs_pfcp_handle_heartbeat_response(node, xact,
                     &message->pfcp_heartbeat_response));
+            if (node->restoration_required == true) {
+        /*
+         * node->t_association that the PFCP entity attempts an association.
+         *
+         * In this case, even if Remote PFCP entity is restarted,
+         * PFCP restoration must be performed after PFCP association.
+         *
+         * Otherwise, Session related PFCP cannot be initiated
+         * because the peer PFCP entity is in a de-associated state.
+         */
+                if (node->t_association) {
+                    OGS_FSM_TRAN(s, upf_pfcp_state_will_associate);
+                } else {
+        /*
+         * If the peer PFCP entity is performing the association,
+         * Restoration can be performed immediately.
+         */
+                    pfcp_restoration(node);
+                    node->restoration_required = false;
+                    ogs_error("PFCP restoration");
+                }
+            }
             break;
         case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE:
             ogs_warn("PFCPREQ has already been associated %s:%d",
@@ -293,6 +357,23 @@
     }
 }
 
+static void pfcp_restoration(ogs_pfcp_node_t *node)
+{
+    upf_sess_t *sess = NULL, *next = NULL;
+    char buf1OGS_ADDRSTRLEN;
+    char buf2OGS_ADDRSTRLEN;
+
+    ogs_list_for_each_safe(&upf_self()->sess_list, next, sess) {
+        if (node == sess->pfcp_node) {
+            ogs_info("DELETION: F-SEIDUP:0x%lx CP:0x%lx IPv4%s IPv6%s",
+                (long)sess->upf_n4_seid, (long)sess->smf_n4_f_seid.seid,
+                sess->ipv4 ? OGS_INET_NTOP(&sess->ipv4->addr, buf1) : "",
+                sess->ipv6 ? OGS_INET6_NTOP(&sess->ipv6->addr, buf2) : "");
+            upf_sess_remove(sess);
+        }
+    }
+}
+
 static void node_timeout(ogs_pfcp_xact_t *xact, void *data)
 {
     int rv;

open5gs_2.6.1.26.939b3.tar.xz/tests/app/5gc-init.c -> open5gs_2.6.1.27.b9a3.tar.xz/tests/app/5gc-init.c Changed

open5gs_2.6.1.26.939b3.tar.xz/tests/handover/5gc-n2-test.c -> open5gs_2.6.1.27.b9a3.tar.xz/tests/handover/5gc-n2-test.c Changed

@@ -806,6 +806,9 @@
     rv = testgnb_ngap_send(ngap2, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
 
+    /* Waiting for N4 */
+    ogs_msleep(100);
+
     /* Receive End Mark */
     recvbuf = test_gtpu_read(gtpu1);
     ABTS_PTR_NOTNULL(tc, recvbuf);
@@ -923,6 +926,9 @@
     rv = testgnb_ngap_send(ngap1, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
 
+    /* Waiting for N4 */
+    ogs_msleep(100);
+
     /* Receive End Mark */
     recvbuf = test_gtpu_read(gtpu2);
     ABTS_PTR_NOTNULL(tc, recvbuf);
@@ -1838,6 +1844,9 @@
     rv = testgnb_ngap_send(ngap2, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
 
+    /* Waiting for N4 */
+    ogs_msleep(100);
+
     /* Receive End Mark */
     recvbuf = test_gtpu_read(gtpu1);
     ABTS_PTR_NOTNULL(tc, recvbuf);
@@ -1983,6 +1992,9 @@
     rv = testgnb_ngap_send(ngap1, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
 
+    /* Waiting for N4 */
+    ogs_msleep(100);
+
     /* Receive End Mark */
     recvbuf = test_gtpu_read(gtpu2);
     ABTS_PTR_NOTNULL(tc, recvbuf);
@@ -2488,6 +2500,9 @@
     rv = testgnb_ngap_send(ngap2, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
 
+    /* Waiting for N4 */
+    ogs_msleep(100);
+
     /* Receive End Mark */
     recvbuf = test_gtpu_read(gtpu1);
     ABTS_PTR_NOTNULL(tc, recvbuf);

Changes of Revision 202