diff --git a/common/utils/utils.h b/common/utils/utils.h index fecf0eb3ad..432e754875 100644 --- a/common/utils/utils.h +++ b/common/utils/utils.h @@ -109,6 +109,15 @@ int hex_char_to_hex_value (char c); // Converts an hexadecimal ASCII coded string into its value.** int hex_string_to_hex_value (uint8_t *hex_value, const char *hex_string, int size); +/* Map task id to printable name. */ +typedef struct { + int id; + char text[256]; +} text_info_t; + +#define TO_TEXT(LabEl, nUmID) {nUmID, #LabEl}, +#define TO_ENUM(LabEl, nUmID) LabEl = nUmID, + char *itoa(int i); #define STRINGIFY(S) #S diff --git a/openair2/COMMON/ngap_messages_types.h b/openair2/COMMON/ngap_messages_types.h index a8f787812c..08d93c6b10 100644 --- a/openair2/COMMON/ngap_messages_types.h +++ b/openair2/COMMON/ngap_messages_types.h @@ -35,6 +35,7 @@ #include "common/5g_platform_types.h" #include "s1ap_messages_types.h" #include "ds/byte_array.h" +#include "utils.h" // Defines to access message fields. #define NGAP_REGISTER_GNB_REQ(mSGpTR) (mSGpTR)->ittiMsg.ngap_register_gnb_req @@ -143,25 +144,26 @@ typedef struct ngap_security_capabilities_s { uint16_t eUTRAintegrity_algorithms; } ngap_security_capabilities_t; -/* Provides the establishment cause for the RRC connection request as provided - * by the upper layers. W.r.t. the cause value names: highPriorityAccess - * concerns AC11..AC15, ‘mt Estands for ‘Mobile Terminating Eand ‘mo Efor - * 'Mobile Originating'. Defined in TS 36.331. - */ -typedef enum ngap_rrc_establishment_cause_e { - NGAP_RRC_CAUSE_EMERGENCY = 0x0, - NGAP_RRC_CAUSE_HIGH_PRIO_ACCESS = 0x1, - NGAP_RRC_CAUSE_MT_ACCESS = 0x2, - NGAP_RRC_CAUSE_MO_SIGNALLING = 0x3, - NGAP_RRC_CAUSE_MO_DATA = 0x4, - NGAP_RRC_CAUSE_MO_VOICECALL = 0x5, - NGAP_RRC_CAUSE_MO_VIDEOCALL = 0x6, - NGAP_RRC_CAUSE_MO_SMS = 0x7, - NGAP_RRC_CAUSE_MPS_PRIORITY_ACCESS = 0x8, - NGAP_RRC_CAUSE_MCS_PRIORITY_ACCESS = 0x9, - NGAP_RRC_CAUSE_NOTAVAILABLE = 0x10, - NGAP_RRC_CAUSE_LAST -} ngap_rrc_establishment_cause_t; +/** @brief RRC Establishment Cause (9.3.1.111 of 3GPP TS 38.413) + * Indicates the reason for RRC Connection Establishment/Resume as received from the UE. + * The notAvailable value is used when re-establishing/resuming an RRC connection and the + * cause value from the UE does not map to any other value. */ +#define FOREACH_RRC_ESTABLISHMENT_CAUSE(CAUSE_DEF) \ + CAUSE_DEF(NGAP_RRC_CAUSE_EMERGENCY, 0) \ + CAUSE_DEF(NGAP_RRC_CAUSE_HIGH_PRIO_ACCESS, 1) \ + CAUSE_DEF(NGAP_RRC_CAUSE_MT_ACCESS, 2) \ + CAUSE_DEF(NGAP_RRC_CAUSE_MO_SIGNALLING, 3) \ + CAUSE_DEF(NGAP_RRC_CAUSE_MO_DATA, 4) \ + CAUSE_DEF(NGAP_RRC_CAUSE_MO_VOICECALL, 5) \ + CAUSE_DEF(NGAP_RRC_CAUSE_MO_VIDEOCALL, 6) \ + CAUSE_DEF(NGAP_RRC_CAUSE_MO_SMS, 7) \ + CAUSE_DEF(NGAP_RRC_CAUSE_MPS_PRIORITY_ACCESS, 8) \ + CAUSE_DEF(NGAP_RRC_CAUSE_MCS_PRIORITY_ACCESS, 9) \ + CAUSE_DEF(NGAP_RRC_CAUSE_NOTAVAILABLE, 10) \ + CAUSE_DEF(NGAP_RRC_CAUSE_MO_EXCEPTION_DATA, 11) \ + CAUSE_DEF(NGAP_RRC_CAUSE_LAST, 12) + +typedef enum { FOREACH_RRC_ESTABLISHMENT_CAUSE(TO_ENUM) } ngap_rrc_establishment_cause_t; typedef struct fiveg_s_tmsi_s { uint16_t amf_set_id; @@ -242,15 +244,16 @@ typedef struct pdusession_modify_s { qos_flow_addmod_response_item_t qos[MAX_QOS_FLOWS]; } pdusession_modify_t; -/* Cause (9.3.1.2 of 3GPP TS 38.413) */ -typedef enum ngap_cause_group_e { - NGAP_CAUSE_NOTHING, /* No components present */ - NGAP_CAUSE_RADIO_NETWORK, - NGAP_CAUSE_TRANSPORT, - NGAP_CAUSE_NAS, - NGAP_CAUSE_PROTOCOL, - NGAP_CAUSE_MISC, -} ngap_cause_group_t; +/* Cause Group (9.3.1.2 of 3GPP TS 38.413) */ +#define FOREACH_CAUSE_GROUP(CAUSE_DEF) \ + CAUSE_DEF(NGAP_CAUSE_NOTHING, 0) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK, 1) \ + CAUSE_DEF(NGAP_CAUSE_TRANSPORT, 2) \ + CAUSE_DEF(NGAP_CAUSE_NAS, 3) \ + CAUSE_DEF(NGAP_CAUSE_PROTOCOL, 4) \ + CAUSE_DEF(NGAP_CAUSE_MISC, 5) + +typedef enum { FOREACH_CAUSE_GROUP(TO_ENUM) } ngap_cause_group_t; /* Cause (9.3.1.2 of 3GPP TS 38.413) */ typedef struct ngap_cause_s { @@ -258,73 +261,74 @@ typedef struct ngap_cause_s { uint8_t value; } ngap_cause_t; -typedef enum ngap_Cause_radio_network_e { - NGAP_CAUSE_RADIO_NETWORK_UNSPECIFIED, - NGAP_CAUSE_RADIO_NETWORK_TXNRELOCOVERALL_EXPIRY, - NGAP_CAUSE_RADIO_NETWORK_SUCCESSFUL_HANDOVER, - NGAP_CAUSE_RADIO_NETWORK_RELEASE_DUE_TO_NGRAN_GENERATED_REASON, - NGAP_CAUSE_RADIO_NETWORK_RELEASE_DUE_TO_5GC_GENERATED_REASON, - NGAP_CAUSE_RADIO_NETWORK_HANDOVER_CANCELLED, - NGAP_CAUSE_RADIO_NETWORK_PARTIAL_HANDOVER, - NGAP_CAUSE_RADIO_NETWORK_HO_FAILURE_IN_TARGET_5GC_NGRAN_NODE_OR_TARGET_SYSTEM, - NGAP_CAUSE_RADIO_NETWORK_HO_TARGET_NOT_ALLOWED, - NGAP_CAUSE_RADIO_NETWORK_TNGRELOCOVERALL_EXPIRY, - NGAP_CAUSE_RADIO_NETWORK_TNGRELOCPREP_EXPIRY, - NGAP_CAUSE_RADIO_NETWORK_CELL_NOT_AVAILABLE, - NGAP_CAUSE_RADIO_NETWORK_UNKNOWN_TARGETID, - NGAP_CAUSE_RADIO_NETWORK_NO_RADIO_RESOURCES_AVAILABLE_IN_TARGET_CELL, - NGAP_CAUSE_RADIO_NETWORK_UNKNOWN_LOCAL_UE_NGAP_ID, - NGAP_CAUSE_RADIO_NETWORK_INCONSISTENT_REMOTE_UE_NGAP_ID, - NGAP_CAUSE_RADIO_NETWORK_HANDOVER_DESIRABLE_FOR_RADIO_REASON, - NGAP_CAUSE_RADIO_NETWORK_TIME_CRITICAL_HANDOVER, - NGAP_CAUSE_RADIO_NETWORK_RESOURCE_OPTIMISATION_HANDOVER, - NGAP_CAUSE_RADIO_NETWORK_REDUCE_LOAD_IN_SERVING_CELL, - NGAP_CAUSE_RADIO_NETWORK_USER_INACTIVITY, - NGAP_CAUSE_RADIO_NETWORK_RADIO_CONNECTION_WITH_UE_LOST, - NGAP_CAUSE_RADIO_NETWORK_RADIO_RESOURCES_NOT_AVAILABLE, - NGAP_CAUSE_RADIO_NETWORK_INVALID_QOS_COMBINATION, - NGAP_CAUSE_RADIO_NETWORK_FAILURE_IN_RADIO_INTERFACE_PROCEDURE, - NGAP_CAUSE_RADIO_NETWORK_INTERACTION_WITH_OTHER_PROCEDURE, - NGAP_CAUSE_RADIO_NETWORK_UNKNOWN_PDU_SESSION_ID, - NGAP_CAUSE_RADIO_NETWORK_UNKNOWN_QOS_FLOW_ID, - NGAP_CAUSE_RADIO_NETWORK_MULTIPLE_PDU_SESSION_ID_INSTANCES, - NGAP_CAUSE_RADIO_NETWORK_MULTIPLE_QOS_FLOW_ID_INSTANCES, - NGAP_CAUSE_RADIO_NETWORK_ENCRYPTION_AND_OR_INTEGRITY_PROTECTION_ALGORITHMS_NOT_SUPPORTED, - NGAP_CAUSE_RADIO_NETWORK_NG_INTRA_SYSTEM_HANDOVER_TRIGGERED, - NGAP_CAUSE_RADIO_NETWORK_NG_INTER_SYSTEM_HANDOVER_TRIGGERED, - NGAP_CAUSE_RADIO_NETWORK_XN_HANDOVER_TRIGGERED, - NGAP_CAUSE_RADIO_NETWORK_NOT_SUPPORTED_5QI_VALUE, - NGAP_CAUSE_RADIO_NETWORK_UE_CONTEXT_TRANSFER, - NGAP_CAUSE_RADIO_NETWORK_IMS_VOICE_EPS_FALLBACK_OR_RAT_FALLBACK_TRIGGERED, - NGAP_CAUSE_RADIO_NETWORK_UP_INTEGRITY_PROTECTION_NOT_POSSIBLE, - NGAP_CAUSE_RADIO_NETWORK_UP_CONFIDENTIALITY_PROTECTION_NOT_POSSIBLE, - NGAP_CAUSE_RADIO_NETWORK_SLICE_NOT_SUPPORTED, - NGAP_CAUSE_RADIO_NETWORK_UE_IN_RRC_INACTIVE_STATE_NOT_REACHABLE, - NGAP_CAUSE_RADIO_NETWORK_REDIRECTION, - NGAP_CAUSE_RADIO_NETWORK_RESOURCES_NOT_AVAILABLE_FOR_THE_SLICE, - NGAP_CAUSE_RADIO_NETWORK_UE_MAX_INTEGRITY_PROTECTED_DATA_RATE_REASON, - NGAP_CAUSE_RADIO_NETWORK_RELEASE_DUE_TO_CN_DETECTED_MOBILITY, - NGAP_CAUSE_RADIO_NETWORK_N26_INTERFACE_NOT_AVAILABLE, - NGAP_CAUSE_RADIO_NETWORK_RELEASE_DUE_TO_PRE_EMPTION, - NGAP_CAUSE_RADIO_NETWORK_MULTIPLE_LOCATION_REPORTING_REFERENCE_ID_INSTANCES, - NGAP_CAUSE_RADIO_NETWORK_RSN_NOT_AVAILABLE_FOR_THE_UP, - NGAP_CAUSE_RADIO_NETWORK_NPN_ACCESS_DENIED, - NGAP_CAUSE_RADIO_NETWORK_CAG_ONLY_ACCESS_DENIED, - NGAP_CAUSE_RADIO_NETWORK_INSUFFICIENT_UE_CAPABILITIES -} ngap_cause_radio_network_t; +/* Radio Network Cause (9.3.1.2 of 3GPP TS 38.413) */ +#define FOREACH_CAUSE_RADIO_NETWORK(CAUSE_DEF) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_UNSPECIFIED, 0) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_TXNRELOCOVERALL_EXPIRY, 1) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_SUCCESSFUL_HANDOVER, 2) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_RELEASE_DUE_TO_NGRAN_GENERATED_REASON, 3) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_RELEASE_DUE_TO_5GC_GENERATED_REASON, 4) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_HANDOVER_CANCELLED, 5) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_PARTIAL_HANDOVER, 6) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_HO_FAILURE_IN_TARGET_5GC_NGRAN_NODE_OR_TARGET_SYSTEM, 7) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_HO_TARGET_NOT_ALLOWED, 8) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_TNGRELOCOVERALL_EXPIRY, 9) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_TNGRELOCPREP_EXPIRY, 10) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_CELL_NOT_AVAILABLE, 11) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_UNKNOWN_TARGETID, 12) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_NO_RADIO_RESOURCES_AVAILABLE_IN_TARGET_CELL, 13) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_UNKNOWN_LOCAL_UE_NGAP_ID, 14) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_INCONSISTENT_REMOTE_UE_NGAP_ID, 15) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_HANDOVER_DESIRABLE_FOR_RADIO_REASON, 16) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_TIME_CRITICAL_HANDOVER, 17) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_RESOURCE_OPTIMISATION_HANDOVER, 18) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_REDUCE_LOAD_IN_SERVING_CELL, 19) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_USER_INACTIVITY, 20) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_RADIO_CONNECTION_WITH_UE_LOST, 21) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_RADIO_RESOURCES_NOT_AVAILABLE, 22) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_INVALID_QOS_COMBINATION, 23) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_FAILURE_IN_RADIO_INTERFACE_PROCEDURE, 24) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_INTERACTION_WITH_OTHER_PROCEDURE, 25) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_UNKNOWN_PDU_SESSION_ID, 26) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_UNKNOWN_QOS_FLOW_ID, 27) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_MULTIPLE_PDU_SESSION_ID_INSTANCES, 28) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_MULTIPLE_QOS_FLOW_ID_INSTANCES, 29) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_ENCRYPTION_AND_OR_INTEGRITY_PROTECTION_ALGORITHMS_NOT_SUPPORTED, 30) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_NG_INTRA_SYSTEM_HANDOVER_TRIGGERED, 31) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_NG_INTER_SYSTEM_HANDOVER_TRIGGERED, 32) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_XN_HANDOVER_TRIGGERED, 33) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_NOT_SUPPORTED_5QI_VALUE, 34) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_UE_CONTEXT_TRANSFER, 35) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_IMS_VOICE_EPS_FALLBACK_OR_RAT_FALLBACK_TRIGGERED, 36) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_UP_INTEGRITY_PROTECTION_NOT_POSSIBLE, 37) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_UP_CONFIDENTIALITY_PROTECTION_NOT_POSSIBLE, 38) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_SLICE_NOT_SUPPORTED, 39) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_UE_IN_RRC_INACTIVE_STATE_NOT_REACHABLE, 40) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_REDIRECTION, 41) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_RESOURCES_NOT_AVAILABLE_FOR_THE_SLICE, 42) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_UE_MAX_INTEGRITY_PROTECTED_DATA_RATE_REASON, 43) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_RELEASE_DUE_TO_CN_DETECTED_MOBILITY, 44) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_N26_INTERFACE_NOT_AVAILABLE, 45) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_RELEASE_DUE_TO_PRE_EMPTION, 46) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_MULTIPLE_LOCATION_REPORTING_REFERENCE_ID_INSTANCES, 47) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_RSN_NOT_AVAILABLE_FOR_THE_UP, 48) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_NPN_ACCESS_DENIED, 49) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_CAG_ONLY_ACCESS_DENIED, 50) \ + CAUSE_DEF(NGAP_CAUSE_RADIO_NETWORK_INSUFFICIENT_UE_CAPABILITIES, 51) -/** - * NGAP protocol cause values as per 9.3.1.2 `Cause` section in 3GPP TS 38.413. - */ -typedef enum ngap_cause_protocol_e { - NGAP_CAUSE_PROTOCOL_TRANSFER_SYNTAX_ERROR, - NGAP_CAUSE_PROTOCOL_ABSTRACT_SYNTAX_ERROR_REJECT, - NGAP_CAUSE_PROTOCOL_ABSTRACT_SYNTAX_ERROR_IGNORE, - NGAP_CAUSE_PROTOCOL_MSG_NOT_COMPATIBLE_WITH_RECEIVER_STATE, - NGAP_CAUSE_PROTOCOL_SEMANTIC_ERROR, - NGAP_CAUSE_PROTOCOL_ABSTRACT_SYNTAX_ERROR_FCM, - NGAP_CAUSE_PROTOCOL_UNSPECIFIED -} ngap_cause_protocol_t; +typedef enum { FOREACH_CAUSE_RADIO_NETWORK(TO_ENUM) } ngap_cause_radio_network_t; + +/** NGAP protocol cause values (9.3.1.2 of 3GPP TS 38.413) */ +#define FOREACH_CAUSE_PROTOCOL(CAUSE_DEF) \ + CAUSE_DEF(NGAP_CAUSE_PROTOCOL_TRANSFER_SYNTAX_ERROR, 0) \ + CAUSE_DEF(NGAP_CAUSE_PROTOCOL_ABSTRACT_SYNTAX_ERROR_REJECT, 1) \ + CAUSE_DEF(NGAP_CAUSE_PROTOCOL_ABSTRACT_SYNTAX_ERROR_IGNORE, 2) \ + CAUSE_DEF(NGAP_CAUSE_PROTOCOL_MSG_NOT_COMPATIBLE_WITH_RECEIVER_STATE, 3) \ + CAUSE_DEF(NGAP_CAUSE_PROTOCOL_SEMANTIC_ERROR, 4) \ + CAUSE_DEF(NGAP_CAUSE_PROTOCOL_ABSTRACT_SYNTAX_ERROR_FCM, 5) \ + CAUSE_DEF(NGAP_CAUSE_PROTOCOL_UNSPECIFIED, 6) + +typedef enum { FOREACH_CAUSE_PROTOCOL(TO_ENUM) } ngap_cause_protocol_t; typedef struct pdusession_failed_s { /* Unique pdusession_id for the UE. */ diff --git a/openair3/NAS/NR_UE/5GS/5GMM/IES/FGSMobileIdentity.h b/openair3/NAS/NR_UE/5GS/5GMM/IES/FGSMobileIdentity.h index 4d6d4d7eed..f8dffa41c0 100644 --- a/openair3/NAS/NR_UE/5GS/5GMM/IES/FGSMobileIdentity.h +++ b/openair3/NAS/NR_UE/5GS/5GMM/IES/FGSMobileIdentity.h @@ -32,6 +32,7 @@ #include #include "OctetString.h" #include "fgs_nas_utils.h" +#include "common/utils/utils.h" // text_info_t, TO_ENUM, TO_TEXT #ifndef FGS_MOBILE_IDENTITY_H_ #define FGS_MOBILE_IDENTITY_H_ diff --git a/openair3/NAS/NR_UE/5GS/5GMM/MSG/fgmm_lib.h b/openair3/NAS/NR_UE/5GS/5GMM/MSG/fgmm_lib.h index 8d833e74aa..ff3447dc2c 100644 --- a/openair3/NAS/NR_UE/5GS/5GMM/MSG/fgmm_lib.h +++ b/openair3/NAS/NR_UE/5GS/5GMM/MSG/fgmm_lib.h @@ -32,6 +32,7 @@ #include #include "fgs_nas_utils.h" #include "common/utils/ds/byte_array.h" +#include "common/utils/utils.h" /* The following defines are valide for both PDU Session Status and PDU session Reactivation Result IEs */ diff --git a/openair3/NAS/NR_UE/5GS/5GSM/MSG/PduSessionEstablishmentAccept.c b/openair3/NAS/NR_UE/5GS/5GSM/MSG/PduSessionEstablishmentAccept.c index 1c0b0030ea..4fb7133e47 100644 --- a/openair3/NAS/NR_UE/5GS/5GSM/MSG/PduSessionEstablishmentAccept.c +++ b/openair3/NAS/NR_UE/5GS/5GSM/MSG/PduSessionEstablishmentAccept.c @@ -23,6 +23,7 @@ #include #include "PduSessionEstablishmentAccept.h" #include "common/utils/LOG/log.h" +#include "common/utils/utils.h" // text_info_t, TO_ENUM, TO_TEXT #include "fgs_nas_utils.h" /** diff --git a/openair3/NAS/NR_UE/5GS/5GSM/MSG/PduSessionEstablishmentAccept.h b/openair3/NAS/NR_UE/5GS/5GSM/MSG/PduSessionEstablishmentAccept.h index eb8738295b..190c34b004 100644 --- a/openair3/NAS/NR_UE/5GS/5GSM/MSG/PduSessionEstablishmentAccept.h +++ b/openair3/NAS/NR_UE/5GS/5GSM/MSG/PduSessionEstablishmentAccept.h @@ -25,6 +25,7 @@ #include #include #include "fgs_nas_utils.h" +#include "common/utils/utils.h" // text_info_t, TO_ENUM, TO_TEXT /* PDU Session Establish Accept Optional IE Identifiers - TS 24.501 Table 8.3.2.1.1 */ diff --git a/openair3/NAS/NR_UE/5GS/fgs_nas_utils.h b/openair3/NAS/NR_UE/5GS/fgs_nas_utils.h index e6c03cb635..f5fa69f8f2 100644 --- a/openair3/NAS/NR_UE/5GS/fgs_nas_utils.h +++ b/openair3/NAS/NR_UE/5GS/fgs_nas_utils.h @@ -29,15 +29,6 @@ #include "utils.h" // text_info_t, TO_ENUM, TO_TEXT #include "common/utils/eq_check.h" -/* Map task id to printable name. */ -typedef struct { - int id; - char text[256]; -} text_info_t; - -#define TO_TEXT(LabEl, nUmID) {nUmID, #LabEl}, -#define TO_ENUM(LabEl, nUmID ) LabEl = nUmID, - #define GET_SHORT(input, size) ({ \ uint16_t tmp16; \ memcpy(&tmp16, (input), sizeof(tmp16)); \