diff --git a/openair3/NGAP/ngap_common.h b/openair3/NGAP/ngap_common.h index 0ae5417d01..c2426a7b8a 100644 --- a/openair3/NGAP/ngap_common.h +++ b/openair3/NGAP/ngap_common.h @@ -36,49 +36,17 @@ #ifndef NGAP_COMMON_H_ #define NGAP_COMMON_H_ -#include "common/utils/LOG/log.h" +#include #include "oai_asn1.h" +#include "ngap_utils.h" #include "ngap_msg_includes.h" -#include "openair2/COMMON/ngap_messages_types.h" +#include "ngap_messages_types.h" /* Checking version of ASN1C compiler */ #if (ASN1C_ENVIRONMENT_VERSION < ASN1C_MINIMUM_VERSION) # error "You are compiling ngap with the wrong version of ASN1C" #endif -# include "common/utils/LOG/log.h" -# include "ngap_gNB_default_values.h" -# define NGAP_ERROR(x, args...) LOG_E(NGAP, x, ##args) -# define NGAP_WARN(x, args...) LOG_W(NGAP, x, ##args) -# define NGAP_TRAF(x, args...) LOG_I(NGAP, x, ##args) -# define NGAP_INFO(x, args...) LOG_I(NGAP, x, ##args) -# define NGAP_DEBUG(x, args...) LOG_D(NGAP, x, ##args) - -#define NGAP_FIND_PROTOCOLIE_BY_ID(IE_TYPE, ie, container, IE_ID, mandatory) \ - do { \ - IE_TYPE **ptr; \ - ie = NULL; \ - for (ptr = container->protocolIEs.list.array; ptr < &container->protocolIEs.list.array[container->protocolIEs.list.count]; ptr++) { \ - if ((*ptr)->id == IE_ID) { \ - ie = *ptr; \ - break; \ - } \ - } \ - if (ie == NULL) { \ - if (mandatory) { \ - AssertFatal(NGAP, "NGAP_FIND_PROTOCOLIE_BY_ID ie is NULL (searching for ie: %ld)\n", IE_ID); \ - } else { \ - NGAP_DEBUG("NGAP_FIND_PROTOCOLIE_BY_ID ie is NULL (searching for ie: %ld)\n", IE_ID); \ - } \ - } \ - } while (0); \ - if (mandatory && !ie) \ - return -1 - -/** \brief Function callback prototype. - **/ -typedef int (*ngap_message_decoded_callback)(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu); - void tnl_to_bitstring(BIT_STRING_t *out, const transport_layer_addr_t in); void bitstring_to_tnl(transport_layer_addr_t *out, const BIT_STRING_t in); void encode_ngap_cause(NGAP_Cause_t *out, const ngap_cause_t *in); diff --git a/openair3/NGAP/ngap_gNB_handlers.c b/openair3/NGAP/ngap_gNB_handlers.c index 1e5b024190..6e48505ff4 100644 --- a/openair3/NGAP/ngap_gNB_handlers.c +++ b/openair3/NGAP/ngap_gNB_handlers.c @@ -1529,6 +1529,8 @@ static int ngap_gNB_handle_dl_ran_status_transfer(sctp_assoc_t assoc_id, uint32_ return 0; } +typedef int (*ngap_message_decoded_callback)(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu); + /* Handlers matrix. Only gNB related procedure present here */ const ngap_message_decoded_callback ngap_messages_callback[][3] = { {0, 0, 0}, /* AMFConfigurationUpdate */ diff --git a/openair3/NGAP/ngap_utils.h b/openair3/NGAP/ngap_utils.h new file mode 100644 index 0000000000..34d288fb27 --- /dev/null +++ b/openair3/NGAP/ngap_utils.h @@ -0,0 +1,61 @@ +/* + * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The OpenAirInterface Software Alliance licenses this file to You under + * the OAI Public License, Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.openairinterface.org/?page_id=698 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *------------------------------------------------------------------------------- + * For more information about the OpenAirInterface Software Alliance: + * contact@openairinterface.org + */ + +#ifndef NGAP_UTILS_H_ +#define NGAP_UTILS_H_ + +#include +#include +#include +#include "common/utils/LOG/log.h" +#include "assertions.h" + +#define NGAP_UE_ID_FMT "0x%06" PRIX32 + +#define NGAP_ERROR(x, args...) LOG_E(NGAP, x, ##args) +#define NGAP_WARN(x, args...) LOG_W(NGAP, x, ##args) +#define NGAP_TRAF(x, args...) LOG_I(NGAP, x, ##args) +#define NGAP_INFO(x, args...) LOG_I(NGAP, x, ##args) +#define NGAP_DEBUG(x, args...) LOG_D(NGAP, x, ##args) + +#define NGAP_FIND_PROTOCOLIE_BY_ID(IE_TYPE, ie, container, IE_ID, mandatory) \ + do { \ + IE_TYPE **ptr; \ + ie = NULL; \ + for (ptr = container->protocolIEs.list.array; ptr < &container->protocolIEs.list.array[container->protocolIEs.list.count]; \ + ptr++) { \ + if ((*ptr)->id == IE_ID) { \ + ie = *ptr; \ + break; \ + } \ + } \ + if (ie == NULL) { \ + if (mandatory) { \ + AssertFatal(NGAP, "NGAP_FIND_PROTOCOLIE_BY_ID ie is NULL (searching for ie: %ld)\n", IE_ID); \ + } else { \ + NGAP_DEBUG("NGAP_FIND_PROTOCOLIE_BY_ID ie is NULL (searching for ie: %ld)\n", IE_ID); \ + } \ + } \ + } while (0); \ + if (mandatory && !ie) \ + return -1 + +#endif /* NGAP_UTILS_H_ */