Projects
osmocom:nightly
open5gs
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 23
View file
open5gs_2.4.8.202207190002.dsc -> open5gs_2.4.8.202207200002.dsc
Changed
@@ -2,7 +2,7 @@ Source: open5gs Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg Architecture: any -Version: 2.4.8.202207190002 +Version: 2.4.8.202207200002 Maintainer: Harald Welte <laforge@gnumonks.org> Uploaders: Sukchan Lee <acetcom@gmail.com> Homepage: https://open5gs.org @@ -30,8 +30,8 @@ open5gs-udr deb net optional arch=any open5gs-upf deb net optional arch=any Checksums-Sha1: - d85012cdd7f81a447b1bfdaad4303d9e302a99ca 11455644 open5gs_2.4.8.202207190002.tar.xz + a121a71edaff78387a597d3da2fa7654cfc7adab 11455648 open5gs_2.4.8.202207200002.tar.xz Checksums-Sha256: - 33497874ad1e51a8e7f1f8151db13cb7aa09eb6348a079fa1ae85ebdfa085715 11455644 open5gs_2.4.8.202207190002.tar.xz + f834008fcf5b5695388649e83e584547f94dcd2ee642e61cf27126946911bc79 11455648 open5gs_2.4.8.202207200002.tar.xz Files: - 64648eed88270791871aa187cfe5e929 11455644 open5gs_2.4.8.202207190002.tar.xz + c725df0c2fb3a7042cbe12a1333dd194 11455648 open5gs_2.4.8.202207200002.tar.xz
View file
open5gs_2.4.8.202207190002.tar.xz/debian/changelog -> open5gs_2.4.8.202207200002.tar.xz/debian/changelog
Changed
@@ -1,8 +1,8 @@ -open5gs (2.4.8.202207190002) UNRELEASED; urgency=medium +open5gs (2.4.8.202207200002) UNRELEASED; urgency=medium * Snapshot build - -- Sukchan Lee <acetcom@gmail.com> Tue, 19 Jul 2022 00:09:06 +0000 + -- Sukchan Lee <acetcom@gmail.com> Wed, 20 Jul 2022 00:09:30 +0000 open5gs (2.4.8) unstable; urgency=medium
View file
open5gs_2.4.8.202207190002.tar.xz/debian/control -> open5gs_2.4.8.202207200002.tar.xz/debian/control
Changed
@@ -31,7 +31,7 @@ Package: open5gs-common Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${shlibs:Depends}, ${misc:Depends} Description: 5G Core and EPC (Shared Files) Open5GS is a C-language implementation of 5G Core and EPC @@ -43,7 +43,7 @@ Package: open5gs-mme Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: MME (Mobility Management Entity) @@ -58,7 +58,7 @@ Package: open5gs-sgwc Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: SGW-C (Serving Gateway - Control Plane) @@ -72,7 +72,7 @@ Package: open5gs-smf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: SMF (Session Management Function) @@ -84,7 +84,7 @@ Package: open5gs-amf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: AMF (Access and Mobility Management Function) @@ -96,7 +96,7 @@ Package: open5gs-sgwu Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: SGW-U (Serving Gateway - User Plane) @@ -110,7 +110,7 @@ Package: open5gs-upf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${shlibs:Depends}, ${misc:Depends}, udev, open5gs-common (= ${binary:Version}) @@ -123,7 +123,7 @@ Package: open5gs-hss Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${shlibs:Depends}, ${misc:Depends}, mongodb-org | mongodb, open5gs-common (= ${binary:Version}) @@ -140,7 +140,7 @@ Package: open5gs-pcrf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${shlibs:Depends}, ${misc:Depends}, mongodb-org | mongodb, open5gs-common (= ${binary:Version}) @@ -156,7 +156,7 @@ Package: open5gs-nrf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: NRF (Network Repository Function) @@ -168,7 +168,7 @@ Package: open5gs-ausf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: AUSF (Authentication Server Function) @@ -180,7 +180,7 @@ Package: open5gs-udm Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: UDM (Unified Data Management) @@ -192,7 +192,7 @@ Package: open5gs-pcf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: PCF (Policy Control Function) @@ -204,7 +204,7 @@ Package: open5gs-nssf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: NSSF (Network Slice Selection Function) @@ -216,7 +216,7 @@ Package: open5gs-bsf Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: BSF (Binding Support Function) @@ -228,7 +228,7 @@ Package: open5gs-udr Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${shlibs:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${shlibs:Depends}, ${misc:Depends}, open5gs-common (= ${binary:Version}) Description: UDR (Unified Data Repository) @@ -240,7 +240,7 @@ Package: open5gs Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${misc:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${misc:Depends}, open5gs-common (= ${binary:Version}), open5gs-mme (= ${binary:Version}), open5gs-sgwc (= ${binary:Version}), @@ -266,7 +266,7 @@ Package: open5gs-dbg Architecture: any Multi-Arch: same -Depends: osmocom-nightly (= 1.0.0.202207190002), ${misc:Depends}, +Depends: osmocom-nightly (= 1.0.0.202207200002), ${misc:Depends}, open5gs (= ${binary:Version}) Description: Debug symbols for Open5GS Open5GS is a C-language implementation of 5G Core and EPC
View file
open5gs_2.4.8.202207190002.tar.xz/lib/nas/5gs/types.h -> open5gs_2.4.8.202207200002.tar.xz/lib/nas/5gs/types.h
Changed
@@ -106,34 +106,53 @@ /* 9.11.3.2 5GMM cause * M V 1 */ + +/* REQUEST_ACCEPTED(16) cause is defined by Open5GS */ +#define OGS_5GMM_CAUSE_REQUEST_ACCEPTED 16 + +/* Annex A (informative): Cause values for 5GS mobility management + * A.1 Causes related to UE identification */ #define OGS_5GMM_CAUSE_ILLEGAL_UE 3 -#define OGS_5GMM_CAUSE_PEI_NOT_ACCEPTED 5 #define OGS_5GMM_CAUSE_ILLEGAL_ME 6 -#define OGS_5GMM_CAUSE_5GS_SERVICES_NOT_ALLOWED 7 #define OGS_5GMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK 9 #define OGS_5GMM_CAUSE_IMPLICITLY_DE_REGISTERED 10 + +/* A.2 Cause related to subscription options */ +#define OGS_5GMM_CAUSE_PEI_NOT_ACCEPTED 5 +#define OGS_5GMM_CAUSE_5GS_SERVICES_NOT_ALLOWED 7 #define OGS_5GMM_CAUSE_PLMN_NOT_ALLOWED 11 #define OGS_5GMM_CAUSE_TRACKING_AREA_NOT_ALLOWED 12 #define OGS_5GMM_CAUSE_ROAMING_NOT_ALLOWED_IN_THIS_TRACKING_AREA 13 #define OGS_5GMM_CAUSE_NO_SUITABLE_CELLS_IN_TRACKING_AREA 15 +#define OGS_5GMM_CAUSE_N1_MODE_NOT_ALLOWED 27 +#define OGS_5GMM_CAUSE_REDIRECTION_TO_EPC_REQUIRED 31 +#define OGS_5GMM_CAUSE_NON_3GPP_ACCESS_TO_5GCN_NOT_ALLOWED 72 +#define OGS_5GMM_CAUSE_TEMPORARILY_NOT_AUTHORIZED_FOR_THIS_SNPN 74 +#define OGS_5GMM_CAUSE_PERMANENTLY_NOT_AUTHORIZED_FOR_THIS_SNPN 75 +#define OGS_5GMM_CAUSE_NOT_AUTHORIZED_FOR_THIS_CAG_OR_AUITHORIZED_FOR_CAG_CELLS_ONLY 76 +#define WIRELESS_ACCESS_AREA_NOT_ALLOWED 76 + +/* A.3 Causes related to PLMN or SNPN specific network failures + * and congestion/authentication failures */ #define OGS_5GMM_CAUSE_MAC_FAILURE 20 #define OGS_5GMM_CAUSE_SYNCH_FAILURE 21 #define OGS_5GMM_CAUSE_CONGESTION 22 #define OGS_5GMM_CAUSE_UE_SECURITY_CAPABILITIES_MISMATCH 23 #define OGS_5GMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED 24 #define OGS_5GMM_CAUSE_NON_5G_AUTHENTICATION_UNACCEPTABLE 26 -#define OGS_5GMM_CAUSE_N1_MODE_NOT_ALLOWED 27 #define OGS_5GMM_CAUSE_RESTRICTED_SERVICE_AREA 28 #define OGS_5GMM_CAUSE_LADN_NOT_AVAILABLE 43 +#define OGS_5GMM_CAUSE_NO_NETWORK_SLICES_AVAILABLE 62 #define OGS_5GMM_CAUSE_MAXIMUM_NUMBER_OF_PDU_SESSIONS_REACHED 65 #define OGS_5GMM_CAUSE_INSUFFICIENT_RESOURCES_FOR_SPECIFIC_SLICE_AND_DNN 67 #define OGS_5GMM_CAUSE_INSUFFICIENT_RESOURCES_FOR_SPECIFIC_SLICE 69 #define OGS_5GMM_CAUSE_NGKSI_ALREADY_IN_USE 71 -#define OGS_5GMM_CAUSE_NON_3GPP_ACCESS_TO_5GCN_NOT_ALLOWED 72 #define OGS_5GMM_CAUSE_SERVING_NETWORK_NOT_AUTHORIZED 73 #define OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED 90 #define OGS_5GMM_CAUSE_DNN_NOT_SUPPORTED_OR_NOT_SUBSCRIBED_IN_THE_SLICE 91 #define OGS_5GMM_CAUSE_INSUFFICIENT_USER_PLANE_RESOURCES_FOR_THE_PDU_SESSION 92 + +/* A.4 Causes related to invalid messages */ #define OGS_5GMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE 95 #define OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION 96 #define OGS_5GMM_CAUSE_MESSAGE_TYPE_NON_EXISTENT_OR_NOT_IMPLEMENTED 97 @@ -291,7 +310,7 @@ /* * Do not change 'ogs_5gs_tai_t' to 'ogs_nas_tracking_area_identity_t'. * Use 'ogs_5gs_tai_t' for easy implementation. - * ogs_nas_tai_list_build() changes to NAS + * ogs_nas_tai_list_build() changes to NAS * format(ogs_nas_tracking_area_identity_t) * and is sent to the UE. */ @@ -639,6 +658,9 @@ /* 9.11.4.2 5GSM cause * O TV 2 */ + +/* Annex B (informative): Cause values for 5GS session management + * B.1 Causes related to nature of request */ #define OGS_5GSM_CAUSE_OPERATOR_DETERMINED_BARRING 8 #define OGS_5GSM_CAUSE_INSUFFICIENT_RESOURCES 26 #define OGS_5GSM_CAUSE_MISSING_OR_UNKNOWN_DNN 27 @@ -647,11 +669,12 @@ #define OGS_5GSM_CAUSE_REQUEST_REJECTED_UNSPECIFIED 31 #define OGS_5GSM_CAUSE_SERVICE_OPTION_NOT_SUPPORTED 32 #define OGS_5GSM_CAUSE_REQUESTED_SERVICE_OPTION_NOT_SUBSCRIBED 33 -#define OGS_5GSM_CAUSE_SERVICE_OPTION_TEMPORARILY_OUT_OF_ORDER 34 #define OGS_5GSM_CAUSE_PTI_ALREADY_IN_USE 35 #define OGS_5GSM_CAUSE_REGULAR_DEACTIVATION 36 #define OGS_5GSM_CAUSE_NETWORK_FAILURE 38 #define OGS_5GSM_CAUSE_REACTIVATION_REQUESTED 39 +#define OGS_5GSM_CAUSE_SEMANTIC_ERROR_IN_THE_TFT_OPERATION 41 +#define OGS_5GSM_CAUSE_SYNTACTICAL_ERROR_IN_THE_TFT_OPERATION 42 #define OGS_5GSM_CAUSE_INVALID_PDU_SESSION_IDENTITY 43 #define OGS_5GSM_CAUSE_SEMANTIC_ERRORS_IN_PACKET_FILTERS 44 #define OGS_5GSM_CAUSE_SYNTACTICAL_ERROR_IN_PACKET_FILTERS 45 @@ -660,6 +683,10 @@ #define OGS_5GSM_CAUSE_PDU_SESSION_TYPE_IPV4_ONLY_ALLOWED 50 #define OGS_5GSM_CAUSE_PDU_SESSION_TYPE_IPV6_ONLY_ALLOWED 51 #define OGS_5GSM_CAUSE_PDU_SESSION_DOES_NOT_EXIST 54 +#define OGS_5GSM_CAUSE_PDU_SESSION_TYPE_IPV4V6_ONLY_ALLOWED 57 +#define OGS_5GSM_CAUSE_PDU_SESSION_TYPE_UNSTRUCTURED_ONLY_ALLOWED 58 +#define OGS_5GSM_CAUSE_UNSUPPORTED_5QI_VALUE 59 +#define OGS_5GSM_CAUSE_PDU_SESSION_TYPE_ETHERNET_ONLY_ALLOWED 61 #define OGS_5GSM_CAUSE_INSUFFICIENT_RESOURCES_FOR_SPECIFIC_SLICE_AND_DNN 67 #define OGS_5GSM_CAUSE_NOT_SUPPORTED_SSC_MODE 68 #define OGS_5GSM_CAUSE_INSUFFICIENT_RESOURCES_FOR_SPECIFIC_SLICE 69 @@ -669,6 +696,8 @@ #define OGS_5GSM_CAUSE_SEMANTIC_ERROR_IN_THE_QOS_OPERATION 83 #define OGS_5GSM_CAUSE_SYNTACTICAL_ERROR_IN_THE_QOS_OPERATION 84 #define OGS_5GSM_CAUSE_INVALID_MAPPED_EPS_BEARER_IDENTITY 85 + +/* B.2 Protocol errors (e.g., unknown message) */ #define OGS_5GSM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE 95 #define OGS_5GSM_CAUSE_INVALID_MANDATORY_INFORMATION 96 #define OGS_5GSM_CAUSE_MESSAGE_TYPE_NON_EXISTENT_OR_NOT_IMPLEMENTED 97
View file
open5gs_2.4.8.202207190002.tar.xz/lib/nas/eps/types.h -> open5gs_2.4.8.202207200002.tar.xz/lib/nas/eps/types.h
Changed
@@ -182,8 +182,8 @@ } __attribute__ ((packed)) ogs_nas_csfb_response_t; /* 9.9.3.7 Detach type - * M V 1/2 - * 9.9.3.21 NAS key set identifier + * M V 1/2 + * 9.9.3.21 NAS key set identifier * M V 1/2 */ #define OGS_NAS_DETACH_TYPE_FROM_UE_EPS_DETACH 1 #define OGS_NAS_DETACH_TYPE_FROM_UE_IMSI_DETACH 2 @@ -222,51 +222,55 @@ } __attribute__ ((packed)) ogs_nas_drx_parameter_t; /* 9.9.3.9 EMM cause - * O TV 2 - * Annex A (informative) Cause values for EPS mobility management + * O TV 2 */ + +/* REQUEST_ACCEPTED(16) cause is defined by Open5GS */ +#define EMM_CAUSE_REQUEST_ACCEPTED 16 + +/* Annex A (informative) Cause values for EPS mobility management * A.1 Causes related to UE identification */ -#define EMM_CAUSE_IMSI_UNKNOWN_IN_HSS 2 -#define EMM_CAUSE_ILLEGAL_UE 3 -#define EMM_CAUSE_IMSI_UNKNOWN_IN_VLR 4 -#define EMM_CAUSE_ILLEGAL_ME 6 -#define EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK 9 -#define EMM_CAUSE_IMPLICITLY_DETACHED 10 +#define OGS_NAS_EMM_CAUSE_IMSI_UNKNOWN_IN_HSS 2 +#define OGS_NAS_EMM_CAUSE_ILLEGAL_UE 3 +#define OGS_NAS_EMM_CAUSE_IMSI_UNKNOWN_IN_VLR 4 +#define OGS_NAS_EMM_CAUSE_ILLEGAL_ME 6 +#define OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK 9 +#define OGS_NAS_EMM_CAUSE_IMPLICITLY_DETACHED 10 /* A.2 Cause related to subscription options */ -#define EMM_CAUSE_IMEI_NOT_ACCEPTED 5 -#define EMM_CAUSE_EPS_SERVICES_NOT_ALLOWED 7 -#define EMM_CAUSE_EPS_SERVICES_AND_NON_EPS_SERVICES_NOT_ALLOWED 8 -#define EMM_CAUSE_PLMN_NOT_ALLOWED 11 -#define EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED 12 -#define EMM_CAUSE_ROAMING_NOT_ALLOWED_IN_THIS_TRACKING_AREA 13 -#define EMM_CAUSE_EPS_SERVICES_NOT_ALLOWED_IN_THIS_PLMN 14 -#define EMM_CAUSE_NO_SUITABLE_CELLS_IN_TRACKING_AREA 15 -#define EMM_CAUSE_REQUESTED_SERVICE_OPTION_NOT_AUTHORIZED_IN_THIS_PLMN 35 -#define EMM_CAUSE_NO_EPS_BEARER_CONTEXT_ACTIVATED 40 -/* A.3 Causes related to PLMN specific network failures and +#define OGS_NAS_EMM_CAUSE_IMEI_NOT_ACCEPTED 5 +#define OGS_NAS_EMM_CAUSE_EPS_SERVICES_NOT_ALLOWED 7 +#define OGS_NAS_EMM_CAUSE_EPS_SERVICES_AND_NON_EPS_SERVICES_NOT_ALLOWED 8 +#define OGS_NAS_EMM_CAUSE_PLMN_NOT_ALLOWED 11 +#define OGS_NAS_EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED 12 +#define OGS_NAS_EMM_CAUSE_ROAMING_NOT_ALLOWED_IN_THIS_TRACKING_AREA 13 +#define OGS_NAS_EMM_CAUSE_EPS_SERVICES_NOT_ALLOWED_IN_THIS_PLMN 14 +#define OGS_NAS_EMM_CAUSE_NO_SUITABLE_CELLS_IN_TRACKING_AREA 15 +#define OGS_NAS_EMM_CAUSE_REQUESTED_SERVICE_OPTION_NOT_AUTHORIZED_IN_THIS_PLMN 35 +#define OGS_NAS_EMM_CAUSE_NO_EPS_BEARER_CONTEXT_ACTIVATED 40 +/* A.3 Causes related to PLMN specific network failures and * congestion/authentication failures */ -#define EMM_CAUSE_MSC_TEMPORARILY_NOT_REACHABLE 16 -#define EMM_CAUSE_NETWORK_FAILURE 17 -#define EMM_CAUSE_CS_DOMAIN_NOT_AVAILABLE 18 -#define EMM_CAUSE_ESM_FAILURE 19 -#define EMM_CAUSE_MAC_FAILURE 20 -#define EMM_CAUSE_SYNCH_FAILURE 21 -#define EMM_CAUSE_CONGESTION 22 -#define EMM_CAUSE_UE_SECURITY_CAPABILITIES_MISMATCH 23 -#define EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED 24 -#define EMM_CAUSE_NON_EPS_AUTHENTICATION_UNACCEPTABLE 26 -#define EMM_CAUSE_CS_SERVICE_TEMPORARILY_NOT_AVAILABLE 39 -#define EMM_CAUSE_SEVERE_NETWORK_FAILURE 42 -/* A.4 Causes related to nature of request +#define OGS_NAS_EMM_CAUSE_MSC_TEMPORARILY_NOT_REACHABLE 16 +#define OGS_NAS_EMM_CAUSE_NETWORK_FAILURE 17 +#define OGS_NAS_EMM_CAUSE_CS_DOMAIN_NOT_AVAILABLE 18 +#define OGS_NAS_EMM_CAUSE_ESM_FAILURE 19 +#define OGS_NAS_EMM_CAUSE_MAC_FAILURE 20 +#define OGS_NAS_EMM_CAUSE_SYNCH_FAILURE 21 +#define OGS_NAS_EMM_CAUSE_CONGESTION 22 +#define OGS_NAS_EMM_CAUSE_UE_SECURITY_CAPABILITIES_MISMATCH 23 +#define OGS_NAS_EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED 24 +#define OGS_NAS_EMM_CAUSE_NON_EPS_AUTHENTICATION_UNACCEPTABLE 26 +#define OGS_NAS_EMM_CAUSE_CS_SERVICE_TEMPORARILY_NOT_AVAILABLE 39 +#define OGS_NAS_EMM_CAUSE_SEVERE_NETWORK_FAILURE 42 +/* A.4 Causes related to nature of request * NOTE: This subclause has no entries in this version of the specification * * A.5 Causes related to invalid messages */ -#define EMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE 95 -#define EMM_CAUSE_INVALID_MANDATORY_INFORMATION 96 -#define EMM_CAUSE_MESSAGE_TYPE_NON_EXISTENT_OR_NOT_IMPLEMENTED 97 -#define EMM_CAUSE_MESSAGE_TYPE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE 98 -#define EMM_CAUSE_INFORMATION_ELEMENT_NON_EXISTENT_OR_NOT_IMPLEMENTED 99 -#define EMM_CAUSE_CONDITIONAL_IE_ERROR 100 -#define EMM_CAUSE_MESSAGE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE 101 -#define EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED 111 +#define OGS_NAS_EMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE 95 +#define OGS_NAS_EMM_CAUSE_INVALID_MANDATORY_INFORMATION 96 +#define OGS_NAS_EMM_CAUSE_MESSAGE_TYPE_NON_EXISTENT_OR_NOT_IMPLEMENTED 97 +#define OGS_NAS_EMM_CAUSE_MESSAGE_TYPE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE 98 +#define OGS_NAS_EMM_CAUSE_INFORMATION_ELEMENT_NON_EXISTENT_OR_NOT_IMPLEMENTED 99 +#define OGS_NAS_EMM_CAUSE_CONDITIONAL_IE_ERROR 100 +#define OGS_NAS_EMM_CAUSE_MESSAGE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE 101 +#define OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED 111 typedef uint8_t ogs_nas_emm_cause_t; /* 9.9.3.10 * EPS attach result @@ -280,7 +284,7 @@ /* 9.9.3.11 EPS attach type * M V 1/2 - * 9.9.3.21 NAS key set identifier + * 9.9.3.21 NAS key set identifier * M V 1/2 */ #define OGS_NAS_KEY_SET_IDENTIFIER_NATIVE 0 #define OGS_NAS_KEY_SET_IDENTIFIER_MAPPED 1 @@ -320,7 +324,7 @@ }; } __attribute__ ((packed)) ogs_nas_eps_mobile_identity_t; -/* 9.9.3.12A EPS network feature support +/* 9.9.3.12A EPS network feature support * O TLV 3 */ typedef struct ogs_nas_eps_network_feature_support_s { uint8_t length; @@ -353,8 +357,8 @@ } __attribute__ ((packed)) ogs_nas_eps_update_result_t; /* 9.9.3.14 EPS update type - * M V 1/2 - * 9.9.3.21 NAS key set identifier + * M V 1/2 + * 9.9.3.21 NAS key set identifier * M V 1/2 */ #define OGS_NAS_EPS_UPDATE_TYPE_TA_UPDATING 0 #define OGS_NAS_EPS_UPDATE_TYPE_COMBINED_TA_LA_UPDATING 1 @@ -430,7 +434,7 @@ uint8_t spare:3;) } __attribute__ ((packed)) ogs_nas_ms_network_capability_t; -/* 9.9.3.20A MS network feature support +/* 9.9.3.20A MS network feature support * See subclause 10.5.1.15 in 3GPP TS 24.008 13. * O TV 1 */ typedef struct ogs_nas_ms_network_feature_support_s { @@ -470,12 +474,12 @@ uint8_t identity:1;) } ogs_nas_paging_identity_t; -/* 9.9.3.26 P-TMSI signature +/* 9.9.3.26 P-TMSI signature * See subclause 10.5.5.8 in 3GPP TS 24.008 * O TV 4 */ typedef uint32_t ogs_nas_p_tmsi_signature_t; /* TV : 4bytes */ -/* 9.9.3.26A Extended EMM cause +/* 9.9.3.26A Extended EMM cause * O TV 1 */ typedef struct ogs_nas_extended_emm_cause_s { ED4(uint8_t type:4;, @@ -485,8 +489,8 @@ } ogs_nas_extended_emm_cause_t; /* 9.9.3.27 Service type - * M V 1/2 - * 9.9.3.21 NAS key set identifier + * M V 1/2 + * 9.9.3.21 NAS key set identifier * M V 1/2 */ #define OGS_NAS_SERVICE_TYPE_CS_FALLBACK_FROM_UE 0 #define OGS_NAS_SERVICE_TYPE_CS_FALLBACK_TO_UE 1 @@ -540,7 +544,7 @@ /* * Do not change 'ogs_eps_tai_t' to 'ogs_nas_tracking_area_identity_t'. * Use 'ogs_eps_tai_t' for easy implementation. - * ogs_nas_tai_list_build() changes to NAS + * ogs_nas_tai_list_build() changes to NAS * format(ogs_nas_tracking_area_identity_t) * and is sent to the UE. */ @@ -565,9 +569,9 @@ } __attribute__ ((packed)) ogs_nas_ue_radio_capability_information_update_needed_t; /* 9.9.3.38 CLI - * O TLV 3-14 - * The coding of the CLI value part is the same as for - * octets 3 to 14 of the Calling party BCD number information element + * O TLV 3-14 + * The coding of the CLI value part is the same as for + * octets 3 to 14 of the Calling party BCD number information element * defined in subclause 10.5.4.9 of 3GPP TS 24.008 13. */ #define NAX_MAX_CLI_LEN 12 typedef struct ogs_nas_cli_s { @@ -576,8 +580,8 @@ } __attribute__ ((packed)) ogs_nas_cli_t; /* 9.9.3.39 SS Code - * O TV 2 - * The coding of the SS Code value is given in subclause 17.7.5 of + * O TV 2
View file
open5gs_2.4.8.202207190002.tar.xz/src/amf/amf-sm.c -> open5gs_2.4.8.202207200002.tar.xz/src/amf/amf-sm.c
Changed
@@ -497,7 +497,10 @@ ogs_sbi_xact_remove(sbi_xact); sess = amf_sess_cycle(sess); - ogs_assert(sess); + if (!sess) { + ogs_error("Session has already been removed"); + break; + } amf_ue = sess->amf_ue; ogs_assert(amf_ue); @@ -574,6 +577,12 @@ case OGS_SBI_OBJ_UE_TYPE: amf_ue = (amf_ue_t *)sbi_object; ogs_assert(amf_ue); + amf_ue = amf_ue_cycle(amf_ue); + if (!amf_ue) { + ogs_error("UE(amf_ue) Context has already been removed"); + break; + } + ogs_error("%s Cannot receive SBI message", amf_ue->suci); ogs_assert(OGS_OK == nas_5gs_send_gmm_reject_from_sbi(amf_ue, @@ -583,6 +592,12 @@ case OGS_SBI_OBJ_SESS_TYPE: sess = (amf_sess_t *)sbi_object; ogs_assert(sess); + sess = amf_sess_cycle(sess); + if (!sess) { + ogs_error("Session has already been removed"); + break; + } + ogs_error("%d:%d Cannot receive SBI message", sess->psi, sess->pti); if (sess->payload_container_type) {
View file
open5gs_2.4.8.202207190002.tar.xz/src/amf/gmm-handler.c -> open5gs_2.4.8.202207200002.tar.xz/src/amf/gmm-handler.c
Changed
@@ -28,11 +28,11 @@ #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __gmm_log_domain -static int gmm_handle_nas_message_container( +static ogs_nas_5gmm_cause_t gmm_handle_nas_message_container( amf_ue_t *amf_ue, uint8_t message_type, ogs_nas_message_container_t *nas_message_container); -int gmm_handle_registration_request(amf_ue_t *amf_ue, +ogs_nas_5gmm_cause_t gmm_handle_registration_request(amf_ue_t *amf_ue, ogs_nas_security_header_type_t h, NGAP_ProcedureCode_t ngap_code, ogs_nas_5gs_registration_request_t *registration_request) { @@ -112,28 +112,19 @@ ~OGS_REGISTRATION_CLEARTEXT_PRESENT) { ogs_error("Non cleartext IEs is included 0x%llx", (long long)registration_request->presencemask); - ogs_assert(OGS_OK == - nas_5gs_send_registration_reject(amf_ue, - OGS_5GMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE)); - return OGS_ERROR; + return OGS_5GMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE; } if (!h.integrity_protected && (registration_request->presencemask & OGS_NAS_5GS_REGISTRATION_REQUEST_NAS_MESSAGE_CONTAINER_PRESENT)) { ogs_error("NAS container present without Integrity-protected"); - ogs_assert(OGS_OK == - nas_5gs_send_registration_reject(amf_ue, - OGS_5GMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE)); - return OGS_ERROR; + return OGS_5GMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE; } if (!mobile_identity->length || !mobile_identity->buffer) { ogs_error("No Mobile Identity"); - ogs_assert(OGS_OK == - nas_5gs_send_registration_reject(amf_ue, - OGS_5GMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE)); - return OGS_ERROR; + return OGS_5GMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE; } mobile_identity_header = @@ -152,11 +143,7 @@ OGS_NAS_5GS_ECIES_SCHEME_PROFILE_B) { ogs_error("Invalid ProtectionSchemeID(%d) in SUCI", mobile_identity_suci->protection_scheme_id); - ogs_assert(OGS_OK == - nas_5gs_send_registration_reject(amf_ue, - OGS_5GMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE) - ); - return OGS_ERROR; + return OGS_5GMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE; } amf_ue_set_suci(amf_ue, mobile_identity); ogs_info("%s SUCI", amf_ue->suci); @@ -166,7 +153,7 @@ (ogs_nas_5gs_mobile_identity_guti_t *)mobile_identity->buffer; if (!mobile_identity_guti) { ogs_error("No mobile identity"); - return OGS_ERROR; + return OGS_5GMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE; } ogs_nas_5gs_mobile_identity_guti_to_nas_guti( @@ -262,13 +249,9 @@ /* Check TAI */ served_tai_index = amf_find_served_tai(&amf_ue->nr_tai); if (served_tai_index < 0) { - /* Send Registration Reject */ - ogs_warn("Cannot find Served TAIPLMN_ID:%06x,TAC:%d", + ogs_error("Cannot find Served TAIPLMN_ID:%06x,TAC:%d", ogs_plmn_id_hexdump(&amf_ue->nr_tai.plmn_id), amf_ue->nr_tai.tac.v); - ogs_assert(OGS_OK == - nas_5gs_send_registration_reject(amf_ue, - OGS_5GMM_CAUSE_TRACKING_AREA_NOT_ALLOWED)); - return OGS_ERROR; + return OGS_5GMM_CAUSE_TRACKING_AREA_NOT_ALLOWED; } ogs_debug(" SERVED_TAI_INDEX%d", served_tai_index); @@ -285,18 +268,15 @@ ogs_error("UE:0x%x:0x%x, NEA0 can be used in Encrypt0x%x, " "but Integrity0x%x cannot be bypassed with NIA0", ue_security_capability->nr_ea, ue_security_capability->nr_ia, - amf_selected_enc_algorithm(amf_ue), + amf_selected_enc_algorithm(amf_ue), amf_selected_int_algorithm(amf_ue)); - ogs_assert(OGS_OK == - nas_5gs_send_registration_reject(amf_ue, - OGS_5GMM_CAUSE_UE_SECURITY_CAPABILITIES_MISMATCH)); - return OGS_ERROR; + return OGS_5GMM_CAUSE_UE_SECURITY_CAPABILITIES_MISMATCH; } - return OGS_OK; + return OGS_5GMM_CAUSE_REQUEST_ACCEPTED; } -int gmm_handle_registration_update(amf_ue_t *amf_ue, +ogs_nas_5gmm_cause_t gmm_handle_registration_update(amf_ue_t *amf_ue, ogs_nas_5gs_registration_request_t *registration_request) { amf_sess_t *sess = NULL; @@ -376,7 +356,7 @@ amf_ue->requested_nssai.s_nssaii.sst, amf_ue->requested_nssai.s_nssaii.sd.v); } - return OGS_ERROR; + return OGS_5GMM_CAUSE_NO_NETWORK_SLICES_AVAILABLE; } } @@ -442,10 +422,10 @@ } } - return OGS_OK; + return OGS_5GMM_CAUSE_REQUEST_ACCEPTED; } -int gmm_handle_service_request(amf_ue_t *amf_ue, +ogs_nas_5gmm_cause_t gmm_handle_service_request(amf_ue_t *amf_ue, ogs_nas_security_header_type_t h, NGAP_ProcedureCode_t ngap_code, ogs_nas_5gs_service_request_t *service_request) { @@ -483,20 +463,14 @@ service_request->presencemask & ~OGS_SERVICE_CLEARTEXT_PRESENT) { ogs_error("Non cleartext IEs is included 0x%llx", (long long)service_request->presencemask); - ogs_assert(OGS_OK == - nas_5gs_send_service_reject(amf_ue, - OGS_5GMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE)); - return OGS_ERROR; + return OGS_5GMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE; } if (!h.integrity_protected && (service_request->presencemask & OGS_NAS_5GS_SERVICE_REQUEST_NAS_MESSAGE_CONTAINER_PRESENT)) { ogs_error("NAS container present without Integrity-protected"); - ogs_assert(OGS_OK == - nas_5gs_send_service_reject(amf_ue, - OGS_5GMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE)); - return OGS_ERROR; + return OGS_5GMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE; } amf_ue->nas.message_type = OGS_NAS_5GS_SERVICE_REQUEST; @@ -550,13 +524,9 @@ /* Check TAI */ served_tai_index = amf_find_served_tai(&amf_ue->nr_tai); if (served_tai_index < 0) { - /* Send Registration Reject */ - ogs_warn("Cannot find Served TAIPLMN_ID:%06x,TAC:%d", + ogs_error("Cannot find Served TAIPLMN_ID:%06x,TAC:%d", ogs_plmn_id_hexdump(&amf_ue->nr_tai.plmn_id), amf_ue->nr_tai.tac.v); - ogs_assert(OGS_OK == - nas_5gs_send_registration_reject(amf_ue, - OGS_5GMM_CAUSE_TRACKING_AREA_NOT_ALLOWED)); - return OGS_ERROR; + return OGS_5GMM_CAUSE_TRACKING_AREA_NOT_ALLOWED; } ogs_debug(" SERVED_TAI_INDEX%d", served_tai_index); @@ -565,10 +535,10 @@ ogs_amf_id_hexdump(&amf_ue->current.guti.amf_id), amf_ue->current.guti.m_tmsi); - return OGS_OK; + return OGS_5GMM_CAUSE_REQUEST_ACCEPTED; } -int gmm_handle_service_update(amf_ue_t *amf_ue, +ogs_nas_5gmm_cause_t gmm_handle_service_update(amf_ue_t *amf_ue, ogs_nas_5gs_service_request_t *service_request) { amf_sess_t *sess = NULL; @@ -663,7 +633,7 @@ ogs_assert(OGS_OK == nas_5gs_send_service_accept(amf_ue)); - return OGS_OK; + return OGS_5GMM_CAUSE_REQUEST_ACCEPTED; } int gmm_handle_deregistration_request(amf_ue_t *amf_ue, @@ -800,7 +770,7 @@ return OGS_OK; } -int gmm_handle_security_mode_complete(amf_ue_t *amf_ue, +ogs_nas_5gmm_cause_t gmm_handle_security_mode_complete(amf_ue_t *amf_ue, ogs_nas_5gs_security_mode_complete_t *security_mode_complete) { ogs_nas_5gs_mobile_identity_t *imeisv = NULL; @@ -829,7 +799,7 @@
View file
open5gs_2.4.8.202207190002.tar.xz/src/amf/gmm-handler.h -> open5gs_2.4.8.202207200002.tar.xz/src/amf/gmm-handler.h
Changed
@@ -26,16 +26,16 @@ extern "C" { #endif -int gmm_handle_registration_request(amf_ue_t *amf_ue, +ogs_nas_5gmm_cause_t gmm_handle_registration_request(amf_ue_t *amf_ue, ogs_nas_security_header_type_t h, NGAP_ProcedureCode_t ngap_code, ogs_nas_5gs_registration_request_t *registration_request); -int gmm_handle_registration_update(amf_ue_t *amf_ue, +ogs_nas_5gmm_cause_t gmm_handle_registration_update(amf_ue_t *amf_ue, ogs_nas_5gs_registration_request_t *registration_request); -int gmm_handle_service_request(amf_ue_t *amf_ue, +ogs_nas_5gmm_cause_t gmm_handle_service_request(amf_ue_t *amf_ue, ogs_nas_security_header_type_t h, NGAP_ProcedureCode_t ngap_code, ogs_nas_5gs_service_request_t *service_request); -int gmm_handle_service_update(amf_ue_t *amf_ue, +ogs_nas_5gmm_cause_t gmm_handle_service_update(amf_ue_t *amf_ue, ogs_nas_5gs_service_request_t *service_request); int gmm_handle_deregistration_request(amf_ue_t *amf_ue, @@ -47,7 +47,7 @@ int gmm_handle_identity_response(amf_ue_t *amf_ue, ogs_nas_5gs_identity_response_t *identity_response); -int gmm_handle_security_mode_complete(amf_ue_t *amf_ue, +ogs_nas_5gmm_cause_t gmm_handle_security_mode_complete(amf_ue_t *amf_ue, ogs_nas_5gs_security_mode_complete_t *security_mode_complete); int gmm_handle_ul_nas_transport(amf_ue_t *amf_ue,
View file
open5gs_2.4.8.202207190002.tar.xz/src/amf/gmm-sm.c -> open5gs_2.4.8.202207200002.tar.xz/src/amf/gmm-sm.c
Changed
@@ -91,6 +91,7 @@ static void common_register_state(ogs_fsm_t *s, amf_event_t *e) { int rv, xact_count = 0; + ogs_nas_5gmm_cause_t gmm_cause; amf_ue_t *amf_ue = NULL; amf_sess_t *sess = NULL; @@ -102,7 +103,7 @@ ogs_sbi_message_t *sbi_message = NULL; ogs_assert(e); - + if (e->sess) { sess = e->sess; amf_ue = sess->amf_ue; @@ -132,11 +133,14 @@ switch (nas_message->gmm.h.message_type) { case OGS_NAS_5GS_REGISTRATION_REQUEST: ogs_info("Registration request"); - rv = gmm_handle_registration_request( + gmm_cause = gmm_handle_registration_request( amf_ue, h, e->ngap.code, &nas_message->gmm.registration_request); - if (rv != OGS_OK) { - ogs_error("gmm_handle_registration_request() failed"); + if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("gmm_handle_registration_request() failed %d", + gmm_cause); + ogs_assert(OGS_OK == + nas_5gs_send_registration_reject(amf_ue, gmm_cause)); OGS_FSM_TRAN(s, gmm_state_exception); break; } @@ -150,10 +154,13 @@ if (h.integrity_protected && SECURITY_CONTEXT_IS_VALID(amf_ue)) { - rv = gmm_handle_registration_update( + gmm_cause = gmm_handle_registration_update( amf_ue, &nas_message->gmm.registration_request); - if (rv != OGS_OK) { - ogs_error("gmm_handle_registration_update() failed"); + if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("%s gmm_handle_registration_update() " + "failed %d", amf_ue->suci, gmm_cause); + ogs_assert(OGS_OK == + nas_5gs_send_registration_reject(amf_ue, gmm_cause)); OGS_FSM_TRAN(s, gmm_state_exception); break; } @@ -204,10 +211,13 @@ case OGS_NAS_5GS_SERVICE_REQUEST: ogs_info("Service request"); - rv = gmm_handle_service_request( + gmm_cause = gmm_handle_service_request( amf_ue, h, e->ngap.code, &nas_message->gmm.service_request); - if (rv != OGS_OK) { - ogs_error("gmm_handle_service_request() failed"); + if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("%s gmm_handle_service_request() failed %d", + amf_ue->suci, gmm_cause); + ogs_assert(OGS_OK == + nas_5gs_send_service_reject(amf_ue, gmm_cause)); OGS_FSM_TRAN(s, gmm_state_exception); break; } @@ -232,10 +242,13 @@ break; } - rv = gmm_handle_service_update( + gmm_cause = gmm_handle_service_update( amf_ue, &nas_message->gmm.service_request); - if (rv != OGS_OK) { - ogs_error("gmm_handle_service_update() failed"); + if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("%s gmm_handle_service_update() failed %d", + amf_ue->suci, gmm_cause); + ogs_assert(OGS_OK == + nas_5gs_send_service_reject(amf_ue, gmm_cause)); OGS_FSM_TRAN(s, gmm_state_exception); } @@ -495,6 +508,8 @@ void gmm_state_authentication(ogs_fsm_t *s, amf_event_t *e) { int rv; + ogs_nas_5gmm_cause_t gmm_cause; + amf_ue_t *amf_ue = NULL; amf_sess_t *sess = NULL; @@ -510,7 +525,7 @@ ogs_assert(s); ogs_assert(e); - + amf_sm_debug(e); if (e->sess) { @@ -602,12 +617,14 @@ break; case OGS_NAS_5GS_REGISTRATION_REQUEST: ogs_warn("Registration request"); - rv = gmm_handle_registration_request( + gmm_cause = gmm_handle_registration_request( amf_ue, h, e->ngap.code, &nas_message->gmm.registration_request); - if (rv != OGS_OK) { - ogs_error("%s gmm_handle_registration_request() failed", - amf_ue->suci); + if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("%s gmm_handle_registration_request() failed %d", + amf_ue->suci, gmm_cause); + ogs_assert(OGS_OK == + nas_5gs_send_registration_reject(amf_ue, gmm_cause)); OGS_FSM_TRAN(s, gmm_state_exception); break; } @@ -744,6 +761,7 @@ void gmm_state_security_mode(ogs_fsm_t *s, amf_event_t *e) { int rv; + ogs_nas_5gmm_cause_t gmm_cause; amf_ue_t *amf_ue = NULL; ogs_nas_5gs_message_t *nas_message = NULL; ogs_nas_security_header_type_t h; @@ -797,13 +815,14 @@ break; } - rv = gmm_handle_security_mode_complete( + gmm_cause = gmm_handle_security_mode_complete( amf_ue, &nas_message->gmm.security_mode_complete); - if (rv != OGS_OK) { - ogs_error("%s Cannot handle NAS message", amf_ue->suci); + if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("%s gmm_handle_security_mode_complete() " + "failed %d in type %d", + amf_ue->suci, gmm_cause, amf_ue->nas.message_type); ogs_assert(OGS_OK == - nas_5gs_send_gmm_reject(amf_ue, - OGS_5GMM_CAUSE_5GS_SERVICES_NOT_ALLOWED)); + nas_5gs_send_gmm_reject(amf_ue, gmm_cause)); OGS_FSM_TRAN(s, gmm_state_exception); break; } @@ -837,11 +856,14 @@ break; case OGS_NAS_5GS_REGISTRATION_REQUEST: ogs_warn("Registration request"); - rv = gmm_handle_registration_request( + gmm_cause = gmm_handle_registration_request( amf_ue, h, e->ngap.code, &nas_message->gmm.registration_request); - if (rv != OGS_OK) { - ogs_error("%s Cannot handle NAS message", amf_ue->suci); + if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("%s gmm_handle_registration_request() failed %d", + amf_ue->suci, gmm_cause); + ogs_assert(OGS_OK == + nas_5gs_send_registration_reject(amf_ue, gmm_cause)); OGS_FSM_TRAN(s, gmm_state_exception); break; } @@ -916,6 +938,8 @@ void gmm_state_initial_context_setup(ogs_fsm_t *s, amf_event_t *e) { int rv, xact_count = 0; + ogs_nas_5gmm_cause_t gmm_cause; + amf_ue_t *amf_ue = NULL; amf_sess_t *sess = NULL; ogs_nas_5gs_message_t *nas_message = NULL; @@ -1156,11 +1180,14 @@ case OGS_NAS_5GS_REGISTRATION_REQUEST: ogs_warn("Registration request"); - rv = gmm_handle_registration_request( + gmm_cause = gmm_handle_registration_request( amf_ue, h, e->ngap.code, &nas_message->gmm.registration_request); - if (rv != OGS_OK) { - ogs_error("%s Cannot handle NAS message", amf_ue->suci); + if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("%s gmm_handle_registration_request() failed %d", + amf_ue->suci, gmm_cause); + ogs_assert(OGS_OK == + nas_5gs_send_registration_reject(amf_ue, gmm_cause)); OGS_FSM_TRAN(s, gmm_state_exception); break; } @@ -1236,7 +1263,8 @@ void gmm_state_exception(ogs_fsm_t *s, amf_event_t *e) {
View file
open5gs_2.4.8.202207190002.tar.xz/src/ausf/ausf-sm.c -> open5gs_2.4.8.202207200002.tar.xz/src/ausf/ausf-sm.c
Changed
@@ -287,8 +287,10 @@ ogs_sbi_xact_remove(sbi_xact); ausf_ue = ausf_ue_cycle(ausf_ue); - ogs_assert(ausf_ue); - ogs_assert(OGS_FSM_STATE(&ausf_ue->sm)); + if (!ausf_ue) { + ogs_error("UE(ausf-ue) Context has already been removed"); + break; + } e->ausf_ue = ausf_ue; e->sbi.message = &message;
View file
open5gs_2.4.8.202207190002.tar.xz/src/mme/emm-build.c -> open5gs_2.4.8.202207200002.tar.xz/src/mme/emm-build.c
Changed
@@ -119,7 +119,8 @@ (eps_attach_result->result == OGS_NAS_ATTACH_TYPE_EPS_ATTACH)) { attach_accept->presencemask |= OGS_NAS_EPS_ATTACH_ACCEPT_EMM_CAUSE_PRESENT; - attach_accept->emm_cause = EMM_CAUSE_CS_DOMAIN_NOT_AVAILABLE; + attach_accept->emm_cause = + OGS_NAS_EMM_CAUSE_CS_DOMAIN_NOT_AVAILABLE; } } else { switch (eps_attach_result->result) {
View file
open5gs_2.4.8.202207190002.tar.xz/src/mme/emm-handler.c -> open5gs_2.4.8.202207200002.tar.xz/src/mme/emm-handler.c
Changed
@@ -126,8 +126,8 @@ ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id), mme_ue->tai.tac); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED, - ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); + OGS_NAS_EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED, + OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); return OGS_ERROR; } ogs_debug(" SERVED_TAI_INDEX%d", served_tai_index); @@ -169,8 +169,8 @@ mme_selected_int_algorithm(mme_ue)); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_UE_SECURITY_CAPABILITIES_MISMATCH, - ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); + OGS_NAS_EMM_CAUSE_UE_SECURITY_CAPABILITIES_MISMATCH, + OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); return OGS_ERROR; } @@ -519,7 +519,7 @@ ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id), mme_ue->tai.tac); ogs_assert(OGS_OK == nas_eps_send_tau_reject( - mme_ue, EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED)); + mme_ue, OGS_NAS_EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED)); return OGS_ERROR; } ogs_debug(" SERVED_TAI_INDEX%d", served_tai_index); @@ -637,7 +637,7 @@ ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id), mme_ue->tai.tac); ogs_assert(OGS_OK == nas_eps_send_tau_reject( - mme_ue, EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED)); + mme_ue, OGS_NAS_EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED)); return OGS_ERROR; } ogs_debug(" SERVED_TAI_INDEX%d", served_tai_index);
View file
open5gs_2.4.8.202207190002.tar.xz/src/mme/emm-sm.c -> open5gs_2.4.8.202207200002.tar.xz/src/mme/emm-sm.c
Changed
@@ -133,7 +133,7 @@ ogs_info("Service request : Unknown UE"); ogs_assert(OGS_OK == nas_eps_send_service_reject(mme_ue, - EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)); + OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)); OGS_FSM_TRAN(s, &emm_state_exception); break; } @@ -142,7 +142,7 @@ ogs_warn("No Security Context : IMSI%s", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_service_reject(mme_ue, - EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)); + OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)); OGS_FSM_TRAN(s, &emm_state_exception); break; } @@ -151,7 +151,7 @@ ogs_warn("No Session Context : IMSI%s", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_service_reject(mme_ue, - EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)); + OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)); OGS_FSM_TRAN(s, &emm_state_exception); break; } @@ -160,7 +160,7 @@ ogs_warn("No active EPS bearers : IMSI%s", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_service_reject(mme_ue, - EMM_CAUSE_NO_EPS_BEARER_CONTEXT_ACTIVATED)); + OGS_NAS_EMM_CAUSE_NO_EPS_BEARER_CONTEXT_ACTIVATED)); OGS_FSM_TRAN(s, &emm_state_exception); break; } @@ -227,8 +227,8 @@ ogs_error("nas_eps_send_emm_to_esm() failed"); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED, - ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); + OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED, + OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); OGS_FSM_TRAN(s, &emm_state_exception); break; } @@ -259,7 +259,7 @@ ogs_info("TAU request : Unknown UE"); ogs_assert(OGS_OK == nas_eps_send_tau_reject(mme_ue, - EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)); + OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)); OGS_FSM_TRAN(s, &emm_state_exception); break; } @@ -268,7 +268,7 @@ ogs_warn("No PDN Connection : UE%s", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_tau_reject(mme_ue, - EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)); + OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)); OGS_FSM_TRAN(s, emm_state_exception); break; } @@ -277,7 +277,7 @@ ogs_warn("No active EPS bearers : IMSI%s", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_tau_reject(mme_ue, - EMM_CAUSE_NO_EPS_BEARER_CONTEXT_ACTIVATED)); + OGS_NAS_EMM_CAUSE_NO_EPS_BEARER_CONTEXT_ACTIVATED)); OGS_FSM_TRAN(s, &emm_state_exception); break; } @@ -400,7 +400,7 @@ ogs_warn("Extended Service request : Unknown UE"); ogs_assert(OGS_OK == nas_eps_send_service_reject(mme_ue, - EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)); + OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)); OGS_FSM_TRAN(s, &emm_state_exception); break; } @@ -409,7 +409,7 @@ ogs_warn("No PDN Connection : UE%s", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_service_reject(mme_ue, - EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)); + OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)); OGS_FSM_TRAN(s, emm_state_exception); break; } @@ -418,7 +418,7 @@ ogs_warn("No Security Context : IMSI%s", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_service_reject(mme_ue, - EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)); + OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)); OGS_FSM_TRAN(s, &emm_state_exception); break; } @@ -430,7 +430,7 @@ ogs_warn("No P-TMSI : UE%s", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_service_reject(mme_ue, - EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK) + OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK) ); mme_send_release_access_bearer_or_ue_context_release( enb_ue); @@ -457,7 +457,7 @@ mme_ue->nas_eps.service.value); ogs_assert(OGS_OK == nas_eps_send_service_reject(mme_ue, - EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK) + OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK) ); OGS_FSM_TRAN(s, &emm_state_exception); break; @@ -474,7 +474,7 @@ ogs_warn("No P-TMSI : UE%s", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_service_reject(mme_ue, - EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK) + OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK) ); break; } @@ -499,7 +499,7 @@ mme_ue->nas_eps.service.value); ogs_assert(OGS_OK == nas_eps_send_service_reject(mme_ue, - EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK) + OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK) ); OGS_FSM_TRAN(s, &emm_state_exception); break; @@ -704,26 +704,26 @@ authentication_failure_parameter; ogs_debug("Authentication failure"); - ogs_debug(" IMSI%s EMM_CAUSE%d", mme_ue->imsi_bcd, + ogs_debug(" IMSI%s OGS_NAS_EMM_CAUSE%d", mme_ue->imsi_bcd, authentication_failure->emm_cause); CLEAR_MME_UE_TIMER(mme_ue->t3460); switch (authentication_failure->emm_cause) { - case EMM_CAUSE_MAC_FAILURE: + case OGS_NAS_EMM_CAUSE_MAC_FAILURE: ogs_warn("Authentication failure(MAC failure)"); break; - case EMM_CAUSE_NON_EPS_AUTHENTICATION_UNACCEPTABLE: + case OGS_NAS_EMM_CAUSE_NON_EPS_AUTHENTICATION_UNACCEPTABLE: ogs_error("Authentication failure" "(Non-EPS authentication unacceptable)"); break; - case EMM_CAUSE_SYNCH_FAILURE: + case OGS_NAS_EMM_CAUSE_SYNCH_FAILURE: ogs_info("Authentication failure(Synch failure)"); mme_s6a_send_air(mme_ue, authentication_failure_parameter); return; default: - ogs_error("Unknown EMM_CAUSE{%d in Authentication" + ogs_error("Unknown OGS_NAS_EMM_CAUSE{%d in Authentication" " failure", authentication_failure->emm_cause); break; @@ -837,7 +837,7 @@ ogs_debug("Service request"); ogs_assert(OGS_OK == nas_eps_send_service_reject(mme_ue, - EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED)); + OGS_NAS_EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED)); OGS_FSM_TRAN(s, &emm_state_exception); break; } @@ -856,8 +856,8 @@ ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED, - ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); + OGS_NAS_EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED, + OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); OGS_FSM_TRAN(s, &emm_state_exception); break; } @@ -866,8 +866,8 @@ ogs_warn("%s No Security Context", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED, - ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); + OGS_NAS_EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED, + OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); OGS_FSM_TRAN(s, &emm_state_exception); break; }
View file
open5gs_2.4.8.202207190002.tar.xz/src/mme/esm-build.c -> open5gs_2.4.8.202207200002.tar.xz/src/mme/esm-build.c
Changed
@@ -174,13 +174,13 @@ if (session->paa.session_type == OGS_PDU_SESSION_TYPE_IPV4) { pdn_address->pdn_type = OGS_PDU_SESSION_TYPE_IPV4; activate_default_eps_bearer_context_request->esm_cause = - ESM_CAUSE_PDN_TYPE_IPV4_ONLY_ALLOWED; + OGS_NAS_ESM_CAUSE_PDN_TYPE_IPV4_ONLY_ALLOWED; activate_default_eps_bearer_context_request->presencemask |= OGS_NAS_EPS_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REQUEST_ESM_CAUSE_PRESENT; } else if (session->paa.session_type == OGS_PDU_SESSION_TYPE_IPV6) { pdn_address->pdn_type = OGS_PDU_SESSION_TYPE_IPV6; activate_default_eps_bearer_context_request->esm_cause = - ESM_CAUSE_PDN_TYPE_IPV6_ONLY_ALLOWED; + OGS_NAS_ESM_CAUSE_PDN_TYPE_IPV6_ONLY_ALLOWED; activate_default_eps_bearer_context_request->presencemask |= OGS_NAS_EPS_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REQUEST_ESM_CAUSE_PRESENT; } @@ -188,7 +188,7 @@ if (session->paa.session_type == OGS_PDU_SESSION_TYPE_IPV6) { pdn_address->pdn_type = OGS_PDU_SESSION_TYPE_IPV6; activate_default_eps_bearer_context_request->esm_cause = - ESM_CAUSE_PDN_TYPE_IPV6_ONLY_ALLOWED; + OGS_NAS_ESM_CAUSE_PDN_TYPE_IPV6_ONLY_ALLOWED; activate_default_eps_bearer_context_request->presencemask |= OGS_NAS_EPS_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REQUEST_ESM_CAUSE_PRESENT; } @@ -196,7 +196,7 @@ if (session->paa.session_type == OGS_PDU_SESSION_TYPE_IPV4) { pdn_address->pdn_type = OGS_PDU_SESSION_TYPE_IPV4; activate_default_eps_bearer_context_request->esm_cause = - ESM_CAUSE_PDN_TYPE_IPV4_ONLY_ALLOWED; + OGS_NAS_ESM_CAUSE_PDN_TYPE_IPV4_ONLY_ALLOWED; activate_default_eps_bearer_context_request->presencemask |= OGS_NAS_EPS_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REQUEST_ESM_CAUSE_PRESENT; }
View file
open5gs_2.4.8.202207190002.tar.xz/src/mme/esm-handler.c -> open5gs_2.4.8.202207200002.tar.xz/src/mme/esm-handler.c
Changed
@@ -67,7 +67,7 @@ /* Invalid APN */ ogs_assert(OGS_OK == nas_eps_send_pdn_connectivity_reject( - sess, ESM_CAUSE_MISSING_OR_UNKNOWN_APN, create_action)); + sess, OGS_NAS_ESM_CAUSE_MISSING_OR_UNKNOWN_APN, create_action)); ogs_warn("Invalid APN%s", req->access_point_name.apn); return OGS_ERROR; } @@ -82,7 +82,7 @@ sess->request_type.type, sess->session->session_type); ogs_assert(OGS_OK == nas_eps_send_pdn_connectivity_reject( - sess, ESM_CAUSE_UNKNOWN_PDN_TYPE, create_action)); + sess, OGS_NAS_ESM_CAUSE_UNKNOWN_PDN_TYPE, create_action)); return OGS_ERROR; } } else { @@ -139,7 +139,7 @@ ogs_error("No APN"); ogs_assert(OGS_OK == nas_eps_send_pdn_connectivity_reject( - sess, ESM_CAUSE_MISSING_OR_UNKNOWN_APN, create_action)); + sess, OGS_NAS_ESM_CAUSE_MISSING_OR_UNKNOWN_APN, create_action)); return OGS_ERROR; } @@ -185,7 +185,7 @@ sess->request_type.type, sess->session->session_type); ogs_assert(OGS_OK == nas_eps_send_pdn_connectivity_reject( - sess, ESM_CAUSE_UNKNOWN_PDN_TYPE, + sess, OGS_NAS_ESM_CAUSE_UNKNOWN_PDN_TYPE, OGS_GTP_CREATE_IN_ATTACH_REQUEST)); return OGS_ERROR; } @@ -219,7 +219,7 @@ ogs_assert(OGS_OK == nas_eps_send_pdn_connectivity_reject( - sess, ESM_CAUSE_MISSING_OR_UNKNOWN_APN, + sess, OGS_NAS_ESM_CAUSE_MISSING_OR_UNKNOWN_APN, OGS_GTP_CREATE_IN_ATTACH_REQUEST)); return OGS_ERROR; } @@ -241,7 +241,7 @@ ogs_assert(OGS_OK == nas_eps_send_bearer_resource_allocation_reject( - mme_ue, sess->pti, ESM_CAUSE_NETWORK_FAILURE)); + mme_ue, sess->pti, OGS_NAS_ESM_CAUSE_NETWORK_FAILURE)); return OGS_OK; }
View file
open5gs_2.4.8.202207190002.tar.xz/src/mme/esm-sm.c -> open5gs_2.4.8.202207200002.tar.xz/src/mme/esm-sm.c
Changed
@@ -35,13 +35,13 @@ static uint8_t gtp_cause_from_esm(uint8_t esm_cause) { switch (esm_cause) { - case ESM_CAUSE_SEMANTIC_ERROR_IN_THE_TFT_OPERATION: + case OGS_NAS_ESM_CAUSE_SEMANTIC_ERROR_IN_THE_TFT_OPERATION: return OGS_GTP2_CAUSE_SEMANTIC_ERROR_IN_THE_TFT_OPERATION; - case ESM_CAUSE_SYNTACTICAL_ERROR_IN_THE_TFT_OPERATION: + case OGS_NAS_ESM_CAUSE_SYNTACTICAL_ERROR_IN_THE_TFT_OPERATION: return OGS_GTP2_CAUSE_SYNTACTIC_ERROR_IN_THE_TFT_OPERATION; - case ESM_CAUSE_SYNTACTICAL_ERROR_IN_PACKET_FILTERS: + case OGS_NAS_ESM_CAUSE_SYNTACTICAL_ERROR_IN_PACKET_FILTERS: return OGS_GTP2_CAUSE_SYNTACTIC_ERRORS_IN_PACKET_FILTER; - case ESM_CAUSE_SEMANTIC_ERRORS_IN_PACKET_FILTERS: + case OGS_NAS_ESM_CAUSE_SEMANTIC_ERRORS_IN_PACKET_FILTERS: return OGS_GTP2_CAUSE_SEMANTIC_ERRORS_IN_PACKET_FILTER; default: break; @@ -139,8 +139,8 @@ ogs_error("%s No Integrity Protected", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED, - ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); + OGS_NAS_EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED, + OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); ogs_assert(mme_ue->enb_ue); ogs_assert(OGS_OK == s1ap_send_ue_context_release_command(mme_ue->enb_ue, @@ -154,8 +154,8 @@ ogs_warn("%s No Security Context", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED, - ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); + OGS_NAS_EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED, + OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); ogs_assert(mme_ue->enb_ue); ogs_assert(OGS_OK == s1ap_send_ue_context_release_command(mme_ue->enb_ue, @@ -232,7 +232,7 @@ ogs_assert(OGS_OK == nas_eps_send_pdn_connectivity_reject(sess, - ESM_CAUSE_ESM_INFORMATION_NOT_RECEIVED, + OGS_NAS_ESM_CAUSE_ESM_INFORMATION_NOT_RECEIVED, e->create_action)); } else { rv = nas_eps_send_esm_information_request(bearer);
View file
open5gs_2.4.8.202207190002.tar.xz/src/mme/mme-context.c -> open5gs_2.4.8.202207200002.tar.xz/src/mme/mme-context.c
Changed
@@ -3113,8 +3113,8 @@ ogs_error("No Bearer : EBI%d", ebi); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED, - ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); + OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED, + OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); return NULL; } @@ -3125,8 +3125,8 @@ ogs_error("Both PTI%d and EBI%d are 0", pti, ebi); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED, - ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); + OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED, + OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); return NULL; } @@ -3143,8 +3143,8 @@ linked_eps_bearer_identity->eps_bearer_identity); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED, - ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); + OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED, + OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); return NULL; } } else if (message->esm.h.message_type == @@ -3162,7 +3162,8 @@ linked_eps_bearer_identity->eps_bearer_identity); ogs_assert(OGS_OK == nas_eps_send_bearer_resource_allocation_reject( - mme_ue, pti, ESM_CAUSE_INVALID_EPS_BEARER_IDENTITY)); + mme_ue, pti, + OGS_NAS_ESM_CAUSE_INVALID_EPS_BEARER_IDENTITY)); return NULL; } @@ -3181,7 +3182,8 @@ linked_eps_bearer_identity->eps_bearer_identity); ogs_assert(OGS_OK == nas_eps_send_bearer_resource_modification_reject( - mme_ue, pti, ESM_CAUSE_INVALID_EPS_BEARER_IDENTITY)); + mme_ue, pti, + OGS_NAS_ESM_CAUSE_INVALID_EPS_BEARER_IDENTITY)); return NULL; } } @@ -3205,7 +3207,7 @@ ogs_assert(OGS_OK == nas_eps_send_pdn_connectivity_reject( sess, - ESM_CAUSE_MULTIPLE_PDN_CONNECTIONS_FOR_A_GIVEN_APN_NOT_ALLOWED, + OGS_NAS_ESM_CAUSE_MULTIPLE_PDN_CONNECTIONS_FOR_A_GIVEN_APN_NOT_ALLOWED, create_action)); ogs_warn("APN duplicated %s", pdn_connectivity_request->access_point_name.apn); @@ -3228,8 +3230,8 @@ message->esm.h.message_type, pti); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED, - ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); + OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED, + OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); return NULL; } }
View file
open5gs_2.4.8.202207190002.tar.xz/src/mme/mme-s11-handler.c -> open5gs_2.4.8.202207200002.tar.xz/src/mme/mme-s11-handler.c
Changed
@@ -36,17 +36,17 @@ { switch (gtp_cause) { case OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND: - return ESM_CAUSE_INVALID_EPS_BEARER_IDENTITY; + return OGS_NAS_ESM_CAUSE_INVALID_EPS_BEARER_IDENTITY; case OGS_GTP2_CAUSE_SERVICE_NOT_SUPPORTED: - return ESM_CAUSE_SERVICE_OPTION_NOT_SUPPORTED; + return OGS_NAS_ESM_CAUSE_SERVICE_OPTION_NOT_SUPPORTED; case OGS_GTP2_CAUSE_SEMANTIC_ERROR_IN_THE_TFT_OPERATION: - return ESM_CAUSE_SEMANTIC_ERROR_IN_THE_TFT_OPERATION; + return OGS_NAS_ESM_CAUSE_SEMANTIC_ERROR_IN_THE_TFT_OPERATION; case OGS_GTP2_CAUSE_SYNTACTIC_ERROR_IN_THE_TFT_OPERATION: - return ESM_CAUSE_SYNTACTICAL_ERROR_IN_THE_TFT_OPERATION; + return OGS_NAS_ESM_CAUSE_SYNTACTICAL_ERROR_IN_THE_TFT_OPERATION; case OGS_GTP2_CAUSE_SYNTACTIC_ERRORS_IN_PACKET_FILTER: - return ESM_CAUSE_SYNTACTICAL_ERROR_IN_PACKET_FILTERS; + return OGS_NAS_ESM_CAUSE_SYNTACTICAL_ERROR_IN_PACKET_FILTERS; case OGS_GTP2_CAUSE_SEMANTIC_ERRORS_IN_PACKET_FILTER: - return ESM_CAUSE_SEMANTIC_ERRORS_IN_PACKET_FILTERS; + return OGS_NAS_ESM_CAUSE_SEMANTIC_ERRORS_IN_PACKET_FILTERS; default: break; } @@ -56,7 +56,7 @@ * OGS_GTP2_CAUSE_MANDATORY_IE_MISSING * ... */ - return ESM_CAUSE_NETWORK_FAILURE; + return OGS_NAS_ESM_CAUSE_NETWORK_FAILURE; } void mme_s11_handle_echo_request( @@ -140,7 +140,7 @@ if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) { ogs_error("%s Attach reject", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_NETWORK_FAILURE, ESM_CAUSE_NETWORK_FAILURE)); + OGS_NAS_EMM_CAUSE_NETWORK_FAILURE, OGS_NAS_ESM_CAUSE_NETWORK_FAILURE)); } mme_send_delete_session_or_mme_ue_context_release(mme_ue); return; @@ -200,7 +200,7 @@ if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) { ogs_error("%s Attach reject", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_NETWORK_FAILURE, ESM_CAUSE_NETWORK_FAILURE)); + OGS_NAS_EMM_CAUSE_NETWORK_FAILURE, OGS_NAS_ESM_CAUSE_NETWORK_FAILURE)); } mme_send_delete_session_or_mme_ue_context_release(mme_ue); return; @@ -224,7 +224,7 @@ if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) { ogs_error("%s Attach reject", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_NETWORK_FAILURE, ESM_CAUSE_NETWORK_FAILURE)); + OGS_NAS_EMM_CAUSE_NETWORK_FAILURE, OGS_NAS_ESM_CAUSE_NETWORK_FAILURE)); } mme_send_delete_session_or_mme_ue_context_release(mme_ue); return; @@ -244,7 +244,7 @@ if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) { ogs_error("%s Attach reject", mme_ue->imsi_bcd); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_NETWORK_FAILURE, ESM_CAUSE_NETWORK_FAILURE)); + OGS_NAS_EMM_CAUSE_NETWORK_FAILURE, OGS_NAS_ESM_CAUSE_NETWORK_FAILURE)); } mme_send_delete_session_or_mme_ue_context_release(mme_ue); return; @@ -611,8 +611,8 @@ ogs_error("nas_eps_send_emm_to_esm() failed"); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED, - ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); + OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED, + OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); } } @@ -951,7 +951,8 @@ /* MME received Bearer Resource Modification Request */ ogs_assert(OGS_OK == nas_eps_send_bearer_resource_modification_reject( - mme_ue, sess->pti, ESM_CAUSE_SERVICE_OPTION_NOT_SUPPORTED)); + mme_ue, sess->pti, + OGS_NAS_ESM_CAUSE_SERVICE_OPTION_NOT_SUPPORTED)); } ogs_assert(OGS_OK ==
View file
open5gs_2.4.8.202207190002.tar.xz/src/mme/mme-sm.c -> open5gs_2.4.8.202207200002.tar.xz/src/mme/mme-sm.c
Changed
@@ -45,18 +45,19 @@ switch (*dia_exp_err) { case OGS_DIAM_S6A_ERROR_USER_UNKNOWN: /* 5001 */ ogs_info("%s User Unknown in HSS DB", mme_ue->imsi_bcd); - return EMM_CAUSE_PLMN_NOT_ALLOWED; + return OGS_NAS_EMM_CAUSE_PLMN_NOT_ALLOWED; case OGS_DIAM_S6A_ERROR_UNKNOWN_EPS_SUBSCRIPTION: /* 5420 */ /* FIXME: Error diagnostic? */ - return EMM_CAUSE_NO_SUITABLE_CELLS_IN_TRACKING_AREA; + return OGS_NAS_EMM_CAUSE_NO_SUITABLE_CELLS_IN_TRACKING_AREA; case OGS_DIAM_S6A_ERROR_RAT_NOT_ALLOWED: /* 5421 */ - return EMM_CAUSE_ROAMING_NOT_ALLOWED_IN_THIS_TRACKING_AREA; + return OGS_NAS_EMM_CAUSE_ROAMING_NOT_ALLOWED_IN_THIS_TRACKING_AREA; case OGS_DIAM_S6A_ERROR_ROAMING_NOT_ALLOWED: /* 5004 */ - return EMM_CAUSE_PLMN_NOT_ALLOWED; - //return EMM_CAUSE_EPS_SERVICES_NOT_ALLOWED_IN_THIS_PLMN; (ODB_HPLMN_APN) - //return EMM_CAUSE_ESM_FAILURE; (ODB_ALL_APN) + return OGS_NAS_EMM_CAUSE_PLMN_NOT_ALLOWED; + /* return OGS_NAS_EMM_CAUSE_EPS_SERVICES_NOT_ALLOWED_IN_THIS_PLMN; + * (ODB_HPLMN_APN) */ + /* return OGS_NAS_EMM_CAUSE_ESM_FAILURE; (ODB_ALL_APN) */ case OGS_DIAM_S6A_AUTHENTICATION_DATA_UNAVAILABLE: /* 4181 */ - return EMM_CAUSE_NETWORK_FAILURE; + return OGS_NAS_EMM_CAUSE_NETWORK_FAILURE; } } if (dia_err) { @@ -64,21 +65,21 @@ case ER_DIAMETER_AUTHORIZATION_REJECTED: /* 5003 */ case ER_DIAMETER_UNABLE_TO_DELIVER: /* 3002 */ case ER_DIAMETER_REALM_NOT_SERVED: /* 3003 */ - return EMM_CAUSE_NO_SUITABLE_CELLS_IN_TRACKING_AREA; + return OGS_NAS_EMM_CAUSE_NO_SUITABLE_CELLS_IN_TRACKING_AREA; case ER_DIAMETER_UNABLE_TO_COMPLY: /* 5012 */ case ER_DIAMETER_INVALID_AVP_VALUE: /* 5004 */ case ER_DIAMETER_AVP_UNSUPPORTED: /* 5001 */ case ER_DIAMETER_MISSING_AVP: /* 5005 */ case ER_DIAMETER_RESOURCES_EXCEEDED: /* 5006 */ case ER_DIAMETER_AVP_OCCURS_TOO_MANY_TIMES: /* 5009 */ - return EMM_CAUSE_NETWORK_FAILURE; + return OGS_NAS_EMM_CAUSE_NETWORK_FAILURE; } } ogs_error("Unexpected Diameter Result Code %d/%d, defaulting to severe " "network failure", dia_err ? *dia_err : -1, dia_exp_err ? *dia_exp_err : -1); - return EMM_CAUSE_SEVERE_NETWORK_FAILURE; + return OGS_NAS_EMM_CAUSE_SEVERE_NETWORK_FAILURE; } void mme_state_initial(ogs_fsm_t *s, mme_event_t *e) @@ -455,11 +456,11 @@ uint8_t emm_cause = emm_cause_from_diameter( mme_ue, s6a_message->err, s6a_message->exp_err); - ogs_info("%s Attach reject EMM_CAUSE:%d", + ogs_info("%s Attach reject OGS_NAS_EMM_CAUSE:%d", mme_ue->imsi_bcd, emm_cause); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - emm_cause, ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); + emm_cause, OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); ogs_assert(OGS_OK == s1ap_send_ue_context_release_command(enb_ue, @@ -486,8 +487,8 @@ ogs_error("nas_eps_send_emm_to_esm() failed"); ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED, - ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); + OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED, + OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); } } else if (mme_ue->nas_eps.type == MME_EPS_TYPE_TAU_REQUEST) { ogs_assert(OGS_OK ==
View file
open5gs_2.4.8.202207190002.tar.xz/src/mme/nas-path.c -> open5gs_2.4.8.202207200002.tar.xz/src/mme/nas-path.c
Changed
@@ -301,7 +301,7 @@ /* During the UE-attach process, we'll send Attach-Reject * with pyggybacking PDN-connectivity-Reject */ rv = nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_EPS_SERVICES_AND_NON_EPS_SERVICES_NOT_ALLOWED, esm_cause); + OGS_NAS_EMM_CAUSE_EPS_SERVICES_AND_NON_EPS_SERVICES_NOT_ALLOWED, esm_cause); ogs_expect(rv == OGS_OK); } else { esmbuf = esm_build_pdn_connectivity_reject( @@ -450,7 +450,7 @@ ogs_assert(mme_ue); esmbuf = esm_build_deactivate_bearer_context_request( - bearer, ESM_CAUSE_REGULAR_DEACTIVATION); + bearer, OGS_NAS_ESM_CAUSE_REGULAR_DEACTIVATION); ogs_expect_or_return_val(esmbuf, OGS_ERROR); s1apbuf = s1ap_build_e_rab_release_command(bearer, esmbuf,
View file
open5gs_2.4.8.202207190002.tar.xz/src/mme/sgsap-handler.c -> open5gs_2.4.8.202207200002.tar.xz/src/mme/sgsap-handler.c
Changed
@@ -124,8 +124,8 @@ error: ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - EMM_CAUSE_EPS_SERVICES_AND_NON_EPS_SERVICES_NOT_ALLOWED, - ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); + OGS_NAS_EMM_CAUSE_EPS_SERVICES_AND_NON_EPS_SERVICES_NOT_ALLOWED, + OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); mme_send_delete_session_or_mme_ue_context_release(mme_ue); } @@ -205,7 +205,7 @@ ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue, - emm_cause, ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); + emm_cause, OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED)); mme_send_delete_session_or_mme_ue_context_release(mme_ue); return;
View file
open5gs_2.4.8.202207190002.tar.xz/src/pcf/pcf-sm.c -> open5gs_2.4.8.202207200002.tar.xz/src/pcf/pcf-sm.c
Changed
@@ -403,7 +403,11 @@ ogs_sbi_xact_remove(sbi_xact); pcf_ue = pcf_ue_cycle(pcf_ue); - ogs_assert(pcf_ue); + if (!pcf_ue) { + ogs_error("UE(pcf_ue) Context " + "has already been removed"); + break; + } e->pcf_ue = pcf_ue; e->sbi.message = &message; @@ -427,7 +431,10 @@ ogs_sbi_xact_remove(sbi_xact); sess = pcf_sess_cycle(sess); - ogs_assert(sess); + if (!sess) { + ogs_error("Session has already been removed"); + break; + } pcf_ue = sess->pcf_ue; ogs_assert(pcf_ue); @@ -475,7 +482,10 @@ ogs_sbi_xact_remove(sbi_xact); sess = pcf_sess_cycle(sess); - ogs_assert(sess); + if (!sess) { + ogs_error("Session has already been removed"); + break; + } pcf_ue = sess->pcf_ue; ogs_assert(pcf_ue); @@ -568,12 +578,22 @@ case OGS_SBI_OBJ_UE_TYPE: pcf_ue = (pcf_ue_t *)sbi_object; ogs_assert(pcf_ue); + pcf_ue = pcf_ue_cycle(pcf_ue); + if (!pcf_ue) { + ogs_error("UE(pcf_ue) has already been removed"); + break; + } ogs_error("%s Cannot receive SBI message", pcf_ue->supi); break; case OGS_SBI_OBJ_SESS_TYPE: sess = (pcf_sess_t *)sbi_object; ogs_assert(sess); + sess = pcf_sess_cycle(sess); + if (!sess) { + ogs_error("Session has already been removed"); + break; + } ogs_error("%d Cannot receive SBI message", sess->psi); break;
View file
open5gs_2.4.8.202207190002.tar.xz/src/udm/udm-sm.c -> open5gs_2.4.8.202207200002.tar.xz/src/udm/udm-sm.c
Changed
@@ -321,7 +321,10 @@ ogs_sbi_xact_remove(sbi_xact); udm_ue = udm_ue_cycle(udm_ue); - ogs_assert(udm_ue); + if (!udm_ue) { + ogs_error("UE(udm_ue) Context has already been removed"); + break; + } e->udm_ue = udm_ue; e->sbi.message = &message;
View file
open5gs_2.4.8.202207190002.tar.xz/tests/attach/auth-test.c -> open5gs_2.4.8.202207200002.tar.xz/tests/attach/auth-test.c
Changed
@@ -315,7 +315,7 @@ /* Send Authentication failure - SYNCH failure */ emmbuf = testemm_build_authentication_failure( - test_ue, EMM_CAUSE_SYNCH_FAILURE, 0x11223344); + test_ue, OGS_NAS_EMM_CAUSE_SYNCH_FAILURE, 0x11223344); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, emmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -329,7 +329,7 @@ /* Send Authentication failure - MAC failure */ emmbuf = testemm_build_authentication_failure( - test_ue, EMM_CAUSE_MAC_FAILURE, 0); + test_ue, OGS_NAS_EMM_CAUSE_MAC_FAILURE, 0); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, emmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -388,7 +388,7 @@ /* Send Authentication failure - MAC failure */ emmbuf = testemm_build_authentication_failure( - test_ue, EMM_CAUSE_MAC_FAILURE, 0); + test_ue, OGS_NAS_EMM_CAUSE_MAC_FAILURE, 0); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, emmbuf); ABTS_PTR_NOTNULL(tc, sendbuf);
View file
open5gs_2.4.8.202207190002.tar.xz/tests/attach/emm-status-test.c -> open5gs_2.4.8.202207200002.tar.xz/tests/attach/emm-status-test.c
Changed
@@ -150,8 +150,8 @@ tests1ap_recv(test_ue, recvbuf); /* Send EMM Status */ - emmbuf = testemm_build_emm_status( - test_ue, ESM_CAUSE_MESSAGE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE); + emmbuf = testemm_build_emm_status(test_ue, + OGS_NAS_ESM_CAUSE_MESSAGE_NOT_COMPATIBLE_WITH_PROTOCOL_STATE); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, emmbuf); ABTS_PTR_NOTNULL(tc, sendbuf);
View file
open5gs_2.4.8.202207190002.tar.xz/tests/common/emm-build.c -> open5gs_2.4.8.202207200002.tar.xz/tests/common/emm-build.c
Changed
@@ -342,7 +342,7 @@ authentication_failure->emm_cause = emm_cause; - if (emm_cause == EMM_CAUSE_SYNCH_FAILURE) { + if (emm_cause == OGS_NAS_EMM_CAUSE_SYNCH_FAILURE) { authentication_failure->presencemask |= OGS_NAS_EPS_AUTHENTICATION_FAILURE_AUTHENTICATION_FAILURE_PARAMETER_PRESENT;
View file
open5gs_2.4.8.202207190002.tar.xz/tests/unit/nas-message-test.c -> open5gs_2.4.8.202207200002.tar.xz/tests/unit/nas-message-test.c
Changed
@@ -175,7 +175,7 @@ memset(&message, 0, sizeof(message)); message.emm.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; message.emm.h.message_type = OGS_NAS_EPS_ATTACH_REJECT; - attach_reject->emm_cause = EMM_CAUSE_NETWORK_FAILURE; + attach_reject->emm_cause = OGS_NAS_EMM_CAUSE_NETWORK_FAILURE; pkbuf = ogs_nas_eps_plain_encode(&message); ABTS_INT_EQUAL(tc, sizeof(buffer), pkbuf->len);
View file
open5gs_2.4.8.202207190002.tar.xz/tests/volte/rx-test.c -> open5gs_2.4.8.202207200002.tar.xz/tests/volte/rx-test.c
Changed
@@ -430,7 +430,7 @@ sess->pti = 10; esmbuf = testesm_build_bearer_resource_modification_request( bearer, OGS_GTP2_TFT_CODE_DELETE_PACKET_FILTERS_FROM_EXISTING, 0, - ESM_CAUSE_REGULAR_DEACTIVATION); + OGS_NAS_ESM_CAUSE_REGULAR_DEACTIVATION); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf);
View file
open5gs_2.4.8.202207190002.tar.xz/tests/volte/video-test.c -> open5gs_2.4.8.202207200002.tar.xz/tests/volte/video-test.c
Changed
@@ -347,7 +347,7 @@ ogs_assert(bearer); esmbuf = testesm_build_bearer_resource_modification_request( bearer, OGS_GTP2_TFT_CODE_DELETE_PACKET_FILTERS_FROM_EXISTING, 0, - ESM_CAUSE_REGULAR_DEACTIVATION); + OGS_NAS_ESM_CAUSE_REGULAR_DEACTIVATION); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -509,7 +509,7 @@ ogs_assert(bearer); esmbuf = testesm_build_bearer_resource_modification_request( bearer, OGS_GTP2_TFT_CODE_DELETE_PACKET_FILTERS_FROM_EXISTING, 0, - ESM_CAUSE_REGULAR_DEACTIVATION); + OGS_NAS_ESM_CAUSE_REGULAR_DEACTIVATION); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -671,7 +671,7 @@ ogs_assert(bearer); esmbuf = testesm_build_bearer_resource_modification_request( bearer, OGS_GTP2_TFT_CODE_DELETE_PACKET_FILTERS_FROM_EXISTING, 0, - ESM_CAUSE_REGULAR_DEACTIVATION); + OGS_NAS_ESM_CAUSE_REGULAR_DEACTIVATION); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -833,7 +833,7 @@ ogs_assert(bearer); esmbuf = testesm_build_bearer_resource_modification_request( bearer, OGS_GTP2_TFT_CODE_DELETE_PACKET_FILTERS_FROM_EXISTING, 0, - ESM_CAUSE_REGULAR_DEACTIVATION); + OGS_NAS_ESM_CAUSE_REGULAR_DEACTIVATION); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -995,7 +995,7 @@ ogs_assert(bearer); esmbuf = testesm_build_bearer_resource_modification_request( bearer, OGS_GTP2_TFT_CODE_DELETE_PACKET_FILTERS_FROM_EXISTING, 0, - ESM_CAUSE_REGULAR_DEACTIVATION); + OGS_NAS_ESM_CAUSE_REGULAR_DEACTIVATION); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -1157,7 +1157,7 @@ ogs_assert(bearer); esmbuf = testesm_build_bearer_resource_modification_request( bearer, OGS_GTP2_TFT_CODE_DELETE_PACKET_FILTERS_FROM_EXISTING, 0, - ESM_CAUSE_REGULAR_DEACTIVATION); + OGS_NAS_ESM_CAUSE_REGULAR_DEACTIVATION); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf);
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.