Osmocom Open Build Service

commit_1dc4300203189b7f730f204e24252cb2a88c8d41.txt Deleted

commit_a6675250417135cad1163a75213d49dd0d194c2a.txt Added

open5gs_2.7.0.114.1dc43.dsc Deleted

@@ -1,39 +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-sepp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
-Architecture: any
-Version: 2.7.0.114.1dc43
-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-sepp 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:
- 710a36b206501c8e09c72ce58291afc79a4cc86d 14484400 open5gs_2.7.0.114.1dc43.tar.xz
-Checksums-Sha256:
- 4122583dbc15a955e5729210a109794ba083d44d93b62296116d4c91d0386a0f 14484400 open5gs_2.7.0.114.1dc43.tar.xz
-Files:
- 3ff2cd5e620342f8a7c01547d5c44844 14484400 open5gs_2.7.0.114.1dc43.tar.xz

open5gs_2.7.0.115.a667.dsc Added

@@ -0,0 +1,39 @@
+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-sepp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
+Architecture: any
+Version: 2.7.0.115.a667
+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-sepp 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:
+ 7d2d971594de7a8da4699076b36e14a2bc199e2b 14484764 open5gs_2.7.0.115.a667.tar.xz
+Checksums-Sha256:
+ 04f4a24f1b13cc3c0e32097e66c993f6dda8186e7440a0c13cc713dd829bf6f0 14484764 open5gs_2.7.0.115.a667.tar.xz
+Files:
+ 83446acf94c487c65f885d92f780ede1 14484764 open5gs_2.7.0.115.a667.tar.xz

open5gs_2.7.0.114.1dc43.tar.xz/.tarball-version -> open5gs_2.7.0.115.a667.tar.xz/.tarball-version Changed

open5gs_2.7.0.114.1dc43.tar.xz/debian/changelog -> open5gs_2.7.0.115.a667.tar.xz/debian/changelog Changed

open5gs_2.7.0.114.1dc43.tar.xz/lib/gtp/path.c -> open5gs_2.7.0.115.a667.tar.xz/lib/gtp/path.c Changed

open5gs_2.7.0.114.1dc43.tar.xz/lib/gtp/path.h -> open5gs_2.7.0.115.a667.tar.xz/lib/gtp/path.h Changed

open5gs_2.7.0.114.1dc43.tar.xz/lib/gtp/v2/message.c -> open5gs_2.7.0.115.a667.tar.xz/lib/gtp/v2/message.c Changed

open5gs_2.7.0.114.1dc43.tar.xz/lib/gtp/v2/message.h -> open5gs_2.7.0.115.a667.tar.xz/lib/gtp/v2/message.h Changed

open5gs_2.7.0.114.1dc43.tar.xz/lib/gtp/v2/path.c -> open5gs_2.7.0.115.a667.tar.xz/lib/gtp/v2/path.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.
  *
@@ -160,8 +160,8 @@
     return pkb_resp;
 }
 
