From 5d9f7b41c1c8a85c96f44fa8abe0f9a7aec60132 Mon Sep 17 00:00:00 2001 From: Rakesh BB Date: Wed, 4 Mar 2026 06:37:45 +0000 Subject: [PATCH] XNAP: add logging support and update ASN.1 runtime sources - Add XNAP component to the logging framework in log.h - Introduce LEGACY_XNAP log message definitions (INFO, ERROR, WARNING, DEBUG, TRACE) in T_messages.txt for tracing and debugging XNAP procedures - Update xnap_R16.2.0.cmake formatting for consistency - Add missing ASN.1 runtime sources required by XNAP (e.g. asn_codecs_prim_xer.c, BIT_STRING_print.c, BIT_STRING_rfill.c, etc.) --- common/utils/LOG/log.h | 1 + common/utils/T/T_messages.txt | 21 +++ .../XNAP/MESSAGES/ASN1/xnap_R16.2.0.cmake | 124 +++++++++++++++++- 3 files changed, 141 insertions(+), 5 deletions(-) diff --git a/common/utils/LOG/log.h b/common/utils/LOG/log.h index 837c6897a6..b8ccedffbe 100644 --- a/common/utils/LOG/log.h +++ b/common/utils/LOG/log.h @@ -162,6 +162,7 @@ static const char *const flag_name[] = {FOREACH_FLAG(FLAG_TEXT) ""}; COMP_DEF(USIM, log) \ COMP_DEF(F1U, ) \ COMP_DEF(X2AP, ) \ + COMP_DEF(XNAP, ) \ COMP_DEF(M2AP, ) \ COMP_DEF(M3AP, ) \ COMP_DEF(NGAP, ) \ diff --git a/common/utils/T/T_messages.txt b/common/utils/T/T_messages.txt index 818b30b7d0..432ad30262 100644 --- a/common/utils/T/T_messages.txt +++ b/common/utils/T/T_messages.txt @@ -628,6 +628,27 @@ ID = LEGACY_X2AP_TRACE GROUP = ALL:LEGACY_X2AP:LEGACY_GROUP_TRACE:LEGACY FORMAT = string,log +ID = LEGACY_XNAP_INFO + DESC = XNAP legacy logs - info level + GROUP = ALL:LEGACY_XNAP:LEGACY_GROUP_INFO:LEGACY + FORMAT = string,log +ID = LEGACY_XNAP_ERROR + DESC = XNAP legacy logs - error level + GROUP = ALL:LEGACY_XNAP:LEGACY_GROUP_ERROR:LEGACY + FORMAT = string,log +ID = LEGACY_XNAP_WARNING + DESC = XNAP legacy logs - warning level + GROUP = ALL:LEGACY_XNAP:LEGACY_GROUP_WARNING:LEGACY + FORMAT = string,log +ID = LEGACY_XNAP_DEBUG + DESC = XNAP legacy logs - debug level + GROUP = ALL:LEGACY_XNAP:LEGACY_GROUP_DEBUG:LEGACY + FORMAT = string,log +ID = LEGACY_XNAP_TRACE + DESC = XNAP legacy logs - trace level + GROUP = ALL:LEGACY_XNAP:LEGACY_GROUP_TRACE:LEGACY + FORMAT = string,log + ID = LEGACY_M2AP_INFO DESC = M2AP legacy logs - info level GROUP = ALL:LEGACY_M2AP:LEGACY_GROUP_INFO:LEGACY diff --git a/openair2/XNAP/MESSAGES/ASN1/xnap_R16.2.0.cmake b/openair2/XNAP/MESSAGES/ASN1/xnap_R16.2.0.cmake index cb0c762983..4a46649449 100644 --- a/openair2/XNAP/MESSAGES/ASN1/xnap_R16.2.0.cmake +++ b/openair2/XNAP/MESSAGES/ASN1/xnap_R16.2.0.cmake @@ -1,4 +1,4 @@ -set( XNAP_GRAMMAR ASN1/xnap_R16.2.0.asn) +set(XNAP_GRAMMAR ASN1/xnap_R16.2.0.asn) set(xnap_source ANY.c @@ -9,6 +9,7 @@ set(xnap_source asn_application.c asn_bit_data.c asn_codecs_prim.c + asn_codecs_prim_xer.c asn_internal.c asn_random_fill.c asn_SEQUENCE_OF.c @@ -16,20 +17,73 @@ set(xnap_source ber_tlv_length.c ber_tlv_tag.c BIT_STRING.c + BIT_STRING_print.c + BIT_STRING_rfill.c + BIT_STRING_uper.c + BIT_STRING_xer.c constraints.c constr_CHOICE.c + constr_CHOICE_aper.c + constr_CHOICE_rfill.c + constr_CHOICE_print.c + constr_CHOICE_uper.c + constr_CHOICE_xer.c constr_SEQUENCE.c + constr_SEQUENCE_aper.c constr_SEQUENCE_OF.c + constr_SEQUENCE_OF_aper.c + constr_SEQUENCE_OF_uper.c + constr_SEQUENCE_OF_xer.c + constr_SEQUENCE_print.c + constr_SEQUENCE_rfill.c + constr_SEQUENCE_uper.c + constr_SEQUENCE_xer.c constr_SET_OF.c + constr_SET_OF_aper.c + constr_SET_OF_print.c + constr_SET_OF_rfill.c + constr_SET_OF_uper.c + constr_SET_OF_xer.c constr_TYPE.c INTEGER.c + INTEGER_aper.c + INTEGER_print.c + INTEGER_rfill.c + INTEGER_uper.c + INTEGER_xer.c Makefile.am.libasncodec NativeEnumerated.c + NativeEnumerated_aper.c + NativeEnumerated_uper.c + NativeEnumerated_xer.c NativeInteger.c + NativeInteger_aper.c + NativeInteger_print.c + NativeInteger_rfill.c + NativeInteger_uper.c + NativeInteger_xer.c NULL.c + NULL_aper.c + NULL_print.c + NULL_rfill.c + NULL_uper.c + NULL_xer.c OBJECT_IDENTIFIER.c + OBJECT_IDENTIFIER_print.c + OBJECT_IDENTIFIER_rfill.c + OBJECT_IDENTIFIER_xer.c OCTET_STRING.c + OCTET_STRING_aper.c + OCTET_STRING_print.c + OCTET_STRING_rfill.c + OCTET_STRING_uper.c + OCTET_STRING_xer.c OPEN_TYPE.c + OPEN_TYPE_aper.c + OPEN_TYPE_uper.c + OPEN_TYPE_xer.c + per_opentype.c + per_encoder.c VisibleString.c xer_decoder.c xer_encoder.c @@ -819,14 +873,22 @@ set(xnap_source XNAP_XnUAddressIndication.c XNAP_XnUAddressInfoperPDUSession-Item.c XNAP_XnUAddressInfoperPDUSession-List.c + uper_encoder.c + uper_opentype.c + uper_support.c ) set(xnap_headers ANY.h + aper_decoder.h + aper_encoder.h + aper_opentype.h + aper_support.h asn_application.h asn_bit_data.h asn_codecs.h asn_codecs_prim.h + asn_codecs_prim_xer.h asn_internal.h asn_ioc.h asn_random_fill.h @@ -836,23 +898,72 @@ set(xnap_headers ber_tlv_length.h ber_tlv_tag.h BIT_STRING.h + BIT_STRING_print.h + BIT_STRING_rfill.h + BIT_STRING_uper.h + BIT_STRING_xer.h constraints.h constr_CHOICE.h + constr_CHOICE_aper.h + constr_CHOICE_print.h + constr_CHOICE_rfill.h + constr_CHOICE_uper.h + constr_CHOICE_xer.h constr_SEQUENCE.h + constr_SEQUENCE_aper.h constr_SEQUENCE_OF.h + constr_SEQUENCE_OF_aper.h + constr_SEQUENCE_OF_uper.h + constr_SEQUENCE_OF_xer.h + constr_SEQUENCE_print.h + constr_SEQUENCE_rfill.h + constr_SEQUENCE_uper.h + constr_SEQUENCE_xer.h constr_SET_OF.h + constr_SET_OF_aper.h + constr_SET_OF_print.h + constr_SET_OF_rfill.h + constr_SET_OF_uper.h + constr_SET_OF_xer.h constr_TYPE.h INTEGER.h + INTEGER_aper.h + INTEGER_print.h + INTEGER_rfill.h + INTEGER_uper.h + INTEGER_xer.h NativeEnumerated.h + NativeEnumerated_aper.h + NativeEnumerated_uper.h + NativeEnumerated_xer.h NativeInteger.h + NativeInteger_aper.h + NativeInteger_print.h + NativeInteger_rfill.h + NativeInteger_xer.h + NativeInteger_uper.h NULL.h + NULL_aper.h + NULL_print.h + NULL_rfill.h + NULL_uper.h + NULL_xer.h OBJECT_IDENTIFIER.h + OBJECT_IDENTIFIER_print.h + OBJECT_IDENTIFIER_rfill.h + OBJECT_IDENTIFIER_xer.h OCTET_STRING.h + OCTET_STRING_aper.h + OCTET_STRING_print.h + OCTET_STRING_rfill.h + OCTET_STRING_uper.h + OCTET_STRING_xer.h OPEN_TYPE.h - aper_decoder.h - aper_encoder.h - aper_opentype.h - aper_support.h + OPEN_TYPE_aper.h + OPEN_TYPE_uper.h + OPEN_TYPE_xer.h + per_encoder.h + per_opentype.h VisibleString.h xer_decoder.h xer_encoder.h @@ -1643,5 +1754,8 @@ set(xnap_headers XNAP_XnUAddressIndication.h XNAP_XnUAddressInfoperPDUSession-Item.h XNAP_XnUAddressInfoperPDUSession-List.h + uper_encoder.h + uper_opentype.h + uper_support.h )