-void ogs_gtp2_send_error_message(
-        ogs_gtp_xact_t *xact, uint32_t teid, uint8_t type, uint8_t cause_value)
+void ogs_gtp2_send_error_message(ogs_gtp_xact_t *xact,
+        int teid_presence, uint32_t teid, uint8_t type, uint8_t cause_value)
 {
     int rv;
     ogs_gtp2_message_t errmsg;
@@ -170,6 +170,7 @@
     ogs_pkbuf_t *pkbuf = NULL;
 
     memset(&errmsg, 0, sizeof(ogs_gtp2_message_t));
+    errmsg.h.teid_presence = teid_presence;
     errmsg.h.teid = teid;
     errmsg.h.type = type;
 
@@ -257,7 +258,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_ECHO_REQUEST_TYPE;
-    h.teid = 0;
+    h.teid_presence = OGS_GTP2_TEID_NO_PRESENCE;
 
     pkbuf = ogs_gtp2_build_echo_request(h.type, recovery, features);
     if (!pkbuf) {
@@ -284,7 +285,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_ECHO_RESPONSE_TYPE;
-    h.teid = 0;
+    h.teid_presence = OGS_GTP2_TEID_NO_PRESENCE;
 
     pkbuf = ogs_gtp2_build_echo_response(h.type, recovery, features);
     if (!pkbuf) {

open5gs_2.7.0.114.1dc43.tar.xz/lib/gtp/v2/path.h -> open5gs_2.7.0.115.a667.tar.xz/lib/gtp/v2/path.h Changed

open5gs_2.7.0.114.1dc43.tar.xz/lib/gtp/v2/support/gtp-tlv.py -> open5gs_2.7.0.115.a667.tar.xz/lib/gtp/v2/support/gtp-tlv.py Changed

open5gs_2.7.0.114.1dc43.tar.xz/lib/gtp/xact.c -> open5gs_2.7.0.115.a667.tar.xz/lib/gtp/xact.c Changed

@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
  * Copyright (C) 2022 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+ * Copyright (C) 2023-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -407,7 +408,7 @@
         return OGS_ERROR;
     }
 
-    if (hdesc->type > OGS_GTP2_VERSION_NOT_SUPPORTED_INDICATION_TYPE) {
+    if (hdesc->teid_presence) {
         gtp_hlen = OGS_GTPV2C_HEADER_LEN;
     } else {
         gtp_hlen = OGS_GTPV2C_HEADER_LEN - OGS_GTP2_TEID_LEN;
@@ -420,12 +421,12 @@
     h->version = 2;
     h->type = hdesc->type;
 
-    if (hdesc->type > OGS_GTP2_VERSION_NOT_SUPPORTED_INDICATION_TYPE) {
-        h->teid_presence = 1;
+    if (hdesc->teid_presence) {
+        h->teid_presence = OGS_GTP2_TEID_PRESENCE;
         h->teid = htobe32(hdesc->teid);
         h->sqn = OGS_GTP2_XID_TO_SQN(xact->xid);
     } else {
-        h->teid_presence = 0;
+        h->teid_presence = OGS_GTP2_TEID_NO_PRESENCE;
         h->sqn_only = OGS_GTP2_XID_TO_SQN(xact->xid);
     }
     h->length = htobe16(pkbuf->len - 4);

open5gs_2.7.0.114.1dc43.tar.xz/lib/pfcp/message.c -> open5gs_2.7.0.115.a667.tar.xz/lib/pfcp/message.c Changed

open5gs_2.7.0.114.1dc43.tar.xz/lib/pfcp/message.h -> open5gs_2.7.0.115.a667.tar.xz/lib/pfcp/message.h Changed

open5gs_2.7.0.114.1dc43.tar.xz/lib/pfcp/path.c -> open5gs_2.7.0.115.a667.tar.xz/lib/pfcp/path.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -140,7 +140,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_HEARTBEAT_REQUEST_TYPE;
-    h.seid = 0;
+    h.seid_presence = OGS_PFCP_SEID_NO_PRESENCE;
 
     xact = ogs_pfcp_xact_local_create(node, cb, node);
     if (!xact) {
@@ -176,7 +176,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_HEARTBEAT_RESPONSE_TYPE;
-    h.seid = 0;
+    h.seid_presence = OGS_PFCP_SEID_NO_PRESENCE;
 
     pkbuf = ogs_pfcp_build_heartbeat_response(h.type);
     if (!pkbuf) {
@@ -217,7 +217,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE;
-    h.seid = 0;
+    h.seid_presence = OGS_PFCP_SEID_NO_PRESENCE;
 
     xact = ogs_pfcp_xact_local_create(node, cb, node);
     if (!xact) {
@@ -254,7 +254,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_ASSOCIATION_SETUP_RESPONSE_TYPE;
-    h.seid = 0;
+    h.seid_presence = OGS_PFCP_SEID_NO_PRESENCE;
 
     pkbuf = ogs_pfcp_cp_build_association_setup_response(h.type, cause);
     if (!pkbuf) {
@@ -286,7 +286,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE;
-    h.seid = 0;
+    h.seid_presence = OGS_PFCP_SEID_NO_PRESENCE;
 
     xact = ogs_pfcp_xact_local_create(node, cb, node);
     if (!xact) {
@@ -323,7 +323,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_ASSOCIATION_SETUP_RESPONSE_TYPE;
-    h.seid = 0;
+    h.seid_presence = OGS_PFCP_SEID_NO_PRESENCE;
 
     pkbuf = ogs_pfcp_up_build_association_setup_response(h.type, cause);
     if (!pkbuf) {
@@ -468,7 +468,7 @@
 }
 
 void ogs_pfcp_send_error_message(
-    ogs_pfcp_xact_t *xact, uint64_t seid, uint8_t type,
+    ogs_pfcp_xact_t *xact, int seid_presence, uint64_t seid, uint8_t type,
     uint8_t cause_value, uint16_t offending_ie_value)
 {
     int rv;
@@ -480,6 +480,7 @@
     ogs_assert(xact);
 
     memset(&errmsg, 0, sizeof(ogs_pfcp_message_t));
+    errmsg.h.seid_presence = seid_presence;
     errmsg.h.seid = seid;
     errmsg.h.type = type;

open5gs_2.7.0.114.1dc43.tar.xz/lib/pfcp/path.h -> open5gs_2.7.0.115.a667.tar.xz/lib/pfcp/path.h Changed

open5gs_2.7.0.114.1dc43.tar.xz/lib/pfcp/support/pfcp-tlv.py -> open5gs_2.7.0.115.a667.tar.xz/lib/pfcp/support/pfcp-tlv.py Changed

open5gs_2.7.0.114.1dc43.tar.xz/lib/pfcp/xact.c -> open5gs_2.7.0.115.a667.tar.xz/lib/pfcp/xact.c Changed

open5gs_2.7.0.114.1dc43.tar.xz/src/mme/mme-gtp-path.c -> open5gs_2.7.0.115.a667.tar.xz/src/mme/mme-gtp-path.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -254,6 +254,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_CREATE_SESSION_REQUEST_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = mme_s11_build_create_session_request(h.type, sess, create_action);
@@ -293,6 +294,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_MODIFY_BEARER_REQUEST_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = mme_s11_build_modify_bearer_request(h.type, mme_ue, uli_presence);
@@ -332,6 +334,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_DELETE_SESSION_REQUEST_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sgw_ue->sgw_s11_teid;
 
     s11buf = mme_s11_build_delete_session_request(h.type, sess, action);
@@ -400,6 +403,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_CREATE_BEARER_RESPONSE_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = mme_s11_build_create_bearer_response(h.type, bearer, cause_value);
@@ -445,6 +449,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_UPDATE_BEARER_RESPONSE_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = mme_s11_build_update_bearer_response(h.type, bearer, cause_value);
@@ -490,6 +495,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_DELETE_BEARER_RESPONSE_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = mme_s11_build_delete_bearer_response(h.type, bearer, cause_value);
@@ -525,6 +531,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_RELEASE_ACCESS_BEARERS_REQUEST_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = mme_s11_build_release_access_bearers_request(h.type);
@@ -622,6 +629,7 @@
     /* Build Downlink data notification ack */
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_DOWNLINK_DATA_NOTIFICATION_ACKNOWLEDGE_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sgw_ue->sgw_s11_teid;
 
     s11buf = mme_s11_build_downlink_data_notification_ack(h.type, cause_value);
@@ -657,6 +665,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_CREATE_INDIRECT_DATA_FORWARDING_TUNNEL_REQUEST_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = mme_s11_build_create_indirect_data_forwarding_tunnel_request(
@@ -696,6 +705,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_DELETE_INDIRECT_DATA_FORWARDING_TUNNEL_REQUEST_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_TLV_MAX_HEADROOM);
@@ -738,6 +748,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_BEARER_RESOURCE_COMMAND_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = mme_s11_build_bearer_resource_command(h.type, bearer, nas_message);

open5gs_2.7.0.114.1dc43.tar.xz/src/mme/mme-s11-handler.c -> open5gs_2.7.0.115.a667.tar.xz/src/mme/mme-s11-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.
  *
@@ -820,7 +820,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp2_send_error_message(xact, sgw_ue ? sgw_ue->sgw_s11_teid : 0,
+        ogs_gtp2_send_error_message(xact,
+                sgw_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgw_ue ? sgw_ue->sgw_s11_teid : 0,
                 OGS_GTP2_CREATE_BEARER_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -856,7 +858,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp2_send_error_message(xact, sgw_ue ? sgw_ue->sgw_s11_teid : 0,
+        ogs_gtp2_send_error_message(xact,
+                sgw_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgw_ue ? sgw_ue->sgw_s11_teid : 0,
                 OGS_GTP2_CREATE_BEARER_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -1012,7 +1016,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp2_send_error_message(xact, sgw_ue ? sgw_ue->sgw_s11_teid : 0,
+        ogs_gtp2_send_error_message(xact,
+                sgw_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgw_ue ? sgw_ue->sgw_s11_teid : 0,
                 OGS_GTP2_UPDATE_BEARER_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -1183,7 +1189,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp2_send_error_message(xact, sgw_ue ? sgw_ue->sgw_s11_teid : 0,
+        ogs_gtp2_send_error_message(xact,
+                sgw_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgw_ue ? sgw_ue->sgw_s11_teid : 0,
                 OGS_GTP2_DELETE_BEARER_RESPONSE_TYPE,
                 OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND);
         return;
@@ -1440,7 +1448,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp2_send_error_message(xact, sgw_ue ? sgw_ue->sgw_s11_teid : 0,
+        ogs_gtp2_send_error_message(xact,
+                sgw_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgw_ue ? sgw_ue->sgw_s11_teid : 0,
                 OGS_GTP2_DOWNLINK_DATA_NOTIFICATION_ACKNOWLEDGE_TYPE,
                 OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND);
         return;

open5gs_2.7.0.114.1dc43.tar.xz/src/sgwc/gtp-path.c -> open5gs_2.7.0.115.a667.tar.xz/src/sgwc/gtp-path.c Changed

open5gs_2.7.0.114.1dc43.tar.xz/src/sgwc/pfcp-path.c -> open5gs_2.7.0.115.a667.tar.xz/src/sgwc/pfcp-path.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.
  *
@@ -222,6 +222,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_SESSION_MODIFICATION_REQUEST_TYPE;
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->sgwu_sxa_seid;
 
     sxabuf = sgwc_sxa_build_bearer_to_modify_list(h.type, sess, xact);
@@ -302,6 +303,7 @@
  *   over N4 towards another SMF or another PFCP entity in the SMF
  *   as specified in clause 5.22.2 and clause 5.22.3.
  */
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->sgwu_sxa_seid;
 
     sxabuf = sgwc_sxa_build_session_establishment_request(h.type, sess);
@@ -389,6 +391,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_SESSION_MODIFICATION_REQUEST_TYPE;
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->sgwu_sxa_seid;
 
     sxabuf = sgwc_sxa_build_bearer_to_modify_list(h.type, sess, xact);
@@ -437,6 +440,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_SESSION_DELETION_REQUEST_TYPE;
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->sgwu_sxa_seid;
 
     sxabuf = sgwc_sxa_build_session_deletion_request(h.type, sess);
@@ -466,6 +470,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_SESSION_REPORT_RESPONSE_TYPE;
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->sgwu_sxa_seid;
 
     sxabuf = ogs_pfcp_build_session_report_response(h.type, cause);

open5gs_2.7.0.114.1dc43.tar.xz/src/sgwc/s11-handler.c -> open5gs_2.7.0.115.a667.tar.xz/src/sgwc/s11-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.
  *
@@ -173,8 +173,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+        ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -214,8 +215,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+        ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -262,8 +264,9 @@
     /* Check if selected SGW-U is associated with SGW-C */
     ogs_assert(sess->pfcp_node);
     if (!OGS_FSM_CHECK(&sess->pfcp_node->sm, sgwc_pfcp_state_associated)) {
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+        ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE,
                 OGS_GTP2_CAUSE_REMOTE_PEER_NOT_RESPONDING);
         return;
@@ -423,8 +426,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+        ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -531,8 +535,9 @@
 
     if (i == 0) {
         ogs_error("No Bearer");
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+        ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -609,8 +614,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+        ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_DELETE_SESSION_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -629,8 +635,9 @@
         indication->operation_indication == 1 &&
         indication->scope_indication == 1) {
         ogs_error("Invalid Indication");
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+        ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_DELETE_SESSION_RESPONSE_TYPE,
                 OGS_GTP2_CAUSE_INVALID_MESSAGE_FORMAT);
         return;
@@ -656,6 +663,7 @@
 
     } else {
         message->h.type = OGS_GTP2_DELETE_SESSION_REQUEST_TYPE;
+        message->h.teid_presence = OGS_GTP2_TEID_PRESENCE;
         message->h.teid = sess->pgw_s5c_teid;
 
         gtpbuf = ogs_gtp2_build_msg(message);
@@ -762,7 +770,9 @@
             sgwc_pfcp_send_bearer_modification_request(
                 bearer, NULL, NULL,
                 OGS_PFCP_MODIFY_UL_ONLY|OGS_PFCP_MODIFY_REMOVE));
-        ogs_gtp_send_error_message(s5c_xact, sess ? sess->pgw_s5c_teid : 0,
+        ogs_gtp2_send_error_message(s5c_xact,
+                sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sess ? sess->pgw_s5c_teid : 0,
                 OGS_GTP2_CREATE_BEARER_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -781,7 +791,9 @@
             sgwc_pfcp_send_bearer_modification_request(
                 bearer, NULL, NULL,
                 OGS_PFCP_MODIFY_UL_ONLY|OGS_PFCP_MODIFY_REMOVE));
-        ogs_gtp_send_error_message(s5c_xact, sess ? sess->pgw_s5c_teid : 0,
+        ogs_gtp2_send_error_message(s5c_xact,
+                sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sess ? sess->pgw_s5c_teid : 0,
                 OGS_GTP2_CREATE_BEARER_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -915,7 +927,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp_send_error_message(s5c_xact, sess ? sess->pgw_s5c_teid : 0,
+        ogs_gtp2_send_error_message(s5c_xact,
+                sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sess ? sess->pgw_s5c_teid : 0,
                 OGS_GTP2_UPDATE_BEARER_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -930,7 +944,9 @@
     cause_value = cause->value;
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
         ogs_error("GTP Bearer Cause VALUE:%d", cause_value);
-        ogs_gtp_send_error_message(s5c_xact, sess ? sess->pgw_s5c_teid : 0,
+        ogs_gtp2_send_error_message(s5c_xact,
+                sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sess ? sess->pgw_s5c_teid : 0,
                 OGS_GTP2_UPDATE_BEARER_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -940,7 +956,9 @@
     cause_value = cause->value;
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
         ogs_error("GTP Cause Value:%d", cause_value);
-        ogs_gtp_send_error_message(s5c_xact, sess ? sess->pgw_s5c_teid : 0,
+        ogs_gtp2_send_error_message(s5c_xact,
+                sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sess ? sess->pgw_s5c_teid : 0,
                 OGS_GTP2_UPDATE_BEARER_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -957,6 +975,7 @@
         sess->sgw_s5c_teid, sess->pgw_s5c_teid);
 
     message->h.type = OGS_GTP2_UPDATE_BEARER_RESPONSE_TYPE;
+    message->h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     message->h.teid = sess->pgw_s5c_teid;
 
     pkbuf = ogs_gtp2_build_msg(message);
@@ -1128,8 +1147,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+        ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_RELEASE_ACCESS_BEARERS_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -1235,8 +1255,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+        ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_CREATE_INDIRECT_DATA_FORWARDING_TUNNEL_RESPONSE_TYPE,
                 cause_value);
         return;
@@ -1253,8 +1274,9 @@
     for (i = 0; req->bearer_contextsi.presence; i++) {
         if (req->bearer_contextsi.eps_bearer_id.presence == 0) {
             ogs_error("No EBI");
-            ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+            ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_CREATE_INDIRECT_DATA_FORWARDING_TUNNEL_RESPONSE_TYPE,
                 OGS_GTP2_CAUSE_MANDATORY_IE_MISSING);
             return;
@@ -1276,8 +1298,9 @@

open5gs_2.7.0.114.1dc43.tar.xz/src/sgwc/s5c-handler.c -> open5gs_2.7.0.115.a667.tar.xz/src/sgwc/s5c-handler.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024444 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -122,8 +122,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+        ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -160,8 +161,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+        ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -185,8 +187,10 @@
         bearer_cause = cause->value;
         if (bearer_cause != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
             ogs_error("GTP Bearer Cause VALUE:%d", bearer_cause);
-            ogs_gtp_send_error_message(
-                    s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+            ogs_gtp2_send_error_message(s11_xact,
+                    sgwc_ue ? OGS_GTP2_TEID_PRESENCE :
+                        OGS_GTP2_TEID_NO_PRESENCE,
+                    sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                     OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, bearer_cause);
             return;
         }
@@ -199,8 +203,9 @@
         session_cause !=
             OGS_GTP2_CAUSE_NEW_PDN_TYPE_DUE_TO_SINGLE_ADDRESS_BEARER_ONLY) {
         ogs_error("GTP Cause VALUE:%d", session_cause);
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+        ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, session_cause);
         return;
     }
@@ -233,8 +238,10 @@
         bearer = sgwc_bearer_find_by_sess_ebi(sess,
                     rsp->bearer_contexts_createdi.eps_bearer_id.u8);
         if (!bearer) {
-            ogs_gtp_send_error_message(
-                    s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+            ogs_gtp2_send_error_message(s11_xact,
+                    sgwc_ue ? OGS_GTP2_TEID_PRESENCE :
+                        OGS_GTP2_TEID_NO_PRESENCE,
+                    sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                     OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE,
                     OGS_GTP2_CAUSE_MANDATORY_IE_MISSING);
             return;
@@ -253,8 +260,10 @@
 
         rv = ogs_gtp2_f_teid_to_ip(pgw_s5u_teid, &ul_tunnel->remote_ip);
         if (rv != OGS_OK) {
-            ogs_gtp_send_error_message(
-                    s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+            ogs_gtp2_send_error_message(s11_xact,
+                    sgwc_ue ? OGS_GTP2_TEID_PRESENCE :
+                        OGS_GTP2_TEID_NO_PRESENCE,
+                    sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                     OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE,
                     OGS_GTP2_CAUSE_MANDATORY_IE_MISSING);
             return;
@@ -354,13 +363,15 @@
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
         if (modify_action == OGS_GTP_MODIFY_IN_PATH_SWITCH_REQUEST)
-            ogs_gtp_send_error_message(
-                    s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                    OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
+            ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+                OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
         else
-            ogs_gtp_send_error_message(
-                    s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                    OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE, cause_value);
+            ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+                OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE, cause_value);
         return;
     }
 
@@ -376,13 +387,15 @@
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
         if (modify_action == OGS_GTP_MODIFY_IN_PATH_SWITCH_REQUEST)
-            ogs_gtp_send_error_message(
-                    s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                    OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
+            ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+                OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
         else
-            ogs_gtp_send_error_message(
-                    s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                    OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE, cause_value);
+            ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+                OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE, cause_value);
         return;
     }
 
@@ -394,13 +407,15 @@
     if (session_cause != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
         ogs_error("GTP Cause VALUE:%d", session_cause);
         if (modify_action == OGS_GTP_MODIFY_IN_PATH_SWITCH_REQUEST)
-            ogs_gtp_send_error_message(
-                    s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                    OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, session_cause);
+            ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+                OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, session_cause);
         else
-            ogs_gtp_send_error_message(
-                    s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                    OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE, session_cause);
+            ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+                OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE, session_cause);
         return;
     }
 
@@ -420,6 +435,7 @@
             sgwc_gtp_send_create_session_response(sess, s11_xact));
     } else {
         message->h.type = OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE;
+        message->h.teid_presence = OGS_GTP2_TEID_PRESENCE;
         message->h.teid = sgwc_ue->mme_s11_teid;
 
         pkbuf = ogs_gtp2_build_msg(message);
@@ -493,8 +509,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+        ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_DELETE_SESSION_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -573,7 +590,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp_send_error_message(s5c_xact, sess ? sess->pgw_s5c_teid : 0,
+        ogs_gtp2_send_error_message(s5c_xact,
+                sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sess ? sess->pgw_s5c_teid : 0,
                 OGS_GTP2_CREATE_BEARER_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -601,7 +620,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp_send_error_message(s5c_xact, sess ? sess->pgw_s5c_teid : 0,
+        ogs_gtp2_send_error_message(s5c_xact,
+                sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sess ? sess->pgw_s5c_teid : 0,
                 OGS_GTP2_CREATE_BEARER_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -631,7 +652,9 @@
 
     rv = ogs_gtp2_f_teid_to_ip(pgw_s5u_teid, &ul_tunnel->remote_ip);
     if (rv != OGS_OK) {
-        ogs_gtp_send_error_message(s5c_xact, sess ? sess->pgw_s5c_teid : 0,
+        ogs_gtp2_send_error_message(s5c_xact,
+                sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sess ? sess->pgw_s5c_teid : 0,
                 OGS_GTP2_CREATE_BEARER_RESPONSE_TYPE,
                 OGS_GTP2_CAUSE_MANDATORY_IE_MISSING);

open5gs_2.7.0.114.1dc43.tar.xz/src/sgwc/sxa-handler.c -> open5gs_2.7.0.115.a667.tar.xz/src/sgwc/sxa-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.
  *
@@ -245,8 +245,9 @@
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
         if (sess) sgwc_ue = sess->sgwc_ue;
-        ogs_gtp_send_error_message(
-                s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+        ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                 OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -269,10 +270,11 @@
 
         if (dl_tunnel->local_addr == NULL && dl_tunnel->local_addr6 == NULL) {
             ogs_error("No UP F-TEID");
-            ogs_gtp_send_error_message(
-                    s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                    OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE,
-                    OGS_GTP2_CAUSE_GRE_KEY_NOT_FOUND);
+            ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+                OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE,
+                OGS_GTP2_CAUSE_GRE_KEY_NOT_FOUND);
             return;
         }
 
@@ -347,6 +349,7 @@
         memset(&send_message, 0, sizeof(ogs_gtp2_message_t));
 
         send_message.h.type = OGS_GTP2_MODIFY_BEARER_REQUEST_TYPE;
+        send_message.h.teid_presence = OGS_GTP2_TEID_PRESENCE;
         send_message.h.teid = sess->pgw_s5c_teid;
 
         /* Send Control Plane(DL) : SGW-S5C */
@@ -396,6 +399,7 @@
 
         /* Create Session Request */
         recv_message->h.type = OGS_GTP2_CREATE_SESSION_REQUEST_TYPE;
+        recv_message->h.teid_presence = OGS_GTP2_TEID_PRESENCE;
         recv_message->h.teid = sess->pgw_s5c_teid;
 
         /* Send Control Plane(DL) : SGW-S5C */
@@ -581,9 +585,10 @@
             s5c_xact = pfcp_xact->assoc_xact;
 
             if (s5c_xact) {
-                ogs_gtp_send_error_message(
-                        s5c_xact, sess ? sess->pgw_s5c_teid : 0,
-                        OGS_GTP2_DELETE_BEARER_RESPONSE_TYPE, cause_value);
+                ogs_gtp2_send_error_message(s5c_xact,
+                    sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                    sess ? sess->pgw_s5c_teid : 0,
+                    OGS_GTP2_DELETE_BEARER_RESPONSE_TYPE, cause_value);
             }
 
             sgwc_bearer_remove(bearer);
@@ -591,8 +596,9 @@
             s5c_xact = pfcp_xact->assoc_xact;
             ogs_assert(s5c_xact);
 
-            ogs_gtp_send_error_message(
-                    s5c_xact, sess ? sess->pgw_s5c_teid : 0,
+            ogs_gtp2_send_error_message(s5c_xact,
+                    sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                    sess ? sess->pgw_s5c_teid : 0,
                     OGS_GTP2_CREATE_BEARER_RESPONSE_TYPE, cause_value);
 
 
@@ -601,16 +607,20 @@
                 s11_xact = pfcp_xact->assoc_xact;
                 ogs_assert(s11_xact);
 
-                ogs_gtp_send_error_message(
-                        s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+                ogs_gtp2_send_error_message(s11_xact,
+                        sgwc_ue ? OGS_GTP2_TEID_PRESENCE :
+                            OGS_GTP2_TEID_NO_PRESENCE,
+                        sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                         OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
 
             } else if (flags & OGS_PFCP_MODIFY_DL_ONLY) {
                 s11_xact = pfcp_xact->assoc_xact;
                 ogs_assert(s11_xact);
 
-                ogs_gtp_send_error_message(
-                        s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+                ogs_gtp2_send_error_message(s11_xact,
+                        sgwc_ue ? OGS_GTP2_TEID_PRESENCE :
+                            OGS_GTP2_TEID_NO_PRESENCE,
+                        sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
                         OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE, cause_value);
             } else {
                 ogs_fatal("Invalid modify_flags0x%llx", (long long)flags);
@@ -620,9 +630,10 @@
             s11_xact = pfcp_xact->assoc_xact;
             ogs_assert(s11_xact);
 
-            ogs_gtp_send_error_message(
-                    s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                    OGS_GTP2_RELEASE_ACCESS_BEARERS_RESPONSE_TYPE, cause_value);
+            ogs_gtp2_send_error_message(s11_xact,
+                sgwc_ue ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
+                OGS_GTP2_RELEASE_ACCESS_BEARERS_RESPONSE_TYPE, cause_value);
         }
 
         ogs_pfcp_xact_commit(pfcp_xact);
@@ -694,6 +705,7 @@
 
                 send_message.h.type =
                 OGS_GTP2_DELETE_INDIRECT_DATA_FORWARDING_TUNNEL_RESPONSE_TYPE;
+                send_message.h.teid_presence = OGS_GTP2_TEID_PRESENCE;
                 send_message.h.teid = sgwc_ue->mme_s11_teid;
 
                 pkbuf = ogs_gtp2_build_msg(&send_message);
@@ -720,6 +732,7 @@
             if (s5c_xact) {
                 ogs_assert(recv_message);
                 recv_message->h.type = OGS_GTP2_DELETE_BEARER_RESPONSE_TYPE;
+                recv_message->h.teid_presence = OGS_GTP2_TEID_PRESENCE;
                 recv_message->h.teid = sess->pgw_s5c_teid;
 
                 pkbuf = ogs_gtp2_build_msg(recv_message);
@@ -769,6 +782,7 @@
             gtp_req->bearer_contexts.s1_u_enodeb_f_teid.len = len;
 
             recv_message->h.type = OGS_GTP2_CREATE_BEARER_REQUEST_TYPE;
+            recv_message->h.teid_presence = OGS_GTP2_TEID_PRESENCE;
             recv_message->h.teid = sgwc_ue->mme_s11_teid;
 
             pkbuf = ogs_gtp2_build_msg(recv_message);
@@ -836,6 +850,7 @@
             gtp_rsp->bearer_contexts.s5_s8_u_pgw_f_teid.len = len;
 
             recv_message->h.type = OGS_GTP2_CREATE_BEARER_RESPONSE_TYPE;
+            recv_message->h.teid_presence = OGS_GTP2_TEID_PRESENCE;
             recv_message->h.teid = sess->pgw_s5c_teid;
 
             pkbuf = ogs_gtp2_build_msg(recv_message);
@@ -962,6 +977,7 @@
 
                 send_message.h.type =
                 OGS_GTP2_CREATE_INDIRECT_DATA_FORWARDING_TUNNEL_RESPONSE_TYPE;
+                send_message.h.teid_presence = OGS_GTP2_TEID_PRESENCE;
                 send_message.h.teid = sgwc_ue->mme_s11_teid;
 
                 pkbuf = ogs_gtp2_build_msg(&send_message);
@@ -1046,6 +1062,7 @@
             }
 
             recv_message->h.type = OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE;
+            recv_message->h.teid_presence = OGS_GTP2_TEID_PRESENCE;
             recv_message->h.teid = sgwc_ue->mme_s11_teid;
 
             pkbuf = ogs_gtp2_build_msg(recv_message);
@@ -1083,6 +1100,7 @@
 
                 if (indication && indication->handover_indication) {
                     recv_message->h.type = OGS_GTP2_MODIFY_BEARER_REQUEST_TYPE;
+                    recv_message->h.teid_presence = OGS_GTP2_TEID_PRESENCE;
                     recv_message->h.teid = sess->pgw_s5c_teid;
 
                     pkbuf = ogs_gtp2_build_msg(recv_message);
@@ -1168,6 +1186,7 @@
                     }
 
                     send_message.h.type = OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE;
+                    send_message.h.teid_presence = OGS_GTP2_TEID_PRESENCE;
                     send_message.h.teid = sgwc_ue->mme_s11_teid;
 
                     pkbuf = ogs_gtp2_build_msg(&send_message);
@@ -1233,6 +1252,7 @@
 
                 send_message.h.type =
                     OGS_GTP2_RELEASE_ACCESS_BEARERS_RESPONSE_TYPE;
+                send_message.h.teid_presence = OGS_GTP2_TEID_PRESENCE;
                 send_message.h.teid = sgwc_ue->mme_s11_teid;
 
                 pkbuf = ogs_gtp2_build_msg(&send_message);
@@ -1264,6 +1284,7 @@
 {
     int rv;
     uint8_t cause_value = 0;
+    int teid_presence = OGS_GTP2_TEID_NO_PRESENCE;
     uint32_t teid = 0;
 
     sgwc_ue_t *sgwc_ue = NULL;
@@ -1315,6 +1336,8 @@
          * 2. SMF sends Delete Session Response to SGW/MME.
          */
         if (sess) sgwc_ue = sess->sgwc_ue;

open5gs_2.7.0.114.1dc43.tar.xz/src/sgwu/pfcp-path.c -> open5gs_2.7.0.115.a667.tar.xz/src/sgwu/pfcp-path.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -180,6 +180,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_SESSION_ESTABLISHMENT_RESPONSE_TYPE;
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->sgwc_sxa_f_seid.seid;
 
     sxabuf = sgwu_sxa_build_session_establishment_response(
@@ -213,6 +214,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_SESSION_MODIFICATION_RESPONSE_TYPE;
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->sgwc_sxa_f_seid.seid;
 
     sxabuf = sgwu_sxa_build_session_modification_response(
@@ -245,6 +247,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_SESSION_DELETION_RESPONSE_TYPE;
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->sgwc_sxa_f_seid.seid;
 
     sxabuf = sgwu_sxa_build_session_deletion_response(h.type, sess);
@@ -295,6 +298,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_SESSION_REPORT_REQUEST_TYPE;
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->sgwc_sxa_f_seid.seid;
 
     xact = ogs_pfcp_xact_local_create(sess->pfcp_node, sess_timeout, sess);

open5gs_2.7.0.114.1dc43.tar.xz/src/sgwu/sxa-handler.c -> open5gs_2.7.0.115.a667.tar.xz/src/sgwu/sxa-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.
  *
@@ -45,7 +45,8 @@
 
     if (!sess) {
         ogs_error("No Context");
-        ogs_pfcp_send_error_message(xact, 0,
+        ogs_pfcp_send_error_message(xact,
+                OGS_PFCP_SEID_NO_PRESENCE, 0,
                 OGS_PFCP_SESSION_ESTABLISHMENT_RESPONSE_TYPE,
                 OGS_PFCP_CAUSE_MANDATORY_IE_MISSING, 0);
         return;
@@ -142,7 +143,9 @@
 
 cleanup:
     ogs_pfcp_sess_clear(&sess->pfcp);
-    ogs_pfcp_send_error_message(xact, sess ? sess->sgwu_sxa_seid : 0,
+    ogs_pfcp_send_error_message(xact,
+            sess ? OGS_PFCP_SEID_PRESENCE : OGS_PFCP_SEID_NO_PRESENCE,
+            sess ? sess->sgwu_sxa_seid : 0,
             OGS_PFCP_SESSION_ESTABLISHMENT_RESPONSE_TYPE,
             cause_value, offending_ie_value);
 }
@@ -168,7 +171,8 @@
 
     if (!sess) {
         ogs_error("No Context");
-        ogs_pfcp_send_error_message(xact, 0,
+        ogs_pfcp_send_error_message(xact,
+                OGS_PFCP_SEID_NO_PRESENCE, 0,
                 OGS_PFCP_SESSION_MODIFICATION_RESPONSE_TYPE,
                 OGS_PFCP_CAUSE_SESSION_CONTEXT_NOT_FOUND, 0);
         return;
@@ -309,7 +313,9 @@
 
 cleanup:
     ogs_pfcp_sess_clear(&sess->pfcp);
-    ogs_pfcp_send_error_message(xact, sess ? sess->sgwu_sxa_seid : 0,
+    ogs_pfcp_send_error_message(xact,
+            sess ? OGS_PFCP_SEID_PRESENCE : OGS_PFCP_SEID_NO_PRESENCE,
+            sess ? sess->sgwu_sxa_seid : 0,
             OGS_PFCP_SESSION_MODIFICATION_RESPONSE_TYPE,
             cause_value, offending_ie_value);
 }
@@ -325,7 +331,8 @@
 
     if (!sess) {
         ogs_error("No Context");
-        ogs_pfcp_send_error_message(xact, 0,
+        ogs_pfcp_send_error_message(xact,
+                OGS_PFCP_SEID_NO_PRESENCE, 0,
                 OGS_PFCP_SESSION_DELETION_RESPONSE_TYPE,
                 OGS_PFCP_CAUSE_SESSION_CONTEXT_NOT_FOUND, 0);
         return;

open5gs_2.7.0.114.1dc43.tar.xz/src/smf/binding.c -> open5gs_2.7.0.115.a667.tar.xz/src/smf/binding.c Changed

open5gs_2.7.0.114.1dc43.tar.xz/src/smf/gsm-sm.c -> open5gs_2.7.0.115.a667.tar.xz/src/smf/gsm-sm.c Changed

@@ -1,6 +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.
  *
@@ -74,7 +73,9 @@
         ogs_gtp1_send_error_message(gtp_xact, sess->sgw_s5c_teid,
             OGS_GTP1_CREATE_PDP_CONTEXT_RESPONSE_TYPE, gtp_cause);
     else
-        ogs_gtp2_send_error_message(gtp_xact, sess->sgw_s5c_teid,
+        ogs_gtp2_send_error_message(gtp_xact,
+            sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+            sess->sgw_s5c_teid,
             OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, gtp_cause);
 }
 
@@ -85,7 +86,9 @@
         ogs_gtp1_send_error_message(gtp_xact, sess->sgw_s5c_teid,
             OGS_GTP1_DELETE_PDP_CONTEXT_RESPONSE_TYPE, gtp_cause);
     else
-        ogs_gtp2_send_error_message(gtp_xact, sess->sgw_s5c_teid,
+        ogs_gtp2_send_error_message(gtp_xact,
+            sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+            sess->sgw_s5c_teid,
             OGS_GTP2_DELETE_SESSION_RESPONSE_TYPE, gtp_cause);
 }
 
@@ -775,8 +778,10 @@
                             sess, e->gtp_xact,
                             &gtp2_message->delete_session_request);
             if (gtp2_cause != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-                ogs_gtp2_send_error_message(e->gtp_xact, sess->sgw_s5c_teid,
-                        OGS_GTP2_DELETE_SESSION_RESPONSE_TYPE, gtp2_cause);
+                ogs_gtp2_send_error_message(e->gtp_xact,
+                    sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                    sess->sgw_s5c_teid,
+                    OGS_GTP2_DELETE_SESSION_RESPONSE_TYPE, gtp2_cause);
                 return;
             }
             OGS_FSM_TRAN(s, smf_gsm_state_wait_pfcp_deletion);

open5gs_2.7.0.114.1dc43.tar.xz/src/smf/gtp-path.c -> open5gs_2.7.0.115.a667.tar.xz/src/smf/gtp-path.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -444,6 +444,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sess->sgw_s5c_teid;
 
     pkbuf = smf_s5c_build_create_session_response(h.type, sess);
@@ -478,6 +479,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sess->sgw_s5c_teid;
 
     pkbuf = smf_s5c_build_modify_bearer_response(
@@ -511,6 +513,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_DELETE_SESSION_RESPONSE_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sess->sgw_s5c_teid;
 
     pkbuf = smf_s5c_build_delete_session_response(h.type, sess);
@@ -548,6 +551,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_DELETE_BEARER_REQUEST_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sess->sgw_s5c_teid;
 
     pkbuf = smf_s5c_build_delete_bearer_request(

open5gs_2.7.0.114.1dc43.tar.xz/src/smf/n4-handler.c -> open5gs_2.7.0.115.a667.tar.xz/src/smf/n4-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.
  *
@@ -971,6 +971,7 @@
 
             memset(&h, 0, sizeof(ogs_gtp2_header_t));
             h.teid = sess->sgw_s5c_teid;
+            h.teid_presence = OGS_GTP2_TEID_PRESENCE;
             h.type = OGS_GTP2_DELETE_BEARER_REQUEST_TYPE;
 
             pkbuf = smf_s5c_build_delete_bearer_request(
@@ -1182,7 +1183,8 @@
     }
 
     if (cause_value != OGS_PFCP_CAUSE_REQUEST_ACCEPTED) {
-        ogs_pfcp_send_error_message(pfcp_xact, 0,
+        ogs_pfcp_send_error_message(pfcp_xact,
+                OGS_PFCP_SEID_NO_PRESENCE, 0,
                 OGS_PFCP_SESSION_REPORT_RESPONSE_TYPE,
                 cause_value, 0);
         return;
@@ -1222,7 +1224,8 @@
                     if (paging_policy_indication_value) {
                         ogs_warn("Not implement - "
                                 "Paging Policy Indication Value");
-                        ogs_pfcp_send_error_message(pfcp_xact, 0,
+                        ogs_pfcp_send_error_message(pfcp_xact,
+                                OGS_PFCP_SEID_NO_PRESENCE, 0,
                                 OGS_PFCP_SESSION_REPORT_RESPONSE_TYPE,
                                 OGS_PFCP_CAUSE_SERVICE_NOT_SUPPORTED, 0);
                         return;
@@ -1232,7 +1235,8 @@
                         qos_flow = smf_qos_flow_find_by_qfi(sess, qfi);
                         if (!qos_flow) {
                             ogs_error("Cannot find the QoS Flow%d", qfi);
-                            ogs_pfcp_send_error_message(pfcp_xact, 0,
+                            ogs_pfcp_send_error_message(pfcp_xact,
+                                OGS_PFCP_SEID_NO_PRESENCE, 0,
                                 OGS_PFCP_SESSION_REPORT_RESPONSE_TYPE,
                                 OGS_PFCP_CAUSE_SESSION_CONTEXT_NOT_FOUND, 0);
                             return;
@@ -1257,7 +1261,8 @@
 
         if (!pdr) {
             ogs_error("No Context");
-            ogs_pfcp_send_error_message(pfcp_xact, 0,
+            ogs_pfcp_send_error_message(pfcp_xact,
+                    OGS_PFCP_SEID_NO_PRESENCE, 0,
                     OGS_PFCP_SESSION_REPORT_RESPONSE_TYPE,
                     OGS_PFCP_CAUSE_SESSION_CONTEXT_NOT_FOUND, 0);
             return;

open5gs_2.7.0.114.1dc43.tar.xz/src/smf/pfcp-path.c -> open5gs_2.7.0.115.a667.tar.xz/src/smf/pfcp-path.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.
  *
@@ -353,6 +353,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_SESSION_MODIFICATION_REQUEST_TYPE;
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->upf_n4_seid;
 
     n4buf = (*modify_list)(h.type, sess, xact);
@@ -430,6 +431,7 @@
  *   over N4 towards another SMF or another PFCP entity in the SMF
  *   as specified in clause 5.22.2 and clause 5.22.3.
  */
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->upf_n4_seid;
 
     n4buf = smf_n4_build_session_establishment_request(h.type, sess, xact);
@@ -532,6 +534,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_SESSION_DELETION_REQUEST_TYPE;
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->upf_n4_seid;
 
     n4buf = smf_n4_build_session_deletion_request(h.type, sess);
@@ -605,6 +608,7 @@
  *   over N4 towards another SMF or another PFCP entity in the SMF
  *   as specified in clause 5.22.2 and clause 5.22.3.
  */
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->upf_n4_seid;
 
     n4buf = smf_n4_build_session_establishment_request(h.type, sess, xact);
@@ -748,6 +752,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_SESSION_DELETION_REQUEST_TYPE;
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->upf_n4_seid;
 
     n4buf = smf_n4_build_session_deletion_request(h.type, sess);
@@ -846,6 +851,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_SESSION_REPORT_RESPONSE_TYPE;
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->upf_n4_seid;
 
     sxabuf = ogs_pfcp_build_session_report_response(h.type, cause);

open5gs_2.7.0.114.1dc43.tar.xz/src/smf/pfcp-sm.c -> open5gs_2.7.0.115.a667.tar.xz/src/smf/pfcp-sm.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.
  *
@@ -317,7 +317,8 @@
                         OGS_GTP1_CREATE_PDP_CONTEXT_RESPONSE_TYPE,
                         OGS_GTP1_CAUSE_CONTEXT_NOT_FOUND);
                 else
-                    ogs_gtp2_send_error_message(gtp_xact, 0,
+                    ogs_gtp2_send_error_message(gtp_xact,
+                        OGS_GTP2_TEID_NO_PRESENCE, 0,
                         OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE,
                         OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND);
                 break;
@@ -352,7 +353,8 @@
                         OGS_GTP1_DELETE_PDP_CONTEXT_RESPONSE_TYPE,
                         OGS_GTP1_CAUSE_CONTEXT_NOT_FOUND);
                 else
-                    ogs_gtp2_send_error_message(gtp_xact, 0,
+                    ogs_gtp2_send_error_message(gtp_xact,
+                        OGS_GTP2_TEID_NO_PRESENCE, 0,
                         OGS_GTP2_DELETE_SESSION_RESPONSE_TYPE,
                         OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND);
                 break;

open5gs_2.7.0.114.1dc43.tar.xz/src/smf/s5c-handler.c -> open5gs_2.7.0.115.a667.tar.xz/src/smf/s5c-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.
  *
@@ -504,7 +504,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp2_send_error_message(gtp_xact, sess ? sess->sgw_s5c_teid : 0,
+        ogs_gtp2_send_error_message(gtp_xact,
+                sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sess ? sess->sgw_s5c_teid : 0,
                 OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE, cause_value);
         return;
     }
@@ -1186,7 +1188,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp2_send_error_message(xact, sess ? sess->sgw_s5c_teid : 0,
+        ogs_gtp2_send_error_message(xact,
+                sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sess ? sess->sgw_s5c_teid : 0,
                 OGS_GTP2_BEARER_RESOURCE_FAILURE_INDICATION_TYPE, cause_value);
         return;
     }
@@ -1211,7 +1215,9 @@
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_gtp2_send_error_message(xact, sess ? sess->sgw_s5c_teid : 0,
+        ogs_gtp2_send_error_message(xact,
+                sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sess ? sess->sgw_s5c_teid : 0,
                 OGS_GTP2_BEARER_RESOURCE_FAILURE_INDICATION_TYPE, cause_value);
         return;
     }
@@ -1240,8 +1246,10 @@
             pf = smf_pf_find_by_id(bearer, tft.pfi.identifier+1);
             if (pf) {
                 if (reconfigure_packet_filter(pf, &tft, i) < 0) {
-                    ogs_gtp2_send_error_message(
-                        xact, sess ? sess->sgw_s5c_teid : 0,
+                    ogs_gtp2_send_error_message(xact,
+                        sess ? OGS_GTP2_TEID_PRESENCE :
+                            OGS_GTP2_TEID_NO_PRESENCE,
+                        sess ? sess->sgw_s5c_teid : 0,
                         OGS_GTP2_BEARER_RESOURCE_FAILURE_INDICATION_TYPE,
                         OGS_GTP2_CAUSE_SEMANTIC_ERRORS_IN_PACKET_FILTER);
                     return;
@@ -1309,8 +1317,9 @@
             ogs_assert(pf);
 
             if (reconfigure_packet_filter(pf, &tft, i) < 0) {
-                ogs_gtp2_send_error_message(
-                    xact, sess ? sess->sgw_s5c_teid : 0,
+                ogs_gtp2_send_error_message(xact,
+                    sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                    sess ? sess->sgw_s5c_teid : 0,
                     OGS_GTP2_BEARER_RESOURCE_FAILURE_INDICATION_TYPE,
                     OGS_GTP2_CAUSE_SEMANTIC_ERRORS_IN_PACKET_FILTER);
                 return;
@@ -1396,7 +1405,9 @@
 
     if (tft_update == 0 && tft_delete == 0 && qos_update == 0) {
         /* No modification */
-        ogs_gtp2_send_error_message(xact, sess ? sess->sgw_s5c_teid : 0,
+        ogs_gtp2_send_error_message(xact,
+                sess ? OGS_GTP2_TEID_PRESENCE : OGS_GTP2_TEID_NO_PRESENCE,
+                sess ? sess->sgw_s5c_teid : 0,
                 OGS_GTP2_BEARER_RESOURCE_FAILURE_INDICATION_TYPE,
                 OGS_GTP2_CAUSE_SERVICE_NOT_SUPPORTED);
         return;
@@ -1422,6 +1433,7 @@
     } else {
         memset(&h, 0, sizeof(ogs_gtp2_header_t));
         h.teid = sess->sgw_s5c_teid;
+        h.teid_presence = OGS_GTP2_TEID_PRESENCE;
         h.type = OGS_GTP2_UPDATE_BEARER_REQUEST_TYPE;
 
         pkbuf = smf_s5c_build_update_bearer_request(

open5gs_2.7.0.114.1dc43.tar.xz/src/smf/smf-sm.c -> open5gs_2.7.0.115.a667.tar.xz/src/smf/smf-sm.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.
  *
@@ -144,7 +144,8 @@
             }
             if (!sess) {
                 ogs_error("No Session");
-                ogs_gtp2_send_error_message(gtp_xact, 0,
+                ogs_gtp2_send_error_message(gtp_xact,
+                        OGS_GTP2_TEID_NO_PRESENCE, 0,
                         OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE,
                         OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND);
                 break;
@@ -158,7 +159,8 @@
             smf_metrics_inst_gtp_node_inc(smf_gnode->metrics, SMF_METR_GTP_NODE_CTR_S5C_RX_DELETESESSIONREQ);
             if (!sess) {
                 ogs_error("No Session");
-                ogs_gtp2_send_error_message(gtp_xact, 0,
+                ogs_gtp2_send_error_message(gtp_xact,
+                        OGS_GTP2_TEID_NO_PRESENCE, 0,
                         OGS_GTP2_DELETE_SESSION_RESPONSE_TYPE,
                         OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND);
                 break;

open5gs_2.7.0.114.1dc43.tar.xz/src/upf/n4-handler.c -> open5gs_2.7.0.115.a667.tar.xz/src/upf/n4-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.
  *
@@ -69,7 +69,8 @@
 
     if (!sess) {
         ogs_error("No Context");
-        ogs_pfcp_send_error_message(xact, 0,
+        ogs_pfcp_send_error_message(xact,
+                OGS_PFCP_SEID_NO_PRESENCE, 0,
                 OGS_PFCP_SESSION_ESTABLISHMENT_RESPONSE_TYPE,
                 OGS_PFCP_CAUSE_MANDATORY_IE_MISSING, 0);
         upf_metrics_inst_by_cause_add(OGS_PFCP_CAUSE_MANDATORY_IE_MISSING,
@@ -214,7 +215,9 @@
     upf_metrics_inst_by_cause_add(cause_value,
             UPF_METR_CTR_SM_N4SESSIONESTABFAIL, 1);
     ogs_pfcp_sess_clear(&sess->pfcp);
-    ogs_pfcp_send_error_message(xact, sess ? sess->smf_n4_f_seid.seid : 0,
+    ogs_pfcp_send_error_message(xact,
+            sess ? OGS_PFCP_SEID_PRESENCE : OGS_PFCP_SEID_NO_PRESENCE,
+            sess ? sess->smf_n4_f_seid.seid : 0,
             OGS_PFCP_SESSION_ESTABLISHMENT_RESPONSE_TYPE,
             cause_value, offending_ie_value);
 }
@@ -240,7 +243,8 @@
 
     if (!sess) {
         ogs_error("No Context");
-        ogs_pfcp_send_error_message(xact, 0,
+        ogs_pfcp_send_error_message(xact,
+                OGS_PFCP_SEID_NO_PRESENCE, 0,
                 OGS_PFCP_SESSION_MODIFICATION_RESPONSE_TYPE,
                 OGS_PFCP_CAUSE_SESSION_CONTEXT_NOT_FOUND, 0);
         return;
@@ -413,7 +417,9 @@
 
 cleanup:
     ogs_pfcp_sess_clear(&sess->pfcp);
-    ogs_pfcp_send_error_message(xact, sess ? sess->smf_n4_f_seid.seid : 0,
+    ogs_pfcp_send_error_message(xact,
+            sess ? OGS_PFCP_SEID_PRESENCE : OGS_PFCP_SEID_NO_PRESENCE,
+            sess ? sess->smf_n4_f_seid.seid : 0,
             OGS_PFCP_SESSION_MODIFICATION_RESPONSE_TYPE,
             cause_value, offending_ie_value);
 }
@@ -431,7 +437,8 @@
 
     if (!sess) {
         ogs_error("No Context");
-        ogs_pfcp_send_error_message(xact, 0,
+        ogs_pfcp_send_error_message(xact,
+                OGS_PFCP_SEID_NO_PRESENCE, 0,
                 OGS_PFCP_SESSION_DELETION_RESPONSE_TYPE,
                 OGS_PFCP_CAUSE_SESSION_CONTEXT_NOT_FOUND, 0);
         return;

open5gs_2.7.0.114.1dc43.tar.xz/src/upf/pfcp-path.c -> open5gs_2.7.0.115.a667.tar.xz/src/upf/pfcp-path.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -183,6 +183,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_SESSION_ESTABLISHMENT_RESPONSE_TYPE;
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->smf_n4_f_seid.seid;
 
     n4buf = upf_n4_build_session_establishment_response(
@@ -216,6 +217,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_SESSION_MODIFICATION_RESPONSE_TYPE;
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->smf_n4_f_seid.seid;
 
     n4buf = upf_n4_build_session_modification_response(
@@ -248,6 +250,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_SESSION_DELETION_RESPONSE_TYPE;
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->smf_n4_f_seid.seid;
 
     n4buf = upf_n4_build_session_deletion_response(h.type, sess);
@@ -300,6 +303,7 @@
 
     memset(&h, 0, sizeof(ogs_pfcp_header_t));
     h.type = OGS_PFCP_SESSION_REPORT_REQUEST_TYPE;
+    h.seid_presence = OGS_PFCP_SEID_PRESENCE;
     h.seid = sess->smf_n4_f_seid.seid;
 
     xact = ogs_pfcp_xact_local_create(sess->pfcp_node, sess_timeout, sess);

open5gs_2.7.0.114.1dc43.tar.xz/tests/non3gpp/gtp-path.c -> open5gs_2.7.0.115.a667.tar.xz/tests/non3gpp/gtp-path.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019,2020 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2024 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -135,6 +135,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_CREATE_SESSION_REQUEST_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sess->smf_s2b_c_teid;
 
     pkbuf = test_s2b_build_create_session_request(h.type, sess, handover_ind);
@@ -166,6 +167,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_DELETE_SESSION_REQUEST_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sess->smf_s2b_c_teid;
 
     pkbuf = test_s2b_build_delete_session_request(h.type, sess);
@@ -201,6 +203,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_CREATE_BEARER_RESPONSE_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sess->smf_s2b_c_teid;
 
     pkbuf = test_s2b_build_create_bearer_response(h.type, bearer);
@@ -236,6 +239,7 @@
 
     memset(&h, 0, sizeof(ogs_gtp2_header_t));
     h.type = OGS_GTP2_DELETE_BEARER_RESPONSE_TYPE;
+    h.teid_presence = OGS_GTP2_TEID_PRESENCE;
     h.teid = sess->smf_s2b_c_teid;
 
     pkbuf = test_s2b_build_delete_bearer_response(h.type, bearer);

Changes of Revision 419