From 3f46a71157f6092a484842323dcd8f2ca1d30afb Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 24 Aug 2023 13:35:45 +0200 Subject: [PATCH] SCTP assoc_id: Make it sctp_assoc_t, project-wide --- openair2/COMMON/e1ap_messages_types.h | 4 +- openair2/COMMON/f1ap_messages_types.h | 4 +- openair2/COMMON/m2ap_messages_types.h | 6 +- openair2/COMMON/m3ap_messages_types.h | 4 +- openair2/COMMON/s1ap_messages_types.h | 2 + openair2/COMMON/sctp_messages_types.h | 11 +- openair2/COMMON/x2ap_messages_types.h | 4 +- openair2/E1AP/e1ap.c | 86 +++-- openair2/E1AP/e1ap_common.h | 2 +- openair2/F1AP/f1ap_common.h | 16 +- openair2/F1AP/f1ap_cu_interface_management.c | 51 ++- openair2/F1AP/f1ap_cu_interface_management.h | 43 +-- openair2/F1AP/f1ap_cu_rrc_message_transfer.c | 12 +- openair2/F1AP/f1ap_cu_rrc_message_transfer.h | 14 +- openair2/F1AP/f1ap_cu_ue_context_management.c | 38 +- openair2/F1AP/f1ap_cu_ue_context_management.h | 33 +- openair2/F1AP/f1ap_du_interface_management.c | 51 ++- openair2/F1AP/f1ap_du_interface_management.h | 48 +-- openair2/F1AP/f1ap_du_paging.c | 6 +- openair2/F1AP/f1ap_du_paging.h | 5 +- openair2/F1AP/f1ap_du_rrc_message_transfer.c | 6 +- openair2/F1AP/f1ap_du_rrc_message_transfer.h | 5 +- openair2/F1AP/f1ap_du_ue_context_management.c | 13 +- openair2/F1AP/f1ap_du_ue_context_management.h | 21 +- openair2/F1AP/f1ap_handlers.c | 2 +- openair2/M2AP/m2ap_MCE_defs.h | 2 +- openair2/M2AP/m2ap_MCE_generate_messages.c | 2 +- openair2/M2AP/m2ap_MCE_generate_messages.h | 2 +- openair2/M2AP/m2ap_MCE_handler.c | 8 +- openair2/M2AP/m2ap_MCE_handler.h | 12 +- openair2/M2AP/m2ap_MCE_interface_management.c | 142 +++----- openair2/M2AP/m2ap_MCE_interface_management.h | 98 ++---- .../M2AP/m2ap_MCE_management_procedures.c | 4 +- .../M2AP/m2ap_MCE_management_procedures.h | 4 +- openair2/M2AP/m2ap_common.h | 20 +- openair2/M2AP/m2ap_eNB_defs.h | 4 +- openair2/M2AP/m2ap_eNB_generate_messages.c | 2 +- openair2/M2AP/m2ap_eNB_generate_messages.h | 2 +- openair2/M2AP/m2ap_eNB_handler.c | 8 +- openair2/M2AP/m2ap_eNB_handler.h | 9 +- openair2/M2AP/m2ap_eNB_interface_management.c | 65 +--- openair2/M2AP/m2ap_eNB_interface_management.h | 67 +--- .../M2AP/m2ap_eNB_management_procedures.c | 4 +- .../M2AP/m2ap_eNB_management_procedures.h | 4 +- openair2/M2AP/m2ap_handler.c | 8 +- openair2/M2AP/m2ap_handler.h | 15 +- openair2/M2AP/m2ap_itti_messaging.c | 19 +- openair2/M2AP/m2ap_itti_messaging.h | 21 +- openair2/RRC/LTE/rrc_defs.h | 2 +- openair2/RRC/NR/nr_rrc_defs.h | 2 +- openair2/RRC/NR/rrc_gNB.c | 4 +- openair2/X2AP/x2ap_common.h | 8 +- openair2/X2AP/x2ap_eNB_defs.h | 2 +- openair2/X2AP/x2ap_eNB_generate_messages.c | 2 +- openair2/X2AP/x2ap_eNB_generate_messages.h | 2 +- openair2/X2AP/x2ap_eNB_handler.c | 324 ++++++------------ openair2/X2AP/x2ap_eNB_handler.h | 7 +- openair2/X2AP/x2ap_eNB_itti_messaging.c | 9 +- openair2/X2AP/x2ap_eNB_itti_messaging.h | 10 +- .../X2AP/x2ap_eNB_management_procedures.c | 4 +- .../X2AP/x2ap_eNB_management_procedures.h | 4 +- openair3/M3AP/m3ap_MCE_defs.h | 2 +- openair3/M3AP/m3ap_MCE_generate_messsages.c | 2 +- openair3/M3AP/m3ap_MCE_handler.c | 8 +- openair3/M3AP/m3ap_MCE_handler.h | 10 +- openair3/M3AP/m3ap_MCE_interface_management.c | 39 +-- openair3/M3AP/m3ap_MCE_interface_management.h | 43 +-- .../M3AP/m3ap_MCE_management_procedures.c | 4 +- .../M3AP/m3ap_MCE_management_procedures.h | 4 +- openair3/M3AP/m3ap_MME_defs.h | 2 +- openair3/M3AP/m3ap_MME_generate_messages.c | 2 +- openair3/M3AP/m3ap_MME_generate_messages.h | 2 +- openair3/M3AP/m3ap_MME_handler.c | 8 +- openair3/M3AP/m3ap_MME_handler.h | 10 +- openair3/M3AP/m3ap_MME_interface_management.c | 129 +++---- openair3/M3AP/m3ap_MME_interface_management.h | 56 +-- .../M3AP/m3ap_MME_management_procedures.c | 4 +- .../M3AP/m3ap_MME_management_procedures.h | 4 +- openair3/M3AP/m3ap_common.h | 21 +- openair3/M3AP/m3ap_handler.c | 8 +- openair3/M3AP/m3ap_handler.h | 9 +- openair3/M3AP/m3ap_itti_messaging.c | 19 +- openair3/M3AP/m3ap_itti_messaging.h | 21 +- openair3/NGAP/ngap_common.h | 6 +- openair3/NGAP/ngap_gNB_defs.h | 2 +- openair3/NGAP/ngap_gNB_handlers.c | 77 ++--- openair3/NGAP/ngap_gNB_handlers.h | 3 +- openair3/NGAP/ngap_gNB_itti_messaging.c | 9 +- openair3/NGAP/ngap_gNB_itti_messaging.h | 11 +- .../NGAP/ngap_gNB_management_procedures.c | 4 +- .../NGAP/ngap_gNB_management_procedures.h | 4 +- openair3/NGAP/ngap_gNB_nas_procedures.c | 4 +- openair3/NGAP/ngap_gNB_nas_procedures.h | 5 +- openair3/NGAP/ngap_gNB_overload.c | 8 +- openair3/NGAP/ngap_gNB_overload.h | 8 +- openair3/NGAP/ngap_gNB_trace.c | 9 +- openair3/NGAP/ngap_gNB_trace.h | 8 +- openair3/S1AP/s1ap_common.h | 8 +- openair3/S1AP/s1ap_eNB_defs.h | 2 +- openair3/S1AP/s1ap_eNB_handlers.c | 143 +++----- openair3/S1AP/s1ap_eNB_handlers.h | 3 +- openair3/S1AP/s1ap_eNB_itti_messaging.c | 9 +- openair3/S1AP/s1ap_eNB_itti_messaging.h | 14 +- .../S1AP/s1ap_eNB_management_procedures.c | 4 +- .../S1AP/s1ap_eNB_management_procedures.h | 4 +- openair3/S1AP/s1ap_eNB_nas_procedures.c | 4 +- openair3/S1AP/s1ap_eNB_nas_procedures.h | 5 +- openair3/S1AP/s1ap_eNB_overload.c | 8 +- openair3/S1AP/s1ap_eNB_overload.h | 8 +- openair3/S1AP/s1ap_eNB_trace.c | 8 +- openair3/S1AP/s1ap_eNB_trace.h | 8 +- openair3/SCTP/sctp_eNB_defs.h | 10 +- openair3/SCTP/sctp_eNB_itti_messaging.c | 29 +- openair3/SCTP/sctp_eNB_itti_messaging.h | 30 +- openair3/SCTP/sctp_eNB_task.c | 8 +- 115 files changed, 818 insertions(+), 1441 deletions(-) diff --git a/openair2/COMMON/e1ap_messages_types.h b/openair2/COMMON/e1ap_messages_types.h index 7a1a8b2698..fba56ccb14 100644 --- a/openair2/COMMON/e1ap_messages_types.h +++ b/openair2/COMMON/e1ap_messages_types.h @@ -24,6 +24,8 @@ #ifndef E1AP_MESSAGES_TYPES_H #define E1AP_MESSAGES_TYPES_H +#include +#include #include "common/ngran_types.h" #include "f1ap_messages_types.h" #include "ngap_messages_types.h" @@ -55,7 +57,7 @@ typedef struct PLMN_ID_s { typedef struct e1ap_setup_req_s { uint64_t gNB_cu_up_id; char * gNB_cu_up_name; - int assoc_id; + sctp_assoc_t assoc_id; uint64_t transac_id; int supported_plmns; PLMN_ID_t plmns[E1AP_MAX_NUM_PLMNS]; diff --git a/openair2/COMMON/f1ap_messages_types.h b/openair2/COMMON/f1ap_messages_types.h index b0ec1e1e35..b47a763089 100644 --- a/openair2/COMMON/f1ap_messages_types.h +++ b/openair2/COMMON/f1ap_messages_types.h @@ -22,6 +22,8 @@ #ifndef F1AP_MESSAGES_TYPES_H_ #define F1AP_MESSAGES_TYPES_H_ +#include +#include #include "rlc.h" #include "s1ap_messages_types.h" @@ -194,7 +196,7 @@ typedef struct f1ap_gnb_cu_configuration_update_s { uint16_t cnx_id; /* SCTP association id */ - int32_t assoc_id; + sctp_assoc_t assoc_id; /* Number of SCTP streams used for a mme association */ uint16_t sctp_in_streams; diff --git a/openair2/COMMON/m2ap_messages_types.h b/openair2/COMMON/m2ap_messages_types.h index 4187f1736c..d38c493bcb 100644 --- a/openair2/COMMON/m2ap_messages_types.h +++ b/openair2/COMMON/m2ap_messages_types.h @@ -23,6 +23,8 @@ #ifndef M2AP_MESSAGES_TYPES_H_ #define M2AP_MESSAGES_TYPES_H_ +#include +#include #include "s1ap_messages_types.h" #include "LTE_PhysCellId.h" @@ -104,7 +106,7 @@ typedef struct m2ap_setup_req_s { uint16_t cnx_id; /* SCTP association id */ - int32_t assoc_id; + sctp_assoc_t assoc_id; /* The eNB IP address to bind */ m2ap_net_ip_address_t MCE_M2_ip_address; @@ -258,7 +260,7 @@ typedef struct m2ap_setup_resp_s { uint16_t cnx_id; /* SCTP association id */ - int32_t assoc_id; + sctp_assoc_t assoc_id; /* Number of SCTP streams used for a mme association */ uint16_t sctp_in_streams; diff --git a/openair2/COMMON/m3ap_messages_types.h b/openair2/COMMON/m3ap_messages_types.h index 815f8b6df4..171631ddbd 100644 --- a/openair2/COMMON/m3ap_messages_types.h +++ b/openair2/COMMON/m3ap_messages_types.h @@ -22,6 +22,8 @@ #ifndef M3AP_MESSAGES_TYPES_H_ #define M3AP_MESSAGES_TYPES_H_ +#include +#include #include "s1ap_messages_types.h" #include "LTE_PhysCellId.h" @@ -336,7 +338,7 @@ typedef struct m3ap_setup_req_s{ /* Connexion id used between SCTP/M3AP */ uint16_t cnx_id; /* SCTP association id */ - int32_t assoc_id; + sctp_assoc_t assoc_id; /* Number of SCTP streams used for a mme association */ uint16_t sctp_in_streams; diff --git a/openair2/COMMON/s1ap_messages_types.h b/openair2/COMMON/s1ap_messages_types.h index 2151375686..3dd8fc8213 100644 --- a/openair2/COMMON/s1ap_messages_types.h +++ b/openair2/COMMON/s1ap_messages_types.h @@ -22,6 +22,8 @@ #ifndef S1AP_MESSAGES_TYPES_H_ #define S1AP_MESSAGES_TYPES_H_ +#include +#include #include "LTE_asn_constant.h" //-------------------------------------------------------------------------------------------// // Defines to access message fields. diff --git a/openair2/COMMON/sctp_messages_types.h b/openair2/COMMON/sctp_messages_types.h index c2561c0424..88790bdc1f 100644 --- a/openair2/COMMON/sctp_messages_types.h +++ b/openair2/COMMON/sctp_messages_types.h @@ -22,6 +22,9 @@ #ifndef SCTP_MESSAGES_TYPES_H_ #define SCTP_MESSAGES_TYPES_H_ +#include +#include + #define SCTP_NEW_ASSOCIATION_REQ(mSGpTR) (mSGpTR)->ittiMsg.sctp_new_association_req #define SCTP_NEW_ASSOCIATION_REQ_MULTI(mSGpTR) (mSGpTR)->ittiMsg.sctp_new_association_req_multi #define SCTP_NEW_ASSOCIATION_RESP(mSGpTR) (mSGpTR)->ittiMsg.sctp_new_association_resp @@ -87,7 +90,7 @@ typedef struct sctp_init_msg_multi_cnf_s { typedef struct sctp_new_association_ind_s { /* Assoc id of the new association */ - int32_t assoc_id; + sctp_assoc_t assoc_id; /* The port used by remote host */ uint16_t port; @@ -102,7 +105,7 @@ typedef struct sctp_new_association_resp_s { uint16_t ulp_cnx_id; /* SCTP Association ID */ - int32_t assoc_id; + sctp_assoc_t assoc_id; /* Input/output streams */ uint16_t out_streams; @@ -114,7 +117,7 @@ typedef struct sctp_new_association_resp_s { typedef struct sctp_data_ind_s { /* SCTP Association ID */ - int32_t assoc_id; + sctp_assoc_t assoc_id; /* Buffer to send over SCTP */ uint32_t buffer_length; @@ -139,7 +142,7 @@ typedef struct sctp_init_s { typedef struct sctp_close_association_s { - uint32_t assoc_id; + sctp_assoc_t assoc_id; } sctp_close_association_t; diff --git a/openair2/COMMON/x2ap_messages_types.h b/openair2/COMMON/x2ap_messages_types.h index ca01be5035..8ce43cc96c 100644 --- a/openair2/COMMON/x2ap_messages_types.h +++ b/openair2/COMMON/x2ap_messages_types.h @@ -22,6 +22,8 @@ #ifndef X2AP_MESSAGES_TYPES_H_ #define X2AP_MESSAGES_TYPES_H_ +#include +#include #include "s1ap_messages_types.h" #include "LTE_PhysCellId.h" @@ -425,7 +427,7 @@ typedef struct x2ap_ENDC_reconf_complete_s { typedef struct x2ap_ENDC_sgnb_release_request_s { int rnti; x2ap_cause_t cause; - int assoc_id; + sctp_assoc_t assoc_id; } x2ap_ENDC_sgnb_release_request_t; typedef struct x2ap_ENDC_sgnb_release_required_s { diff --git a/openair2/E1AP/e1ap.c b/openair2/E1AP/e1ap.c index 4ad4ea8415..2390b23d2e 100644 --- a/openair2/E1AP/e1ap.c +++ b/openair2/E1AP/e1ap.c @@ -67,8 +67,8 @@ const char *const e1ap_direction2String(int e1ap_dir) return(e1ap_direction_String[e1ap_dir]); } -int e1ap_handle_message(instance_t instance, uint32_t assoc_id, - const uint8_t *const data, const uint32_t data_length) { +int e1ap_handle_message(instance_t instance, sctp_assoc_t assoc_id, const uint8_t *const data, const uint32_t data_length) +{ E1AP_E1AP_PDU_t pdu= {0}; int ret; DevAssert(data != NULL); @@ -128,18 +128,14 @@ int e1ap_send_RESET_ACKNOWLEDGE(instance_t instance, E1AP_Reset_t *Reset) { return -1; } -int e1ap_handle_RESET(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - E1AP_E1AP_PDU_t *pdu) { +int e1ap_handle_RESET(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, E1AP_E1AP_PDU_t *pdu) +{ AssertFatal(false,"Not implemented yet\n"); return -1; } -int e1ap_handle_RESET_ACKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - E1AP_E1AP_PDU_t *pdu) { +int e1ap_handle_RESET_ACKNOWLEDGE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, E1AP_E1AP_PDU_t *pdu) +{ AssertFatal(false,"Not implemented yet\n"); return -1; } @@ -147,10 +143,8 @@ int e1ap_handle_RESET_ACKNOWLEDGE(instance_t instance, /* Error Indication */ -int e1ap_handle_ERROR_INDICATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - E1AP_E1AP_PDU_t *pdu) { +int e1ap_handle_ERROR_INDICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, E1AP_E1AP_PDU_t *pdu) +{ AssertFatal(false,"Not implemented yet\n"); return -1; } @@ -465,13 +459,19 @@ int e1apCUCP_handle_CONFIGURATION_UPDATE(e1ap_setup_req_t *setupReq, E1AP_E1AP_P return -1; } -int e1apCUUP_handle_gNB_DU_CONFIGURATION_UPDATE_ACKNOWLEDGE(e1ap_setup_req_t *setupReq, uint32_t assoc_id, uint32_t stream, E1AP_E1AP_PDU_t *pdu) +int e1apCUUP_handle_gNB_DU_CONFIGURATION_UPDATE_ACKNOWLEDGE(e1ap_setup_req_t *setupReq, + sctp_assoc_t assoc_id, + uint32_t stream, + E1AP_E1AP_PDU_t *pdu) { AssertFatal(false,"Not implemented yet\n"); return -1; } -int e1apCUUP_handle_gNB_DU_CONFIGURATION_FAILURE(e1ap_setup_req_t *setupReq, uint32_t assoc_id, uint32_t stream, E1AP_E1AP_PDU_t *pdu) +int e1apCUUP_handle_gNB_DU_CONFIGURATION_FAILURE(e1ap_setup_req_t *setupReq, + sctp_assoc_t assoc_id, + uint32_t stream, + E1AP_E1AP_PDU_t *pdu) { AssertFatal(false,"Not implemented yet\n"); return -1; @@ -491,18 +491,14 @@ int e1ap_send_RELEASE_ACKNOWLEDGE(instance_t instance) { return -1; } -int e1ap_handle_RELEASE_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - E1AP_E1AP_PDU_t *pdu) { +int e1ap_handle_RELEASE_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, E1AP_E1AP_PDU_t *pdu) +{ AssertFatal(false,"Not implemented yet\n"); return -1; } -int e1ap_handle_RELEASE_ACKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - E1AP_E1AP_PDU_t *pdu) { +int e1ap_handle_RELEASE_ACKNOWLEDGE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, E1AP_E1AP_PDU_t *pdu) +{ AssertFatal(false,"Not implemented yet\n"); return -1; } @@ -1251,17 +1247,19 @@ int e1apCUUP_handle_BEARER_CONTEXT_MODIFICATION_REQUEST(e1ap_upcp_inst_t *e1_ins } int e1apCUCP_handle_BEARER_CONTEXT_MODIFICATION_RESPONSE(instance_t instance, - uint32_t assoc_id, + sctp_assoc_t assoc_id, uint32_t stream, - E1AP_E1AP_PDU_t *pdu) { + E1AP_E1AP_PDU_t *pdu) +{ AssertFatal(false,"Not implemented yet\n"); return -1; } int e1apCUCP_handle_BEARER_CONTEXT_MODIFICATION_FAILURE(instance_t instance, - uint32_t assoc_id, + sctp_assoc_t assoc_id, uint32_t stream, - E1AP_E1AP_PDU_t *pdu) { + E1AP_E1AP_PDU_t *pdu) +{ AssertFatal(false,"Not implemented yet\n"); return -1; } @@ -1277,17 +1275,19 @@ int e1apCUCP_send_BEARER_CONTEXT_MODIFICATION_CONFIRM(instance_t instance) { } int e1apCUCP_handle_BEARER_CONTEXT_MODIFICATION_REQUIRED(instance_t instance, - uint32_t assoc_id, + sctp_assoc_t assoc_id, uint32_t stream, - E1AP_E1AP_PDU_t *pdu) { + E1AP_E1AP_PDU_t *pdu) +{ AssertFatal(false,"Not implemented yet\n"); return -1; } int e1apCUUP_handle_BEARER_CONTEXT_MODIFICATION_CONFIRM(instance_t instance, - uint32_t assoc_id, + sctp_assoc_t assoc_id, uint32_t stream, - E1AP_E1AP_PDU_t *pdu) { + E1AP_E1AP_PDU_t *pdu) +{ AssertFatal(false,"Not implemented yet\n"); return -1; } @@ -1464,9 +1464,10 @@ int e1apCUCP_handle_BEARER_CONTEXT_RELEASE_COMPLETE(e1ap_upcp_inst_t *e1_inst, c } int e1apCUCP_handle_BEARER_CONTEXT_RELEASE_REQUEST(instance_t instance, - uint32_t assoc_id, + sctp_assoc_t assoc_id, uint32_t stream, - E1AP_E1AP_PDU_t *pdu) { + E1AP_E1AP_PDU_t *pdu) +{ AssertFatal(false,"Not implemented yet\n"); return -1; } @@ -1481,9 +1482,10 @@ int e1apCUUP_send_BEARER_CONTEXT_INACTIVITY_NOTIFICATION(instance_t instance) { } int e1apCUCP_handle_BEARER_CONTEXT_INACTIVITY_NOTIFICATION(instance_t instance, - uint32_t assoc_id, + sctp_assoc_t assoc_id, uint32_t stream, - E1AP_E1AP_PDU_t *pdu) { + E1AP_E1AP_PDU_t *pdu) +{ AssertFatal(false,"Not implemented yet\n"); return -1; } @@ -1501,18 +1503,14 @@ int e1apCUUP_send_DATA_USAGE_REPORT(instance_t instance) { return -1; } -int e1apCUCP_handle_DL_DATA_NOTIFICATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - E1AP_E1AP_PDU_t *pdu) { +int e1apCUCP_handle_DL_DATA_NOTIFICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, E1AP_E1AP_PDU_t *pdu) +{ AssertFatal(false,"Not implemented yet\n"); return -1; } -int e1apCUCP_handle_send_DATA_USAGE_REPORT(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - E1AP_E1AP_PDU_t *pdu) { +int e1apCUCP_handle_send_DATA_USAGE_REPORT(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, E1AP_E1AP_PDU_t *pdu) +{ AssertFatal(false,"Not implemented yet\n"); return -1; } diff --git a/openair2/E1AP/e1ap_common.h b/openair2/E1AP/e1ap_common.h index 80a2b925e1..cddf5b9ea6 100644 --- a/openair2/E1AP/e1ap_common.h +++ b/openair2/E1AP/e1ap_common.h @@ -34,7 +34,7 @@ typedef struct e1ap_upcp_inst_s { bool same_process; E1_t type; enum sctp_state_e sockState; - uint32_t assoc_id; + sctp_assoc_t assoc_id; instance_t gtpInstN3; instance_t gtpInstF1U; e1ap_setup_req_t setupReq; diff --git a/openair2/F1AP/f1ap_common.h b/openair2/F1AP/f1ap_common.h index 3e0cbb4c8a..5dcd661b3b 100644 --- a/openair2/F1AP/f1ap_common.h +++ b/openair2/F1AP/f1ap_common.h @@ -387,14 +387,12 @@ /** \brief Function array prototype. **/ -typedef int (*f1ap_message_processing_t)( - instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *message_p -); -int f1ap_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - const uint8_t *const data, const uint32_t data_length); +typedef int (*f1ap_message_processing_t)(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *message_p); +int f1ap_handle_message(instance_t instance, + sctp_assoc_t assoc_id, + int32_t stream, + const uint8_t *const data, + const uint32_t data_length); typedef struct f1ap_cudu_inst_s { f1ap_setup_req_t setupReq; @@ -403,7 +401,7 @@ typedef struct f1ap_cudu_inst_s { f1ap_net_config_t net_config; /* SCTP information */ - int32_t assoc_id; + sctp_assoc_t assoc_id; uint16_t sctp_in_streams; uint16_t sctp_out_streams; diff --git a/openair2/F1AP/f1ap_cu_interface_management.c b/openair2/F1AP/f1ap_cu_interface_management.c index 3ee88c33b5..03b281ea39 100644 --- a/openair2/F1AP/f1ap_cu_interface_management.c +++ b/openair2/F1AP/f1ap_cu_interface_management.c @@ -39,17 +39,13 @@ int CU_send_RESET(instance_t instance, F1AP_Reset_t *Reset) { AssertFatal(1==0,"Not implemented yet\n"); } -int CU_handle_RESET_ACKKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int CU_handle_RESET_ACKKNOWLEDGE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } -int CU_handle_RESET(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int CU_handle_RESET(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } @@ -61,10 +57,8 @@ int CU_send_RESET_ACKNOWLEDGE(instance_t instance, F1AP_ResetAcknowledge_t *Rese /* Error Indication */ -int CU_handle_ERROR_INDICATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int CU_handle_ERROR_INDICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } @@ -76,10 +70,8 @@ int CU_send_ERROR_INDICATION(instance_t instance, F1AP_ErrorIndication_t *ErrorI /* F1 Setup */ -int CU_handle_F1_SETUP_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int CU_handle_F1_SETUP_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ LOG_D(F1AP, "CU_handle_F1_SETUP_REQUEST\n"); F1AP_F1SetupRequest_t *container; F1AP_F1SetupRequestIEs_t *ie; @@ -422,10 +414,8 @@ int CU_send_F1_SETUP_FAILURE(instance_t instance) { gNB-DU Configuration Update */ -int CU_handle_gNB_DU_CONFIGURATION_UPDATE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int CU_handle_gNB_DU_CONFIGURATION_UPDATE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } @@ -534,26 +524,25 @@ int CU_send_gNB_CU_CONFIGURATION_UPDATE(instance_t instance, f1ap_gnb_cu_configu return 0; } -int CU_handle_gNB_CU_CONFIGURATION_UPDATE_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int CU_handle_gNB_CU_CONFIGURATION_UPDATE_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } int CU_handle_gNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { + sctp_assoc_t assoc_id, + uint32_t stream, + F1AP_F1AP_PDU_t *pdu) +{ LOG_I(F1AP,"Cell Configuration ok (assoc_id %d)\n",assoc_id); return(0); } - int CU_handle_gNB_DU_RESOURCE_COORDINATION_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { + sctp_assoc_t assoc_id, + uint32_t stream, + F1AP_F1AP_PDU_t *pdu) +{ AssertFatal(0, "Not implemented yet\n"); } diff --git a/openair2/F1AP/f1ap_cu_interface_management.h b/openair2/F1AP/f1ap_cu_interface_management.h index 83da037925..abdb60bf88 100644 --- a/openair2/F1AP/f1ap_cu_interface_management.h +++ b/openair2/F1AP/f1ap_cu_interface_management.h @@ -37,32 +37,20 @@ * Reset */ int CU_send_RESET(instance_t instance, F1AP_Reset_t *Reset); -int CU_handle_RESET_ACKKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); -int CU_handle_RESET(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int CU_handle_RESET_ACKKNOWLEDGE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); +int CU_handle_RESET(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); int CU_send_RESET_ACKNOWLEDGE(instance_t instance, F1AP_ResetAcknowledge_t *ResetAcknowledge); /* * Error Indication */ -int CU_handle_ERROR_INDICATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int CU_handle_ERROR_INDICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); int CU_send_ERROR_INDICATION(instance_t instance, F1AP_ErrorIndication_t *ErrorIndication); /* * F1 Setup */ -int CU_handle_F1_SETUP_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int CU_handle_F1_SETUP_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); int CU_send_F1_SETUP_RESPONSE(instance_t instance, f1ap_setup_resp_t *f1ap_setup_resp); @@ -71,10 +59,7 @@ int CU_send_F1_SETUP_FAILURE(instance_t instance); /* * gNB-DU Configuration Update */ -int CU_handle_gNB_DU_CONFIGURATION_UPDATE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int CU_handle_gNB_DU_CONFIGURATION_UPDATE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); int CU_send_gNB_DU_CONFIGURATION_FAILURE(instance_t instance, F1AP_GNBDUConfigurationUpdateFailure_t *GNBDUConfigurationUpdateFailure); @@ -87,22 +72,22 @@ int CU_send_gNB_DU_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance, */ int CU_send_gNB_CU_CONFIGURATION_UPDATE(instance_t instance, f1ap_gnb_cu_configuration_update_t *f1ap_gnb_cu_configuration_update); int CU_handle_gNB_CU_CONFIGURATION_UPDATE_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); + sctp_assoc_t assoc_id, + uint32_t stream, + F1AP_F1AP_PDU_t *pdu); int CU_handle_gNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); + sctp_assoc_t assoc_id, + uint32_t stream, + F1AP_F1AP_PDU_t *pdu); /* * gNB-DU Resource Coordination */ int CU_handle_gNB_DU_RESOURCE_COORDINATION_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); + sctp_assoc_t assoc_id, + uint32_t stream, + F1AP_F1AP_PDU_t *pdu); int CU_send_gNB_DU_RESOURCE_COORDINATION_RESPONSE(instance_t instance, F1AP_GNBDUResourceCoordinationResponse_t *GNBDUResourceCoordinationResponse); diff --git a/openair2/F1AP/f1ap_cu_rrc_message_transfer.c b/openair2/F1AP/f1ap_cu_rrc_message_transfer.c index 18560e5751..391841cfa0 100644 --- a/openair2/F1AP/f1ap_cu_rrc_message_transfer.c +++ b/openair2/F1AP/f1ap_cu_rrc_message_transfer.c @@ -43,10 +43,8 @@ Initial UL RRC Message Transfer */ -int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ LOG_D(F1AP, "CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER\n"); // decode the F1 message // get the rrc message from the contauiner @@ -216,10 +214,8 @@ int CU_send_DL_RRC_MESSAGE_TRANSFER(instance_t instance, /* UL RRC Message Transfer */ -int CU_handle_UL_RRC_MESSAGE_TRANSFER(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int CU_handle_UL_RRC_MESSAGE_TRANSFER(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ LOG_D(F1AP, "CU_handle_UL_RRC_MESSAGE_TRANSFER \n"); F1AP_ULRRCMessageTransfer_t *container; F1AP_ULRRCMessageTransferIEs_t *ie; diff --git a/openair2/F1AP/f1ap_cu_rrc_message_transfer.h b/openair2/F1AP/f1ap_cu_rrc_message_transfer.h index c8c9d3a6f9..6b7023a84d 100644 --- a/openair2/F1AP/f1ap_cu_rrc_message_transfer.h +++ b/openair2/F1AP/f1ap_cu_rrc_message_transfer.h @@ -33,18 +33,10 @@ #ifndef F1AP_CU_RRC_MESSAGE_TRANSFER_H_ #define F1AP_CU_RRC_MESSAGE_TRANSFER_H_ -int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); -int CU_send_DL_RRC_MESSAGE_TRANSFER(instance_t instance, - f1ap_dl_rrc_message_t *f1ap_dl_rrc); - -int CU_handle_UL_RRC_MESSAGE_TRANSFER(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int CU_send_DL_RRC_MESSAGE_TRANSFER(instance_t instance, f1ap_dl_rrc_message_t *f1ap_dl_rrc); +int CU_handle_UL_RRC_MESSAGE_TRANSFER(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); #endif /* F1AP_CU_RRC_MESSAGE_TRANSFER_H_ */ diff --git a/openair2/F1AP/f1ap_cu_ue_context_management.c b/openair2/F1AP/f1ap_cu_ue_context_management.c index f4c1042cad..9e9a85d9e5 100644 --- a/openair2/F1AP/f1ap_cu_ue_context_management.c +++ b/openair2/F1AP/f1ap_cu_ue_context_management.c @@ -632,10 +632,8 @@ int CU_send_UE_CONTEXT_SETUP_REQUEST(instance_t instance, return 0; } -int CU_handle_UE_CONTEXT_SETUP_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int CU_handle_UE_CONTEXT_SETUP_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ MessageDef *msg_p; F1AP_UEContextSetupResponse_t *container; F1AP_UEContextSetupResponseIEs_t *ie; @@ -766,14 +764,12 @@ int CU_handle_UE_CONTEXT_SETUP_RESPONSE(instance_t instance, return 0; } -int CU_handle_UE_CONTEXT_SETUP_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int CU_handle_UE_CONTEXT_SETUP_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } -int CU_handle_UE_CONTEXT_RELEASE_REQUEST(instance_t instance, uint32_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +int CU_handle_UE_CONTEXT_RELEASE_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) { MessageDef *msg = itti_alloc_new_message(TASK_CU_F1, 0, F1AP_UE_CONTEXT_RELEASE_REQ); f1ap_ue_context_release_req_t *req = &F1AP_UE_CONTEXT_RELEASE_REQ(msg); @@ -919,10 +915,9 @@ int CU_send_UE_CONTEXT_RELEASE_COMMAND(instance_t instance, f1ap_itti_send_sctp_data_req(instance, buffer, len); return 0; } -int CU_handle_UE_CONTEXT_RELEASE_COMPLETE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { + +int CU_handle_UE_CONTEXT_RELEASE_COMPLETE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ F1AP_UEContextReleaseComplete_t *container; F1AP_UEContextReleaseCompleteIEs_t *ie; DevAssert(pdu); @@ -1567,11 +1562,8 @@ int CU_send_UE_CONTEXT_MODIFICATION_REQUEST(instance_t instance, f1ap_ue_context return 0; } -int CU_handle_UE_CONTEXT_MODIFICATION_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { - +int CU_handle_UE_CONTEXT_MODIFICATION_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ MessageDef *msg_p; F1AP_UEContextModificationResponse_t *container; F1AP_UEContextModificationResponseIEs_t *ie; @@ -1695,14 +1687,12 @@ int CU_handle_UE_CONTEXT_MODIFICATION_RESPONSE(instance_t instance, return 0; } -int CU_handle_UE_CONTEXT_MODIFICATION_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { - AssertFatal(1==0,"Not implemented yet\n"); +int CU_handle_UE_CONTEXT_MODIFICATION_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ + AssertFatal(1 == 0, "Not implemented yet\n"); } -int CU_handle_UE_CONTEXT_MODIFICATION_REQUIRED(instance_t instance, uint32_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +int CU_handle_UE_CONTEXT_MODIFICATION_REQUIRED(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) { DevAssert(pdu != NULL); diff --git a/openair2/F1AP/f1ap_cu_ue_context_management.h b/openair2/F1AP/f1ap_cu_ue_context_management.h index 76bbecb2b8..5409c6e53e 100644 --- a/openair2/F1AP/f1ap_cu_ue_context_management.h +++ b/openair2/F1AP/f1ap_cu_ue_context_management.h @@ -39,24 +39,14 @@ int CU_send_UE_CONTEXT_SETUP_REQUEST(instance_t instance, f1ap_ue_context_setup_t *f1ap_ue_context_setup_req); -int CU_handle_UE_CONTEXT_SETUP_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); - -int CU_handle_UE_CONTEXT_SETUP_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int CU_handle_UE_CONTEXT_SETUP_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); +int CU_handle_UE_CONTEXT_SETUP_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); /* * UE Context Release Request (gNB-DU initiated) */ -int CU_handle_UE_CONTEXT_RELEASE_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int CU_handle_UE_CONTEXT_RELEASE_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); /* * UE Context Release (gNB-CU initiated) @@ -64,28 +54,19 @@ int CU_handle_UE_CONTEXT_RELEASE_REQUEST(instance_t instance, int CU_send_UE_CONTEXT_RELEASE_COMMAND(instance_t instance, f1ap_ue_context_release_cmd_t *cmd); -int CU_handle_UE_CONTEXT_RELEASE_COMPLETE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int CU_handle_UE_CONTEXT_RELEASE_COMPLETE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); /* * UE Context Modification (gNB-CU initiated) */ int CU_send_UE_CONTEXT_MODIFICATION_REQUEST(instance_t instance, f1ap_ue_context_modif_req_t *f1ap_ue_context_modification_req); -int CU_handle_UE_CONTEXT_MODIFICATION_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); -int CU_handle_UE_CONTEXT_MODIFICATION_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int CU_handle_UE_CONTEXT_MODIFICATION_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); +int CU_handle_UE_CONTEXT_MODIFICATION_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); /* * UE Context Modification Required (gNB-DU initiated) */ -int CU_handle_UE_CONTEXT_MODIFICATION_REQUIRED(instance_t instance, uint32_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); +int CU_handle_UE_CONTEXT_MODIFICATION_REQUIRED(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); int CU_send_UE_CONTEXT_MODIFICATION_CONFIRM(instance_t instance, f1ap_ue_context_modif_confirm_t *confirm); diff --git a/openair2/F1AP/f1ap_du_interface_management.c b/openair2/F1AP/f1ap_du_interface_management.c index 5a483f85c6..d271cccde8 100644 --- a/openair2/F1AP/f1ap_du_interface_management.c +++ b/openair2/F1AP/f1ap_du_interface_management.c @@ -50,10 +50,8 @@ int to_NRNRB(int nrb) { AssertFatal(1==0,"nrb %d is not in the list of possible NRNRB\n",nrb); } -int DU_handle_RESET(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int DU_handle_RESET(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } @@ -65,14 +63,11 @@ int DU_send_RESET(instance_t instance, F1AP_Reset_t *Reset) { AssertFatal(1==0,"Not implemented yet\n"); } -int DU_handle_RESET_ACKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int DU_handle_RESET_ACKNOWLEDGE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } - /* Error Indication */ @@ -81,14 +76,11 @@ int DU_send_ERROR_INDICATION(instance_t instance, F1AP_F1AP_PDU_t *pdu_p) { AssertFatal(1==0,"Not implemented yet\n"); } -int DU_handle_ERROR_INDICATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int DU_handle_ERROR_INDICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } - /* F1 Setup */ @@ -310,7 +302,7 @@ int DU_send_F1_SETUP_REQUEST(instance_t instance, f1ap_setup_req_t *setup_req) return 0; } -int DU_handle_F1_SETUP_RESPONSE(instance_t instance, uint32_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +int DU_handle_F1_SETUP_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) { LOG_D(F1AP, "DU_handle_F1_SETUP_RESPONSE\n"); AssertFatal(pdu->present == F1AP_F1AP_PDU_PR_successfulOutcome, @@ -474,7 +466,7 @@ int DU_handle_F1_SETUP_RESPONSE(instance_t instance, uint32_t assoc_id, uint32_t } // SETUP FAILURE -int DU_handle_F1_SETUP_FAILURE(instance_t instance, uint32_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +int DU_handle_F1_SETUP_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) { F1AP_F1SetupFailure_t *out; F1AP_F1SetupFailureIEs_t *ie; @@ -738,25 +730,21 @@ int DU_send_gNB_DU_CONFIGURATION_UPDATE(instance_t instance, return 0; } -int DU_handle_gNB_DU_CONFIGURATION_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int DU_handle_gNB_DU_CONFIGURATION_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } int DU_handle_gNB_DU_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { + sctp_assoc_t assoc_id, + uint32_t stream, + F1AP_F1AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } - -int DU_handle_gNB_CU_CONFIGURATION_UPDATE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int DU_handle_gNB_CU_CONFIGURATION_UPDATE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ LOG_D(F1AP, "DU_handle_gNB_CU_CONFIGURATION_UPDATE\n"); AssertFatal(pdu->present == F1AP_F1AP_PDU_PR_initiatingMessage, "pdu->present != F1AP_F1AP_PDU_PR_initiatingMessage\n"); @@ -960,8 +948,9 @@ int DU_send_gNB_DU_RESOURCE_COORDINATION_REQUEST(instance_t instance, } int DU_handle_gNB_DU_RESOURCE_COORDINATION_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { + sctp_assoc_t assoc_id, + uint32_t stream, + F1AP_F1AP_PDU_t *pdu) +{ AssertFatal(0, "Not implemented yet\n"); } diff --git a/openair2/F1AP/f1ap_du_interface_management.h b/openair2/F1AP/f1ap_du_interface_management.h index a81958880b..f077dc547a 100644 --- a/openair2/F1AP/f1ap_du_interface_management.h +++ b/openair2/F1AP/f1ap_du_interface_management.h @@ -36,41 +36,25 @@ /* * Reset */ -int DU_handle_RESET(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int DU_handle_RESET(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); int DU_send_RESET_ACKKNOWLEDGE(instance_t instance, F1AP_ResetAcknowledge_t *ResetAcknowledge); int DU_send_RESET(instance_t instance, F1AP_Reset_t *Reset); -int DU_handle_RESET_ACKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int DU_handle_RESET_ACKNOWLEDGE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); /* * Error Indication */ int DU_send_ERROR_INDICATION(instance_t instance, F1AP_F1AP_PDU_t *pdu_p); -int DU_handle_ERROR_INDICATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); - +int DU_handle_ERROR_INDICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); /* * F1 Setup */ int DU_send_F1_SETUP_REQUEST(instance_t instance, f1ap_setup_req_t *setup_req); -int DU_handle_F1_SETUP_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int DU_handle_F1_SETUP_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); -int DU_handle_F1_SETUP_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int DU_handle_F1_SETUP_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); /* * gNB-DU Configuration Update @@ -79,23 +63,17 @@ int DU_send_gNB_DU_CONFIGURATION_UPDATE(instance_t instance, instance_t du_mod_idP, f1ap_setup_req_t *f1ap_du_data); -int DU_handle_gNB_DU_CONFIGURATION_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int DU_handle_gNB_DU_CONFIGURATION_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); int DU_handle_gNB_DU_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); + sctp_assoc_t assoc_id, + uint32_t stream, + F1AP_F1AP_PDU_t *pdu); /* * gNB-CU Configuration Update */ -int DU_handle_gNB_CU_CONFIGURATION_UPDATE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int DU_handle_gNB_CU_CONFIGURATION_UPDATE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); int DU_send_gNB_CU_CONFIGURATION_UPDATE_FAILURE(instance_t instance, f1ap_gnb_cu_configuration_update_failure_t *GNBCUConfigurationUpdateFailure); @@ -112,8 +90,8 @@ int DU_send_gNB_DU_RESOURCE_COORDINATION_REQUEST(instance_t instance, F1AP_GNBDUResourceCoordinationRequest_t *GNBDUResourceCoordinationRequest); int DU_handle_gNB_DU_RESOURCE_COORDINATION_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); + sctp_assoc_t assoc_id, + uint32_t stream, + F1AP_F1AP_PDU_t *pdu); #endif /* F1AP_DU_INTERFACE_MANAGEMENT_H_ */ diff --git a/openair2/F1AP/f1ap_du_paging.c b/openair2/F1AP/f1ap_du_paging.c index 92601b357d..08a2b319e7 100644 --- a/openair2/F1AP/f1ap_du_paging.c +++ b/openair2/F1AP/f1ap_du_paging.c @@ -35,10 +35,8 @@ #include "oai_asn1.h" #include "openair2/RRC/LTE/rrc_proto.h" -int DU_handle_Paging(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int DU_handle_Paging(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ F1AP_Paging_t *paging; F1AP_PagingIEs_t *ie; long tmsi; diff --git a/openair2/F1AP/f1ap_du_paging.h b/openair2/F1AP/f1ap_du_paging.h index 3e1806ae02..5ec21bcbae 100644 --- a/openair2/F1AP/f1ap_du_paging.h +++ b/openair2/F1AP/f1ap_du_paging.h @@ -33,9 +33,6 @@ #ifndef F1AP_DU_PAGING_H_ #define F1AP_DU_PAGING_H_ -int DU_handle_Paging(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int DU_handle_Paging(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); #endif /* F1AP_DU_PAGING_H_ */ diff --git a/openair2/F1AP/f1ap_du_rrc_message_transfer.c b/openair2/F1AP/f1ap_du_rrc_message_transfer.c index e30f26fc6c..5a61879059 100644 --- a/openair2/F1AP/f1ap_du_rrc_message_transfer.c +++ b/openair2/F1AP/f1ap_du_rrc_message_transfer.c @@ -55,10 +55,8 @@ #include "openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.h" /* DL RRC Message Transfer */ -int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) { +int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +{ F1AP_DLRRCMessageTransfer_t *container; F1AP_DLRRCMessageTransferIEs_t *ie; int executeDuplication; diff --git a/openair2/F1AP/f1ap_du_rrc_message_transfer.h b/openair2/F1AP/f1ap_du_rrc_message_transfer.h index f784b7a0cf..e959d8b9e1 100644 --- a/openair2/F1AP/f1ap_du_rrc_message_transfer.h +++ b/openair2/F1AP/f1ap_du_rrc_message_transfer.h @@ -36,10 +36,7 @@ #include "f1ap_common.h" -int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); int DU_send_UL_NR_RRC_MESSAGE_TRANSFER(instance_t instance, const f1ap_ul_rrc_message_t *msg); diff --git a/openair2/F1AP/f1ap_du_ue_context_management.c b/openair2/F1AP/f1ap_du_ue_context_management.c index 08c4d6e27b..f3ee222bea 100644 --- a/openair2/F1AP/f1ap_du_ue_context_management.c +++ b/openair2/F1AP/f1ap_du_ue_context_management.c @@ -57,10 +57,7 @@ bool DURecvCb(protocol_ctxt_t *ctxt_pP, return true; } -int DU_handle_UE_CONTEXT_SETUP_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu) +int DU_handle_UE_CONTEXT_SETUP_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) { F1AP_UEContextSetupRequest_t *container; int i; @@ -624,7 +621,7 @@ int DU_send_UE_CONTEXT_RELEASE_REQUEST(instance_t instance, return 0; } -int DU_handle_UE_CONTEXT_RELEASE_COMMAND(instance_t instance, uint32_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +int DU_handle_UE_CONTEXT_RELEASE_COMMAND(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) { F1AP_UEContextReleaseCommand_t *container; F1AP_UEContextReleaseCommandIEs_t *ie; @@ -781,7 +778,7 @@ static instance_t du_create_gtpu_instance_to_cu(char *CUaddr, uint16_t CUport, c return gtpv1Init(tmp); } -int DU_handle_UE_CONTEXT_MODIFICATION_REQUEST(instance_t instance, uint32_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +int DU_handle_UE_CONTEXT_MODIFICATION_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) { F1AP_UEContextModificationRequest_t *container; int i; @@ -1395,7 +1392,7 @@ int DU_send_UE_CONTEXT_MODIFICATION_REQUIRED(instance_t instance, f1ap_ue_contex return 0; } -int DU_handle_UE_CONTEXT_MODIFICATION_CONFIRM(instance_t instance, uint32_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +int DU_handle_UE_CONTEXT_MODIFICATION_CONFIRM(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) { F1AP_UEContextModificationConfirm_t *container = &pdu->choice.successfulOutcome->value.choice.UEContextModificationConfirm; f1ap_ue_context_modif_confirm_t confirm = {0}; @@ -1471,7 +1468,7 @@ int DU_handle_UE_CONTEXT_MODIFICATION_CONFIRM(instance_t instance, uint32_t asso return 0; } -int DU_handle_UE_CONTEXT_MODIFICATION_REFUSE(instance_t instance, uint32_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) +int DU_handle_UE_CONTEXT_MODIFICATION_REFUSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) { F1AP_UEContextModificationRefuse_t *container = &pdu->choice.unsuccessfulOutcome->value.choice.UEContextModificationRefuse; f1ap_ue_context_modif_refuse_t refuse = {0}; diff --git a/openair2/F1AP/f1ap_du_ue_context_management.h b/openair2/F1AP/f1ap_du_ue_context_management.h index cd8565f328..536007da42 100644 --- a/openair2/F1AP/f1ap_du_ue_context_management.h +++ b/openair2/F1AP/f1ap_du_ue_context_management.h @@ -38,10 +38,7 @@ */ int DU_send_UE_CONTEXT_SETUP_RESPONSE(instance_t instance, f1ap_ue_context_setup_t *req); -int DU_handle_UE_CONTEXT_SETUP_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int DU_handle_UE_CONTEXT_SETUP_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); int DU_send_UE_CONTEXT_SETUP_FAILURE(instance_t instance); @@ -55,10 +52,7 @@ int DU_send_UE_CONTEXT_RELEASE_REQUEST(instance_t instance, /* * UE Context Release Command (gNB-CU initiated) */ -int DU_handle_UE_CONTEXT_RELEASE_COMMAND(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int DU_handle_UE_CONTEXT_RELEASE_COMMAND(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); /* * UE Context Release Complete (gNB-DU initiated) @@ -68,10 +62,7 @@ int DU_send_UE_CONTEXT_RELEASE_COMPLETE(instance_t instance, f1ap_ue_context_rel /* * UE Context Modification (gNB-CU initiated) */ -int DU_handle_UE_CONTEXT_MODIFICATION_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); +int DU_handle_UE_CONTEXT_MODIFICATION_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); int DU_send_UE_CONTEXT_MODIFICATION_RESPONSE(instance_t instance, f1ap_ue_context_modif_resp_t *resp); int DU_send_UE_CONTEXT_MODIFICATION_FAILURE(instance_t instance); @@ -80,10 +71,8 @@ int DU_send_UE_CONTEXT_MODIFICATION_FAILURE(instance_t instance); * UE Context Modification Required (gNB-DU initiated) */ int DU_send_UE_CONTEXT_MODIFICATION_REQUIRED(instance_t instance, f1ap_ue_context_modif_required_t *required); - -int DU_handle_UE_CONTEXT_MODIFICATION_CONFIRM(instance_t instance, uint32_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); - -int DU_handle_UE_CONTEXT_MODIFICATION_REFUSE(instance_t instance, uint32_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); +int DU_handle_UE_CONTEXT_MODIFICATION_CONFIRM(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); +int DU_handle_UE_CONTEXT_MODIFICATION_REFUSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu); /* * UE Inactivity Notification diff --git a/openair2/F1AP/f1ap_handlers.c b/openair2/F1AP/f1ap_handlers.c index cf2530c850..458299e626 100644 --- a/openair2/F1AP/f1ap_handlers.c +++ b/openair2/F1AP/f1ap_handlers.c @@ -97,7 +97,7 @@ static F1AP_F1AP_PDU_t *f1ap_decode_pdu(const uint8_t *const buffer, uint32_t le } int f1ap_handle_message(instance_t instance, - uint32_t assoc_id, + sctp_assoc_t assoc_id, int32_t stream, const uint8_t *const data, const uint32_t data_length) diff --git a/openair2/M2AP/m2ap_MCE_defs.h b/openair2/M2AP/m2ap_MCE_defs.h index dc8f9ff5ee..4f6e295d01 100644 --- a/openair2/M2AP/m2ap_MCE_defs.h +++ b/openair2/M2AP/m2ap_MCE_defs.h @@ -115,7 +115,7 @@ typedef struct m2ap_MCE_data_s { uint16_t cnx_id; /* SCTP association id */ - int32_t assoc_id; + sctp_assoc_t assoc_id; /* Nid cells */ uint32_t Nid_cell[MAX_NUM_CCs]; diff --git a/openair2/M2AP/m2ap_MCE_generate_messages.c b/openair2/M2AP/m2ap_MCE_generate_messages.c index 3a4c1bb473..d513fcd3db 100644 --- a/openair2/M2AP/m2ap_MCE_generate_messages.c +++ b/openair2/M2AP/m2ap_MCE_generate_messages.c @@ -314,7 +314,7 @@ int m2ap_MCE_generate_m2_setup_response(m2ap_MCE_instance_t *instance_p, m2ap_MC } int m2ap_MCE_generate_m2_setup_failure(instance_t instance, - uint32_t assoc_id, + sctp_assoc_t assoc_id, M2AP_Cause_PR cause_type, long cause_value, long time_to_wait) diff --git a/openair2/M2AP/m2ap_MCE_generate_messages.h b/openair2/M2AP/m2ap_MCE_generate_messages.h index 1632dc807a..17c8243a38 100644 --- a/openair2/M2AP/m2ap_MCE_generate_messages.h +++ b/openair2/M2AP/m2ap_MCE_generate_messages.h @@ -38,7 +38,7 @@ int m2ap_MCE_generate_m2_setup_request(m2ap_MCE_instance_t *instance_p, int m2ap_MCE_generate_m2_setup_response(m2ap_MCE_instance_t *instance_p, m2ap_MCE_data_t *m2ap_MCE_data_p); int m2ap_MCE_generate_m2_setup_failure(instance_t instance, - uint32_t assoc_id, + sctp_assoc_t assoc_id, M2AP_Cause_PR cause_type, long cause_value, long time_to_wait); diff --git a/openair2/M2AP/m2ap_MCE_handler.c b/openair2/M2AP/m2ap_MCE_handler.c index aacb178444..586b89750f 100644 --- a/openair2/M2AP/m2ap_MCE_handler.c +++ b/openair2/M2AP/m2ap_MCE_handler.c @@ -74,9 +74,11 @@ static char *m2ap_direction_String[] = { return(m2ap_direction_String[m2ap_dir]); } - -int m2ap_MCE_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - const uint8_t * const data, const uint32_t data_length) +int m2ap_MCE_handle_message(instance_t instance, + sctp_assoc_t assoc_id, + int32_t stream, + const uint8_t *const data, + const uint32_t data_length) { M2AP_M2AP_PDU_t pdu; int ret; diff --git a/openair2/M2AP/m2ap_MCE_handler.h b/openair2/M2AP/m2ap_MCE_handler.h index 68cab5c8ac..164efe171e 100644 --- a/openair2/M2AP/m2ap_MCE_handler.h +++ b/openair2/M2AP/m2ap_MCE_handler.h @@ -33,11 +33,13 @@ //void m2ap_handle_m2_setup_message(m2ap_eNB_instance_t *instance_p, m2ap_eNB_data_t *eNB_desc_p, int sctp_shutdown); -int m2ap_MCE_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - const uint8_t * const data, const uint32_t data_length); - -//int m2ap_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - //const uint8_t * const data, const uint32_t data_length); +int m2ap_MCE_handle_message(instance_t instance, + sctp_assoc_t assoc_id, + int32_t stream, + const uint8_t *const data, + const uint32_t data_length); +// int m2ap_handle_message(instance_t instance, sctp_assoc_t assoc_id, int32_t stream, +// const uint8_t * const data, const uint32_t data_length); #endif /* __M2AP_MCE_HANDLERS__H__ */ diff --git a/openair2/M2AP/m2ap_MCE_interface_management.c b/openair2/M2AP/m2ap_MCE_interface_management.c index 58a4c7b967..9d45eac4a3 100644 --- a/openair2/M2AP/m2ap_MCE_interface_management.c +++ b/openair2/M2AP/m2ap_MCE_interface_management.c @@ -43,8 +43,9 @@ extern m2ap_setup_req_t *m2ap_mce_data_from_enb; /* * MBMS Session start */ -int MCE_send_MBMS_SESSION_START_REQUEST(instance_t instance/*, uint32_t assoc_id*/,m2ap_session_start_req_t* m2ap_session_start_req){ - +int MCE_send_MBMS_SESSION_START_REQUEST(instance_t instance /*, sctp_assoc_t assoc_id*/, + m2ap_session_start_req_t *m2ap_session_start_req) +{ //AssertFatal(1==0,"Not implemented yet\n"); //module_id_t enb_mod_idP=0; @@ -153,13 +154,10 @@ int MCE_send_MBMS_SESSION_START_REQUEST(instance_t instance/*, uint32_t assoc_id //MCE_m2ap_itti_send_sctp_data_req(instance, m2ap_mce_data_from_mce->assoid,buffer,len,0); m2ap_MCE_itti_send_sctp_data_req(instance,m2ap_mce_data_from_enb->assoc_id,buffer,len,0); return 0; - } -int MCE_handle_MBMS_SESSION_START_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu){ +int MCE_handle_MBMS_SESSION_START_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) +{ //AssertFatal(1==0,"Not implemented yet\n"); LOG_D(M2AP, "MCE_handle_MBMS_SESSION_START_RESPONSE\n"); @@ -215,13 +213,10 @@ int MCE_handle_MBMS_SESSION_START_RESPONSE(instance_t instance, assoc_id,ENB_MODULE_ID_TO_INSTANCE(assoc_id)); itti_send_msg_to_task(TASK_MCE_APP, ENB_MODULE_ID_TO_INSTANCE(assoc_id), msg_g); return 0; - } -int MCE_handle_MBMS_SESSION_START_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu){ - AssertFatal(1==0,"Not implemented yet\n"); +int MCE_handle_MBMS_SESSION_START_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) +{ + AssertFatal(1 == 0, "Not implemented yet\n"); } /* @@ -285,10 +280,8 @@ int MCE_send_MBMS_SESSION_STOP_REQUEST(instance_t instance, m2ap_session_stop_re } -int MCE_handle_MBMS_SESSION_STOP_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu){ +int MCE_handle_MBMS_SESSION_STOP_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) +{ //AssertFatal(1==0,"Not implemented yet\n"); LOG_D(M2AP, "MCE_handle_MBMS_SESSION_STOP_RESPONSE\n"); @@ -347,14 +340,9 @@ int MCE_handle_MBMS_SESSION_STOP_RESPONSE(instance_t instance, return 0; } - - -int MCE_handle_MBMS_SESSION_STOP_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu){ +int MCE_handle_MBMS_SESSION_STOP_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); - } typedef struct M2AP_MBSFN_Area_Configuration{ M2AP_PMCH_Configuration_List_t PMCH_Configuration_List; @@ -375,8 +363,8 @@ int MCE_handle_MBMS_SESSION_STOP_FAILURE(instance_t instance, 0x00, 0x18, 0x00, 0x01, 0x80, 0x00, 0x1d, 0x00, 0x01, 0x01}; -int MCE_send_MBMS_SCHEDULING_INFORMATION(instance_t instance, /*uint32_t assoc_id,*/m2ap_mbms_scheduling_information_t * m2ap_mbms_scheduling_information){ - +int MCE_send_MBMS_SCHEDULING_INFORMATION(instance_t instance, /*sctp_assoc_t assoc_id,*/ m2ap_mbms_scheduling_information_t * m2ap_mbms_scheduling_information) +{ //module_id_t enb_mod_idP=0; //module_id_t du_mod_idP=0; @@ -573,14 +561,13 @@ ASN_SET_ADD(&ie->value.choice.MBSFN_Area_Configuration_List,m2ap_mbsfn_area_conf } m2ap_MCE_itti_send_sctp_data_req(instance,m2ap_mce_data_from_enb->assoc_id,buffer,len,0); return 0; - -} - -int MCE_handle_MBMS_SCHEDULING_INFORMATION_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu){ + } + int MCE_handle_MBMS_SCHEDULING_INFORMATION_RESPONSE(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + M2AP_M2AP_PDU_t *pdu) + { LOG_D(M2AP, "MCE_handle_MBMS_SCHEDULING_INFORMATION_RESPONSE\n"); AssertFatal(pdu->present == M2AP_M2AP_PDU_PR_successfulOutcome, @@ -636,8 +623,7 @@ int MCE_handle_MBMS_SCHEDULING_INFORMATION_RESPONSE(instance_t instance, itti_send_msg_to_task(TASK_MCE_APP, ENB_MODULE_ID_TO_INSTANCE(instance), msg_g); // return 0; - -} + } /* * Reset @@ -649,19 +635,13 @@ int MCE_send_RESET(instance_t instance, m2ap_reset_t * m2ap_reset) { } - -int MCE_handle_RESET_ACKKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu) { +int MCE_handle_RESET_ACKKNOWLEDGE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); - } -int MCE_handle_RESET(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu) { +int MCE_handle_RESET(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } @@ -672,10 +652,7 @@ int MCE_send_RESET_ACKNOWLEDGE(instance_t instance, M2AP_ResetAcknowledge_t *Res /* * M2 Setup */ -int MCE_handle_M2_SETUP_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu) +int MCE_handle_M2_SETUP_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) { LOG_D(M2AP, "MCE_handle_M2_SETUP_REQUEST assoc_id %d\n",assoc_id); @@ -832,7 +809,7 @@ int MCE_handle_M2_SETUP_REQUEST(instance_t instance, return 0; } -int MCE_send_M2_SETUP_RESPONSE(instance_t instance, /*uint32_t assoc_id,*/ +int MCE_send_M2_SETUP_RESPONSE(instance_t instance, /*sctp_assoc_t assoc_id,*/ m2ap_setup_resp_t *m2ap_setup_resp) { //module_id_t mce_mod_idP; @@ -1144,11 +1121,8 @@ int MCE_send_MCE_CONFIGURATION_UPDATE(instance_t instance, module_id_t du_mod_id } - -int MCE_handle_MCE_CONFIGURATION_UPDATE_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu){ +int MCE_handle_MCE_CONFIGURATION_UPDATE_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); LOG_D(M2AP, "MCE_handle_MCE_CONFIGURATION_UPDATE_FAILURE\n"); @@ -1192,11 +1166,12 @@ int MCE_handle_MCE_CONFIGURATION_UPDATE_FAILURE(instance_t instance, } - int MCE_handle_MCE_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu){ + sctp_assoc_t assoc_id, + uint32_t stream, + M2AP_M2AP_PDU_t *pdu) +{ + AssertFatal(1==0,"Not implemented yet\n"); LOG_D(M2AP, "MCE_handle_MCE_CONFIGURATION_UPDATE_ACKNOWLEDGE assoc_id %d\n",assoc_id); @@ -1221,19 +1196,14 @@ int MCE_handle_MCE_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance, itti_send_msg_to_task(TASK_MCE_APP, ENB_MODULE_ID_TO_INSTANCE(instance), message_p); return 0; - } - /* * ENB Configuration Update */ - -int MCE_handle_ENB_CONFIGURATION_UPDATE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu){ +int MCE_handle_ENB_CONFIGURATION_UPDATE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); LOG_D(M2AP, "MCE_handle_MCE_CONFIGURATION_UPDATE_ACKNOWLEDGE assoc_id %d\n",assoc_id); @@ -1280,13 +1250,9 @@ int MCE_send_ENB_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance, * Error Indication */ -int MCE_handle_ERROR_INDICATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu) { +int MCE_handle_ERROR_INDICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); - - } int MCE_send_ERROR_INDICATION(instance_t instance, M2AP_ErrorIndication_t *ErrorIndication) { @@ -1304,18 +1270,11 @@ int MCE_send_MBMS_SESSION_UPDATE_REQUEST(instance_t instance, m2ap_mbms_session_ //M2AP_SessionUpdateRequest_t SessionUpdateRequest; } - - -int MCE_handle_MBMS_SESSION_UPDATE_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu){ +int MCE_handle_MBMS_SESSION_UPDATE_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); - } - - int MCE_handle_MBMS_SESSION_UPDATE_FAILURE(instance_t instance,module_id_t du_mod_idP){ AssertFatal(1==0,"Not implemented yet\n"); @@ -1330,12 +1289,8 @@ int MCE_send_MBMS_SERVICE_COUNTING_REQUEST(instance_t instance, module_id_t du_m //M2AP_MbmsServiceCountingRequest_t MbmsServiceCountingRequest; } - - -int MCE_handle_MBMS_SERVICE_COUNTING_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu){ +int MCE_handle_MBMS_SERVICE_COUNTING_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) +{ //int i; //AssertFatal(1==0,"Not implemented yet\n"); LOG_D(M2AP, "MCE_handle_MBMS_SERVICE_COUNTING_RESPONSE\n"); @@ -1468,9 +1423,10 @@ int MCE_handle_MBMS_SESSION_COUNTING_FAILURE(instance_t instance, module_id_t d */ int MCE_handle_MBMS_SESSION_COUNTING_RESULTS_REPORT(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu){ + sctp_assoc_t assoc_id, + uint32_t stream, + M2AP_M2AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } @@ -1479,10 +1435,8 @@ int MCE_handle_MBMS_SESSION_COUNTING_RESULTS_REPORT(instance_t instance, /* * Overload Notification */ -int MCE_handle_MBMS_OVERLOAD_NOTIFICATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu){ +int MCE_handle_MBMS_OVERLOAD_NOTIFICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } diff --git a/openair2/M2AP/m2ap_MCE_interface_management.h b/openair2/M2AP/m2ap_MCE_interface_management.h index 2b1d5824af..c88b3a524c 100644 --- a/openair2/M2AP/m2ap_MCE_interface_management.h +++ b/openair2/M2AP/m2ap_MCE_interface_management.h @@ -35,69 +35,50 @@ /* * MBMS Session start */ -int MCE_send_MBMS_SESSION_START_REQUEST(instance_t instance/*, - uint32_t assoc_id*/,m2ap_session_start_req_t* m2ap_session_start_req); -int MCE_handle_MBMS_SESSION_START_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int MCE_send_MBMS_SESSION_START_REQUEST(instance_t instance /*, + sctp_assoc_t assoc_id*/ + , + m2ap_session_start_req_t *m2ap_session_start_req); +int MCE_handle_MBMS_SESSION_START_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); -int MCE_handle_MBMS_SESSION_START_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int MCE_handle_MBMS_SESSION_START_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); /* * MBMS Session stop */ int MCE_send_MBMS_SESSION_STOP_REQUEST(instance_t instance, m2ap_session_stop_req_t* m2ap_session_stop_req); -int MCE_handle_MBMS_SESSION_STOP_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int MCE_handle_MBMS_SESSION_STOP_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); /* * MBMS Scheduling Information */ int MCE_send_MBMS_SCHEDULING_INFORMATION(instance_t instance, - /*uint32_t assoc_id,*/ m2ap_mbms_scheduling_information_t * m2ap_mbms_scheduling_information ); + /*sctp_assoc_t assoc_id,*/ m2ap_mbms_scheduling_information_t *m2ap_mbms_scheduling_information); int MCE_handle_MBMS_SCHEDULING_INFORMATION_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); - - + sctp_assoc_t assoc_id, + uint32_t stream, + M2AP_M2AP_PDU_t *pdu); /* * Reset */ int MCE_send_RESET(instance_t instance, m2ap_reset_t * m2ap_reset); -int MCE_handle_RESET_ACKKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int MCE_handle_RESET_ACKKNOWLEDGE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); -int MCE_handle_RESET(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int MCE_handle_RESET(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); int MCE_send_RESET_ACKNOWLEDGE(instance_t instance, M2AP_ResetAcknowledge_t *ResetAcknowledge); /* * M2AP Setup */ -int MCE_handle_M2_SETUP_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int MCE_handle_M2_SETUP_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); -int MCE_send_M2_SETUP_RESPONSE(instance_t instance,/*uint32_t assoc_id,*/ m2ap_setup_resp_t *m2ap_setup_resp); - -int MCE_send_M2_SETUP_FAILURE(instance_t instance, /*uint32_t assoc_id*/ m2ap_setup_failure_t * m2ap_setup_failure); +int MCE_send_M2_SETUP_RESPONSE(instance_t instance, /*sctp_assoc_t assoc_id,*/ m2ap_setup_resp_t *m2ap_setup_resp); +int MCE_send_M2_SETUP_FAILURE(instance_t instance, /*sctp_assoc_t assoc_id*/ m2ap_setup_failure_t *m2ap_setup_failure); /* * MCE Configuration Update @@ -105,25 +86,18 @@ int MCE_send_M2_SETUP_FAILURE(instance_t instance, /*uint32_t assoc_id*/ m2ap_se int MCE_send_MCE_CONFIGURATION_UPDATE(instance_t instance, module_id_t du_mod_idP); -int MCE_handle_MCE_CONFIGURATION_UPDATE_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int MCE_handle_MCE_CONFIGURATION_UPDATE_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); int MCE_handle_MCE_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); + sctp_assoc_t assoc_id, + uint32_t stream, + M2AP_M2AP_PDU_t *pdu); /* * ENB Configuration Update */ - -int MCE_handle_ENB_CONFIGURATION_UPDATE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int MCE_handle_ENB_CONFIGURATION_UPDATE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); int MCE_send_ENB_CONFIGURATION_UPDATE_FAILURE(instance_t instance, m2ap_enb_configuration_update_failure_t *m2ap_enb_configuration_update_failure); @@ -133,10 +107,7 @@ int MCE_send_ENB_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance, /* * Error Indication */ -int MCE_handle_ERROR_INDICATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int MCE_handle_ERROR_INDICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); int MCE_send_ERROR_INDICATION(instance_t instance, M2AP_ErrorIndication_t *ErrorIndication); @@ -145,10 +116,7 @@ int MCE_send_ERROR_INDICATION(instance_t instance, M2AP_ErrorIndication_t *Error */ int MCE_send_MBMS_SESSION_UPDATE_REQUEST(instance_t instance, m2ap_mbms_session_update_req_t * m2ap_mbms_session_update_req); -int MCE_handle_MBMS_SESSION_UPDATE_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int MCE_handle_MBMS_SESSION_UPDATE_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); int MCE_handle_MBMS_SESSION_UPDATE_FAILURE(instance_t instance,module_id_t du_mod_idP); @@ -157,10 +125,7 @@ int MCE_handle_MBMS_SESSION_UPDATE_FAILURE(instance_t instance,module_id_t du_mo */ int MCE_send_MBMS_SERVICE_COUNTING_REQUEST(instance_t instance, module_id_t du_mod_idP); -int MCE_handle_MBMS_SERVICE_COUNTING_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int MCE_handle_MBMS_SERVICE_COUNTING_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); int MCE_handle_MBMS_SESSION_COUNTING_FAILURE(instance_t instance, module_id_t du_mod_idP); /* @@ -168,21 +133,14 @@ int MCE_handle_MBMS_SESSION_COUNTING_FAILURE(instance_t instance, module_id_t du */ int MCE_handle_MBMS_SESSION_COUNTING_RESULTS_REPORT(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); + sctp_assoc_t assoc_id, + uint32_t stream, + M2AP_M2AP_PDU_t *pdu); /* * Overload Notification */ -int MCE_handle_MBMS_OVERLOAD_NOTIFICATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); - - - - +int MCE_handle_MBMS_OVERLOAD_NOTIFICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); #endif /* M2AP_MCE_INTERFACE_MANAGEMENT_H_ */ diff --git a/openair2/M2AP/m2ap_MCE_management_procedures.c b/openair2/M2AP/m2ap_MCE_management_procedures.c index 3934a57c74..82ae691350 100644 --- a/openair2/M2AP/m2ap_MCE_management_procedures.c +++ b/openair2/M2AP/m2ap_MCE_management_procedures.c @@ -122,9 +122,7 @@ dump_mce_tree_m2(zz->m2ap_mce_head.rbh_root); } } -struct m2ap_MCE_data_s *m2ap_get_MCE(m2ap_MCE_instance_t *instance_p, - int32_t assoc_id, - uint16_t cnx_id) +struct m2ap_MCE_data_s *m2ap_get_MCE(m2ap_MCE_instance_t *instance_p, sctp_assoc_t assoc_id, uint16_t cnx_id) { struct m2ap_MCE_data_s temp; struct m2ap_MCE_data_s *found; diff --git a/openair2/M2AP/m2ap_MCE_management_procedures.h b/openair2/M2AP/m2ap_MCE_management_procedures.h index 4e8997dbc5..e4997a140e 100644 --- a/openair2/M2AP/m2ap_MCE_management_procedures.h +++ b/openair2/M2AP/m2ap_MCE_management_procedures.h @@ -47,8 +47,6 @@ m2ap_MCE_data_t* m2ap_is_MCE_assoc_id_in_list(uint32_t sctp_assoc_id); m2ap_MCE_data_t* m2ap_is_MCE_pci_in_list (const uint32_t pci); -struct m2ap_MCE_data_s *m2ap_get_MCE(m2ap_MCE_instance_t *instance_p, - int32_t assoc_id, - uint16_t cnx_id); +struct m2ap_MCE_data_s *m2ap_get_MCE(m2ap_MCE_instance_t *instance_p, sctp_assoc_t assoc_id, uint16_t cnx_id); #endif /* __M2AP_MCE_MANAGEMENT_PROCEDURES__H__ */ diff --git a/openair2/M2AP/m2ap_common.h b/openair2/M2AP/m2ap_common.h index 7981eaa2a5..92e3274c81 100644 --- a/openair2/M2AP/m2ap_common.h +++ b/openair2/M2AP/m2ap_common.h @@ -76,25 +76,11 @@ extern int asn1_xer_print; /** \brief Function callback prototype. **/ -typedef int (*m2ap_message_decoded_callback)( - instance_t instance, - uint32_t assocId, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); - -typedef int (*m2ap_MCE_message_decoded_callback)( - instance_t instance, - uint32_t assocId, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); - -typedef int (*m2ap_eNB_message_decoded_callback)( - instance_t instance, - uint32_t assocId, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +typedef int (*m2ap_message_decoded_callback)(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); +typedef int (*m2ap_MCE_message_decoded_callback)(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); +typedef int (*m2ap_eNB_message_decoded_callback)(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); /** \brief Encode a successfull outcome message \param buffer pointer to buffer in which data will be encoded diff --git a/openair2/M2AP/m2ap_eNB_defs.h b/openair2/M2AP/m2ap_eNB_defs.h index 4cc409400e..c7f30c69c7 100644 --- a/openair2/M2AP/m2ap_eNB_defs.h +++ b/openair2/M2AP/m2ap_eNB_defs.h @@ -27,6 +27,8 @@ */ #include +#include +#include #include "queue.h" #include "tree.h" @@ -115,7 +117,7 @@ typedef struct m2ap_eNB_data_s { uint16_t cnx_id; /* SCTP association id */ - int32_t assoc_id; + sctp_assoc_t assoc_id; /* Nid cells */ uint32_t Nid_cell[MAX_NUM_CCs]; diff --git a/openair2/M2AP/m2ap_eNB_generate_messages.c b/openair2/M2AP/m2ap_eNB_generate_messages.c index 8e7e096d13..93ea5a1f19 100644 --- a/openair2/M2AP/m2ap_eNB_generate_messages.c +++ b/openair2/M2AP/m2ap_eNB_generate_messages.c @@ -311,7 +311,7 @@ //} //int m2ap_MCE_generate_m2_setup_failure(instance_t instance, -// uint32_t assoc_id, +// sctp_assoc_t assoc_id, // M2AP_Cause_PR cause_type, // long cause_value, // long time_to_wait) diff --git a/openair2/M2AP/m2ap_eNB_generate_messages.h b/openair2/M2AP/m2ap_eNB_generate_messages.h index 793f7f18cf..a65941ac57 100644 --- a/openair2/M2AP/m2ap_eNB_generate_messages.h +++ b/openair2/M2AP/m2ap_eNB_generate_messages.h @@ -38,7 +38,7 @@ //int m2ap_MCE_generate_m2_setup_response(m2ap_eNB_instance_t *instance_p, m2ap_eNB_data_t *m2ap_eNB_data_p); // /*int m2ap_MCE_generate_m2_setup_failure(instance_t instance, - uint32_t assoc_id, + sctp_assoc_t assoc_id, M2AP_Cause_PR cause_type, long cause_value, long time_to_wait);*/ diff --git a/openair2/M2AP/m2ap_eNB_handler.c b/openair2/M2AP/m2ap_eNB_handler.c index 0a474c72a8..14b657d6ad 100644 --- a/openair2/M2AP/m2ap_eNB_handler.c +++ b/openair2/M2AP/m2ap_eNB_handler.c @@ -72,9 +72,11 @@ static char *m2ap_direction_String[] = { return(m2ap_direction_String[m2ap_dir]); } - -int m2ap_eNB_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - const uint8_t * const data, const uint32_t data_length) +int m2ap_eNB_handle_message(instance_t instance, + sctp_assoc_t assoc_id, + int32_t stream, + const uint8_t *const data, + const uint32_t data_length) { M2AP_M2AP_PDU_t pdu; int ret; diff --git a/openair2/M2AP/m2ap_eNB_handler.h b/openair2/M2AP/m2ap_eNB_handler.h index ea4231a6e3..1954d20de9 100644 --- a/openair2/M2AP/m2ap_eNB_handler.h +++ b/openair2/M2AP/m2ap_eNB_handler.h @@ -33,10 +33,13 @@ //void m2ap_handle_m2_setup_message(m2ap_eNB_instance_t *instance_p, m2ap_eNB_data_t *eNB_desc_p, int sctp_shutdown); -int m2ap_eNB_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - const uint8_t * const data, const uint32_t data_length); +int m2ap_eNB_handle_message(instance_t instance, + sctp_assoc_t assoc_id, + int32_t stream, + const uint8_t *const data, + const uint32_t data_length); -//int m2ap_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, +//int m2ap_handle_message(instance_t instance, sctp_assoc_t assoc_id, int32_t stream, //const uint8_t * const data, const uint32_t data_length); diff --git a/openair2/M2AP/m2ap_eNB_interface_management.c b/openair2/M2AP/m2ap_eNB_interface_management.c index a336a559a3..987f02b613 100644 --- a/openair2/M2AP/m2ap_eNB_interface_management.c +++ b/openair2/M2AP/m2ap_eNB_interface_management.c @@ -60,10 +60,8 @@ extern m2ap_setup_req_t *m2ap_enb_data_g; //extern m2ap_setup_req_t *m2ap_mce_data_from_enb; -int eNB_handle_MBMS_SCHEDULING_INFORMATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu){ +int eNB_handle_MBMS_SCHEDULING_INFORMATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) +{ LOG_D(M2AP, "eNB_handle_MBMS_SCHEDULING_INFORMATION assoc_id %d\n",assoc_id); MessageDef *message_p/*,*message_p2*/; @@ -258,13 +256,8 @@ int eNB_send_MBMS_SCHEDULING_INFORMATION_RESPONSE(instance_t instance, m2ap_mbms return 0; } - - - -int eNB_handle_MBMS_SESSION_START_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu){ +int eNB_handle_MBMS_SESSION_START_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) +{ LOG_D(M2AP, "eNB_handle_MBMS_SESSION_START_REQUEST assoc_id %d\n",assoc_id); MessageDef *message_p; @@ -424,10 +417,8 @@ int eNB_send_MBMS_SESSION_START_FAILURE(instance_t instance, m2ap_session_start_ return 0; } -int eNB_handle_MBMS_SESSION_STOP_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu){ +int eNB_handle_MBMS_SESSION_STOP_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) +{ LOG_D(M2AP, "eNB_handle_MBMS_SESSION_STOP_REQUEST assoc_id %d\n",assoc_id); MessageDef *message_p; @@ -688,10 +679,7 @@ int eNB_send_M2_SETUP_REQUEST(m2ap_eNB_instance_t *instance_p, m2ap_eNB_data_t* } -int eNB_handle_M2_SETUP_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu) +int eNB_handle_M2_SETUP_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) { LOG_D(M2AP, "eNB_handle_M2_SETUP_RESPONSE\n"); @@ -800,10 +788,8 @@ int eNB_handle_M2_SETUP_RESPONSE(instance_t instance, } // SETUP FAILURE -int eNB_handle_M2_SETUP_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu) { +int eNB_handle_M2_SETUP_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) +{ LOG_D(M2AP, "eNB_handle_M2_SETUP_FAILURE\n"); M2AP_M2SetupFailure_t *in = &pdu->choice.unsuccessfulOutcome.value.choice.M2SetupFailure; @@ -985,10 +971,7 @@ int eNB_send_eNB_CONFIGURATION_UPDATE(instance_t instance, m2ap_enb_configuratio return 0; } -int eNB_handle_eNB_CONFIGURATION_UPDATE_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu) +int eNB_handle_eNB_CONFIGURATION_UPDATE_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) { AssertFatal(1==0,"Not implemented yet\n"); @@ -1032,12 +1015,10 @@ int eNB_handle_eNB_CONFIGURATION_UPDATE_FAILURE(instance_t instance, return 0; } - - int eNB_handle_eNB_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu) + sctp_assoc_t assoc_id, + uint32_t stream, + M2AP_M2AP_PDU_t *pdu) { LOG_D(M2AP, "eNB_handle_eNB_CONFIGURATION_UPDATE_ACKNOWLEDGE assoc_id %d\n",assoc_id); @@ -1069,10 +1050,7 @@ int eNB_handle_eNB_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance, /* * MCE Configuration Update */ -int eNB_handle_MCE_CONFIGURATION_UPDATE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu) +int eNB_handle_MCE_CONFIGURATION_UPDATE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) { LOG_D(M2AP, "eNB_handle_MCE_CONFIGURATION_UPDATE assoc_id %d\n",assoc_id); @@ -1126,10 +1104,7 @@ int eNB_send_ERROR_INDICATION(instance_t instance, m2ap_error_indication_t * m2a return 0; } -int eNB_handle_ERROR_INDICATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu) +int eNB_handle_ERROR_INDICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) { AssertFatal(1==0,"Not implemented yet\n"); return 0; @@ -1140,10 +1115,7 @@ int eNB_handle_ERROR_INDICATION(instance_t instance, /* * Session Update Request */ -int eNB_handle_MBMS_SESSION_UPDATE_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu) +int eNB_handle_MBMS_SESSION_UPDATE_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) { LOG_D(M2AP, "eNB_handle_MBMS_SESSION_STOP_REQUEST assoc_id %d\n",assoc_id); @@ -1190,10 +1162,7 @@ int eNB_send_MBMS_SESSION_UPDATE_FAILURE(instance_t instance, m2ap_mbms_session_ * Service Counting */ -int eNB_handle_MBMS_SERVICE_COUNTING_REQ(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu) +int eNB_handle_MBMS_SERVICE_COUNTING_REQ(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu) { LOG_D(M2AP, "eNB_handle_MBMS_SERVICE_COUNTING_REQUEST assoc_id %d\n",assoc_id); diff --git a/openair2/M2AP/m2ap_eNB_interface_management.h b/openair2/M2AP/m2ap_eNB_interface_management.h index 09bab1f125..a0c38c0760 100644 --- a/openair2/M2AP/m2ap_eNB_interface_management.h +++ b/openair2/M2AP/m2ap_eNB_interface_management.h @@ -37,10 +37,7 @@ * Session Start */ -int eNB_handle_MBMS_SESSION_START_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int eNB_handle_MBMS_SESSION_START_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); int eNB_send_MBMS_SESSION_START_RESPONSE(instance_t instance, m2ap_session_start_resp_t * m2ap_session_start_resp); int eNB_send_MBMS_SESSION_START_FAILURE(instance_t instance, m2ap_session_start_failure_t * m2ap_session_start_failure ); @@ -49,10 +46,7 @@ int eNB_send_MBMS_SESSION_START_FAILURE(instance_t instance, m2ap_session_start_ * Session Stop */ -int eNB_handle_MBMS_SESSION_STOP_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int eNB_handle_MBMS_SESSION_STOP_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); int eNB_send_MBMS_SESSION_STOP_RESPONSE(instance_t instance, m2ap_session_stop_resp_t * m2ap_session_stop_resp); @@ -60,10 +54,7 @@ int eNB_send_MBMS_SESSION_STOP_RESPONSE(instance_t instance, m2ap_session_stop_r * MBMS Scheduling Information */ -int eNB_handle_MBMS_SCHEDULING_INFORMATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int eNB_handle_MBMS_SCHEDULING_INFORMATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); int eNB_send_MBMS_SCHEDULING_INFORMATION_RESPONSE(instance_t instance, m2ap_mbms_scheduling_information_resp_t * m2ap_mbms_scheduling_information_resp); @@ -71,54 +62,36 @@ int eNB_send_MBMS_SCHEDULING_INFORMATION_RESPONSE(instance_t instance, m2ap_mbms /* * Reset */ -int eNB_handle_RESET(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int eNB_handle_RESET(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); int eNB_send_RESET_ACKKNOWLEDGE(instance_t instance, M2AP_ResetAcknowledge_t *ResetAcknowledge); int eNB_send_RESET(instance_t instance, M2AP_Reset_t *Reset); -int eNB_handle_RESET_ACKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int eNB_handle_RESET_ACKNOWLEDGE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); /* * M2AP Setup */ int eNB_send_M2_SETUP_REQUEST( m2ap_eNB_instance_t *instance_p, m2ap_eNB_data_t *m2ap_eNB_data_p); -int eNB_handle_M2_SETUP_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int eNB_handle_M2_SETUP_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); -int eNB_handle_M2_SETUP_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int eNB_handle_M2_SETUP_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); /* * eNB Configuration Update */ int eNB_send_eNB_CONFIGURATION_UPDATE(instance_t instance, m2ap_enb_configuration_update_t * m2ap_enb_configuration_update); -int eNB_handle_eNB_CONFIGURATION_UPDATE_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int eNB_handle_eNB_CONFIGURATION_UPDATE_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); int eNB_handle_eNB_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); + sctp_assoc_t assoc_id, + uint32_t stream, + M2AP_M2AP_PDU_t *pdu); /* * MCE Configuration Update */ -int eNB_handle_MCE_CONFIGURATION_UPDATE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int eNB_handle_MCE_CONFIGURATION_UPDATE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); int eNB_send_MCE_CONFIGURATION_UPDATE_FAILURE(instance_t instance, M2AP_MCEConfigurationUpdateFailure_t *MCEConfigurationUpdateFailure); @@ -130,19 +103,12 @@ int eNB_send_MCE_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance, * Error Indication */ int eNB_send_ERROR_INDICATION(instance_t instance, m2ap_error_indication_t * m2ap_error_indication); -int eNB_handle_ERROR_INDICATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); - +int eNB_handle_ERROR_INDICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); /* * Session Update Request */ -int eNB_handle_MBMS_SESSION_UPDATE_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int eNB_handle_MBMS_SESSION_UPDATE_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); int eNB_send_MBMS_SESSION_UPDATE_RESPONSE(instance_t instance, m2ap_mbms_session_update_resp_t * m2ap_mbms_session_update_resp); //?? @@ -152,10 +118,7 @@ int eNB_send_MBMS_SESSION_UPDATE_FAILURE(instance_t instance, m2ap_mbms_session_ * Service Counting */ -int eNB_handle_MBMS_SERVICE_COUNTING_REQ(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M2AP_M2AP_PDU_t *pdu); +int eNB_handle_MBMS_SERVICE_COUNTING_REQ(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M2AP_M2AP_PDU_t *pdu); int eNB_send_MBMS_SERVICE_COUNTING_REPORT(instance_t instance, m2ap_mbms_service_counting_report_t * m2ap_mbms_service_counting_report); int eNB_send_MBMS_SERVICE_COUNTING_RESP(instance_t instance, m2ap_mbms_service_counting_resp_t * m2ap_mbms_service_counting_resp); int eNB_send_MBMS_SERVICE_COUNTING_FAILURE(instance_t instance, m2ap_mbms_service_counting_failure_t * m2ap_mbms_service_counting_failure); diff --git a/openair2/M2AP/m2ap_eNB_management_procedures.c b/openair2/M2AP/m2ap_eNB_management_procedures.c index 59d91afb74..014ecf08d8 100644 --- a/openair2/M2AP/m2ap_eNB_management_procedures.c +++ b/openair2/M2AP/m2ap_eNB_management_procedures.c @@ -122,9 +122,7 @@ printf("---------------------------------------------\n"); } } -struct m2ap_eNB_data_s *m2ap_get_eNB(m2ap_eNB_instance_t *instance_p, - int32_t assoc_id, - uint16_t cnx_id) +struct m2ap_eNB_data_s *m2ap_get_eNB(m2ap_eNB_instance_t *instance_p, sctp_assoc_t assoc_id, uint16_t cnx_id) { struct m2ap_eNB_data_s temp; struct m2ap_eNB_data_s *found; diff --git a/openair2/M2AP/m2ap_eNB_management_procedures.h b/openair2/M2AP/m2ap_eNB_management_procedures.h index 2b1dc4a44b..e30943b4f2 100644 --- a/openair2/M2AP/m2ap_eNB_management_procedures.h +++ b/openair2/M2AP/m2ap_eNB_management_procedures.h @@ -47,8 +47,6 @@ m2ap_eNB_data_t* m2ap_is_eNB_assoc_id_in_list(uint32_t sctp_assoc_id); m2ap_eNB_data_t* m2ap_is_eNB_pci_in_list (const uint32_t pci); -struct m2ap_eNB_data_s *m2ap_get_eNB(m2ap_eNB_instance_t *instance_p, - int32_t assoc_id, - uint16_t cnx_id); +struct m2ap_eNB_data_s *m2ap_get_eNB(m2ap_eNB_instance_t *instance_p, sctp_assoc_t assoc_id, uint16_t cnx_id); #endif /* __M2AP_ENB_MANAGEMENT_PROCEDURES__H__ */ diff --git a/openair2/M2AP/m2ap_handler.c b/openair2/M2AP/m2ap_handler.c index ce568d3c19..2840f0bce8 100644 --- a/openair2/M2AP/m2ap_handler.c +++ b/openair2/M2AP/m2ap_handler.c @@ -74,9 +74,11 @@ static char *m2ap_direction_String[] = { return(m2ap_direction_String[m2ap_dir]); } - -int m2ap_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - const uint8_t * const data, const uint32_t data_length) +int m2ap_handle_message(instance_t instance, + sctp_assoc_t assoc_id, + int32_t stream, + const uint8_t *const data, + const uint32_t data_length) { M2AP_M2AP_PDU_t pdu; int ret; diff --git a/openair2/M2AP/m2ap_handler.h b/openair2/M2AP/m2ap_handler.h index 88fb26bc3e..f642c16cc8 100644 --- a/openair2/M2AP/m2ap_handler.h +++ b/openair2/M2AP/m2ap_handler.h @@ -33,11 +33,16 @@ void m2ap_handle_m2_setup_message(m2ap_eNB_instance_t *instance_p, m2ap_eNB_data_t *eNB_desc_p, int sctp_shutdown); -int m2ap_eNB_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - const uint8_t * const data, const uint32_t data_length); - -int m2ap_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - const uint8_t * const data, const uint32_t data_length); +int m2ap_eNB_handle_message(instance_t instance, + sctp_assoc_t assoc_id, + int32_t stream, + const uint8_t *const data, + const uint32_t data_length); +int m2ap_handle_message(instance_t instance, + sctp_assoc_t assoc_id, + int32_t stream, + const uint8_t *const data, + const uint32_t data_length); #endif /* M2AP_ENB_OLD_HANDLERS_H_ */ diff --git a/openair2/M2AP/m2ap_itti_messaging.c b/openair2/M2AP/m2ap_itti_messaging.c index e0dcc27175..9c9528c349 100644 --- a/openair2/M2AP/m2ap_itti_messaging.c +++ b/openair2/M2AP/m2ap_itti_messaging.c @@ -30,8 +30,11 @@ #include "m2ap_itti_messaging.h" -void m2ap_eNB_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer, - uint32_t buffer_length, uint16_t stream) +void m2ap_eNB_itti_send_sctp_data_req(instance_t instance, + sctp_assoc_t assoc_id, + uint8_t *buffer, + uint32_t buffer_length, + uint16_t stream) { MessageDef *message_p; sctp_data_req_t *sctp_data_req; @@ -51,7 +54,7 @@ void m2ap_eNB_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uin } -void m2ap_eNB_itti_send_sctp_close_association(instance_t instance, int32_t assoc_id) +void m2ap_eNB_itti_send_sctp_close_association(instance_t instance, sctp_assoc_t assoc_id) { MessageDef *message_p = NULL; sctp_close_association_t *sctp_close_association_p = NULL; @@ -63,9 +66,11 @@ void m2ap_eNB_itti_send_sctp_close_association(instance_t instance, int32_t asso itti_send_msg_to_task(TASK_SCTP, instance, message_p); } - -void m2ap_MCE_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer, - uint32_t buffer_length, uint16_t stream) +void m2ap_MCE_itti_send_sctp_data_req(instance_t instance, + sctp_assoc_t assoc_id, + uint8_t *buffer, + uint32_t buffer_length, + uint16_t stream) { MessageDef *message_p; sctp_data_req_t *sctp_data_req; @@ -83,7 +88,7 @@ void m2ap_MCE_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uin } -void m2ap_MCE_itti_send_sctp_close_association(instance_t instance, int32_t assoc_id) +void m2ap_MCE_itti_send_sctp_close_association(instance_t instance, sctp_assoc_t assoc_id) { MessageDef *message_p = NULL; sctp_close_association_t *sctp_close_association_p = NULL; diff --git a/openair2/M2AP/m2ap_itti_messaging.h b/openair2/M2AP/m2ap_itti_messaging.h index bdc416bca7..11df7c0e64 100644 --- a/openair2/M2AP/m2ap_itti_messaging.h +++ b/openair2/M2AP/m2ap_itti_messaging.h @@ -29,18 +29,21 @@ #ifndef M2AP_ENB_ITTI_MESSAGING_H_ #define M2AP_ENB_ITTI_MESSAGING_H_ -void m2ap_eNB_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer, - uint32_t buffer_length, uint16_t stream); +void m2ap_eNB_itti_send_sctp_data_req(instance_t instance, + sctp_assoc_t assoc_id, + uint8_t *buffer, + uint32_t buffer_length, + uint16_t stream); +void m2ap_eNB_itti_send_sctp_close_association(instance_t instance, sctp_assoc_t assoc_id); -void m2ap_eNB_itti_send_sctp_close_association(instance_t instance, int32_t assoc_id); +void m2ap_MCE_itti_send_sctp_data_req(instance_t instance, + sctp_assoc_t assoc_id, + uint8_t *buffer, + uint32_t buffer_length, + uint16_t stream); - -void m2ap_MCE_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer, - uint32_t buffer_length, uint16_t stream); - - -void m2ap_MCE_itti_send_sctp_close_association(instance_t instance, int32_t assoc_id); +void m2ap_MCE_itti_send_sctp_close_association(instance_t instance, sctp_assoc_t assoc_id); diff --git a/openair2/RRC/LTE/rrc_defs.h b/openair2/RRC/LTE/rrc_defs.h index 30f47b99ac..b233cd502d 100644 --- a/openair2/RRC/LTE/rrc_defs.h +++ b/openair2/RRC/LTE/rrc_defs.h @@ -387,7 +387,7 @@ typedef struct HANDOVER_INFO_s { HO_STATE_t state; //current state of handover uint32_t modid_s; //module_idP of serving cell uint32_t modid_t; //module_idP of target cell - int assoc_id; + sctp_assoc_t assoc_id; uint8_t ueid_s; //UE index in serving cell uint8_t ueid_t; //UE index in target cell LTE_AS_Config_t as_config; /* these two parameters are taken from 36.331 section 10.2.2: HandoverPreparationInformation-r8-IEs */ diff --git a/openair2/RRC/NR/nr_rrc_defs.h b/openair2/RRC/NR/nr_rrc_defs.h index 362d2bcee5..215fc9851d 100644 --- a/openair2/RRC/NR/nr_rrc_defs.h +++ b/openair2/RRC/NR/nr_rrc_defs.h @@ -369,7 +369,7 @@ typedef struct cucp_cuup_if_s { } cucp_cuup_if_t; typedef struct nr_rrc_du_container_t { - int assoc_id; + sctp_assoc_t assoc_id; f1ap_setup_req_t *setup_req; NR_MIB_t *mib; NR_SIB1_t *sib1; diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c index 23fcbffe50..228056ce37 100644 --- a/openair2/RRC/NR/rrc_gNB.c +++ b/openair2/RRC/NR/rrc_gNB.c @@ -1801,7 +1801,7 @@ static bool rrc_gNB_plmn_matches(const gNB_RRC_INST *rrc, const f1ap_served_cell && rrc->nr_cellid == info->nr_cellid; } -static void rrc_gNB_process_f1_setup_req(f1ap_setup_req_t *req, int assoc_id) +static void rrc_gNB_process_f1_setup_req(f1ap_setup_req_t *req, sctp_assoc_t assoc_id) { gNB_RRC_INST *rrc = RC.nrrrc[0]; DevAssert(rrc); @@ -2424,7 +2424,7 @@ void rrc_gNB_process_e1_bearer_context_setup_resp(e1ap_bearer_setup_resp_t *resp prepare_and_send_ue_context_modification_f1(ue_context_p, resp); } -static void rrc_CU_process_f1_lost_connection(gNB_RRC_INST *rrc, f1ap_lost_connection_t *lc, int assoc_id) +static void rrc_CU_process_f1_lost_connection(gNB_RRC_INST *rrc, f1ap_lost_connection_t *lc, sctp_assoc_t assoc_id) { AssertFatal(rrc->du != NULL, "no DU connected, cannot received F1 lost connection\n"); AssertFatal(rrc->du->assoc_id == assoc_id, diff --git a/openair2/X2AP/x2ap_common.h b/openair2/X2AP/x2ap_common.h index 9535e9fb69..f42ec6bc4c 100644 --- a/openair2/X2AP/x2ap_common.h +++ b/openair2/X2AP/x2ap_common.h @@ -20,6 +20,8 @@ */ #ifndef X2AP_COMMON_H_ #define X2AP_COMMON_H_ +#include +#include #include "oai_asn1.h" #include "X2AP_ProtocolIE-Field.h" #include "X2AP_X2AP-PDU.h" @@ -72,11 +74,7 @@ extern int asn1_xer_print; /** \brief Function callback prototype. **/ -typedef int (*x2ap_message_decoded_callback)( - instance_t instance, - uint32_t assocId, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); +typedef int (*x2ap_message_decoded_callback)(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu); /** \brief Encode a successfull outcome message \param buffer pointer to buffer in which data will be encoded diff --git a/openair2/X2AP/x2ap_eNB_defs.h b/openair2/X2AP/x2ap_eNB_defs.h index 96e76f5603..d22f6efeb7 100644 --- a/openair2/X2AP/x2ap_eNB_defs.h +++ b/openair2/X2AP/x2ap_eNB_defs.h @@ -116,7 +116,7 @@ typedef struct x2ap_eNB_data_s { uint16_t cnx_id; /* SCTP association id */ - int32_t assoc_id; + sctp_assoc_t assoc_id; /* Nid cells */ uint32_t Nid_cell[MAX_NUM_CCs]; diff --git a/openair2/X2AP/x2ap_eNB_generate_messages.c b/openair2/X2AP/x2ap_eNB_generate_messages.c index de797293de..25d257eb1d 100644 --- a/openair2/X2AP/x2ap_eNB_generate_messages.c +++ b/openair2/X2AP/x2ap_eNB_generate_messages.c @@ -489,7 +489,7 @@ int x2ap_eNB_generate_x2_setup_response(x2ap_eNB_instance_t *instance_p, x2ap_eN } int x2ap_eNB_generate_x2_setup_failure(instance_t instance, - uint32_t assoc_id, + sctp_assoc_t assoc_id, X2AP_Cause_PR cause_type, long cause_value, long time_to_wait) diff --git a/openair2/X2AP/x2ap_eNB_generate_messages.h b/openair2/X2AP/x2ap_eNB_generate_messages.h index a920020b81..44ca57597b 100644 --- a/openair2/X2AP/x2ap_eNB_generate_messages.h +++ b/openair2/X2AP/x2ap_eNB_generate_messages.h @@ -38,7 +38,7 @@ int x2ap_eNB_generate_x2_setup_request(x2ap_eNB_instance_t *instance_p, int x2ap_eNB_generate_x2_setup_response(x2ap_eNB_instance_t *instance_p, x2ap_eNB_data_t *x2ap_eNB_data_p); int x2ap_eNB_generate_x2_setup_failure(instance_t instance, - uint32_t assoc_id, + sctp_assoc_t assoc_id, X2AP_Cause_PR cause_type, long cause_value, long time_to_wait); diff --git a/openair2/X2AP/x2ap_eNB_handler.c b/openair2/X2AP/x2ap_eNB_handler.c index 6fa9c4af11..09661149a4 100644 --- a/openair2/X2AP/x2ap_eNB_handler.c +++ b/openair2/X2AP/x2ap_eNB_handler.c @@ -43,127 +43,70 @@ #include "conversions.h" #include "X2AP_FreqBandNrItem.h" -static -int x2ap_eNB_handle_x2_setup_request (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); -static -int x2ap_eNB_handle_x2_setup_response (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); -static -int x2ap_eNB_handle_x2_reset_request (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); -static -int x2ap_eNB_handle_x2_reset_response (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); +static int x2ap_eNB_handle_x2_setup_request(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu); +static int x2ap_eNB_handle_x2_setup_response(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu); +static int x2ap_eNB_handle_x2_reset_request(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu); +static int x2ap_eNB_handle_x2_reset_response(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu); -static -int x2ap_eNB_handle_x2_setup_failure (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); +static int x2ap_eNB_handle_x2_setup_failure(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu); -static -int x2ap_eNB_handle_handover_preparation (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); -static -int x2ap_eNB_handle_handover_response (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); +static int x2ap_eNB_handle_handover_preparation(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu); +static int x2ap_eNB_handle_handover_response(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu); -static -int x2ap_eNB_handle_ue_context_release (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); +static int x2ap_eNB_handle_ue_context_release(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu); -static -int x2ap_eNB_handle_handover_cancel (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); +static int x2ap_eNB_handle_handover_cancel(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu); -static -int x2ap_eNB_handle_senb_addition_request (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); +static int x2ap_eNB_handle_senb_addition_request(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu); +static int x2ap_eNB_handle_senb_addition_request_ack(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu); -static -int x2ap_eNB_handle_senb_addition_request_ack (instance_t instance, - uint32_t assoc_id, +static int x2ap_eNB_handle_senb_addition_request_reject(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu); + +int x2ap_eNB_handle_ENDC_x2_setup_request(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu); + +int x2ap_gNB_handle_ENDC_x2_setup_response(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu); + +static int x2ap_gNB_handle_ENDC_sGNB_addition_request(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu); + +static int x2ap_eNB_handle_ENDC_sGNB_addition_response(instance_t instance, + sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu); -static -int x2ap_eNB_handle_senb_addition_request_reject (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); +static int x2ap_gNB_handle_ENDC_sGNB_reconfiguration_complete(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu); -int x2ap_eNB_handle_ENDC_x2_setup_request(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); +static int x2ap_gNB_handle_ENDC_sGNB_release_request(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu); -int -x2ap_gNB_handle_ENDC_x2_setup_response(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); +static int x2ap_gNB_handle_ENDC_sGNB_release_request_acknowledge(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu); -static -int x2ap_gNB_handle_ENDC_sGNB_addition_request (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); +static int x2ap_gNB_handle_ENDC_sGNB_release_required(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu); -static -int x2ap_eNB_handle_ENDC_sGNB_addition_response (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); - -static -int x2ap_gNB_handle_ENDC_sGNB_reconfiguration_complete (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); - -static -int x2ap_gNB_handle_ENDC_sGNB_release_request(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); - -static -int x2ap_gNB_handle_ENDC_sGNB_release_request_acknowledge(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); - -static -int x2ap_gNB_handle_ENDC_sGNB_release_required(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); - -static -int x2ap_gNB_handle_ENDC_sGNB_release_confirm(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu); +static int x2ap_gNB_handle_ENDC_sGNB_release_confirm(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu); /* Handlers matrix. Only eNB related procedure present here. Placement of callback functions according to X2AP_ProcedureCode.h */ static const x2ap_message_decoded_callback x2ap_messages_callback[][3] = { @@ -272,9 +215,11 @@ void x2ap_handle_x2_setup_message(x2ap_eNB_instance_t *instance_p, x2ap_eNB_data } } - -int x2ap_eNB_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - const uint8_t *const data, const uint32_t data_length) +int x2ap_eNB_handle_message(instance_t instance, + sctp_assoc_t assoc_id, + int32_t stream, + const uint8_t *const data, + const uint32_t data_length) { X2AP_X2AP_PDU_t pdu; int ret = 0; @@ -380,11 +325,7 @@ int x2ap_eNB_handle_message(instance_t instance, uint32_t assoc_id, int32_t stre return ret; } -int -x2ap_eNB_handle_x2_setup_request(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +int x2ap_eNB_handle_x2_setup_request(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu) { X2AP_X2SetupRequest_t *x2SetupRequest; @@ -516,22 +457,13 @@ x2ap_eNB_handle_x2_setup_request(instance_t instance, return x2ap_eNB_generate_x2_setup_response(instance_p, x2ap_eNB_data); } -int -x2ap_eNB_handle_x2_reset_response(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +int x2ap_eNB_handle_x2_reset_response(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu) { return (0); } - -int -x2ap_eNB_handle_x2_reset_request(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +int x2ap_eNB_handle_x2_reset_request(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu) { const char *const X2AP_ResetRequest_str[2] = {"X2AP_ResetRequest_IEs__value_PR_Cause", "X2AP_ResetRequest_IEs__value_PR_InterfaceInstanceIndication"}; @@ -608,12 +540,7 @@ x2ap_eNB_handle_x2_reset_request(instance_t instance, return x2ap_eNB_generate_x2_setup_response(instance_p, x2ap_eNB_data); } - -static -int x2ap_eNB_handle_x2_setup_response(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +static int x2ap_eNB_handle_x2_setup_response(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu) { X2AP_X2SetupResponse_t *x2SetupResponse; @@ -744,11 +671,7 @@ int x2ap_eNB_handle_x2_setup_response(instance_t instance, return 0; } -static -int x2ap_eNB_handle_x2_setup_failure(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +static int x2ap_eNB_handle_x2_setup_failure(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu) { X2AP_X2SetupFailure_t *x2SetupFailure; @@ -814,11 +737,7 @@ int x2ap_eNB_handle_x2_setup_failure(instance_t instance, return 0; } -static -int x2ap_eNB_handle_handover_preparation (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +static int x2ap_eNB_handle_handover_preparation(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu) { X2AP_HandoverRequest_t *x2HandoverRequest; @@ -960,11 +879,7 @@ int x2ap_eNB_handle_handover_preparation (instance_t instance, return 0; } -static -int x2ap_eNB_handle_handover_response (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +static int x2ap_eNB_handle_handover_response(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu) { X2AP_HandoverRequestAcknowledge_t *x2HandoverRequestAck; X2AP_HandoverRequestAcknowledge_IEs_t *ie; @@ -1111,12 +1026,7 @@ int x2ap_eNB_handle_handover_response (instance_t instance, return 0; } - -static -int x2ap_eNB_handle_ue_context_release (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +static int x2ap_eNB_handle_ue_context_release(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu) { X2AP_UEContextRelease_t *x2UEContextRelease; X2AP_UEContextRelease_IEs_t *ie; @@ -1196,11 +1106,7 @@ int x2ap_eNB_handle_ue_context_release (instance_t instance, return 0; } -static -int x2ap_eNB_handle_handover_cancel (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +static int x2ap_eNB_handle_handover_cancel(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu) { X2AP_HandoverCancel_t *x2HandoverCancel; X2AP_HandoverCancel_IEs_t *ie; @@ -1304,12 +1210,7 @@ int x2ap_eNB_handle_handover_cancel (instance_t instance, return 0; } - -static -int x2ap_eNB_handle_senb_addition_request (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +static int x2ap_eNB_handle_senb_addition_request(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu) { X2AP_SeNBAdditionRequest_t *x2SeNBAdditionRequest; @@ -1487,32 +1388,25 @@ int x2ap_eNB_handle_senb_addition_request (instance_t instance, return 0; } -static -int x2ap_eNB_handle_senb_addition_request_ack (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +static int x2ap_eNB_handle_senb_addition_request_ack(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu) { printf("%s:%d:%s:TODO\n", __FILE__, __LINE__, __FUNCTION__); return 0; } - -static -int x2ap_eNB_handle_senb_addition_request_reject (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +static int x2ap_eNB_handle_senb_addition_request_reject(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu) { printf("%s:%d:%s:TODO\n", __FILE__, __LINE__, __FUNCTION__); return 0; } -int -x2ap_eNB_handle_ENDC_x2_setup_request(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +int x2ap_eNB_handle_ENDC_x2_setup_request(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu) { X2AP_ENDCX2SetupRequest_t *x2_ENDC_SetupRequest; @@ -1659,11 +1553,7 @@ x2ap_eNB_handle_ENDC_x2_setup_request(instance_t instance, return x2ap_eNB_generate_ENDC_x2_setup_response(instance_p, x2ap_eNB_data); } -int -x2ap_gNB_handle_ENDC_x2_setup_response(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +int x2ap_gNB_handle_ENDC_x2_setup_response(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, X2AP_X2AP_PDU_t *pdu) { X2AP_ENDCX2SetupResponse_t *x2_ENDC_SetupResponse; @@ -1809,11 +1699,10 @@ x2ap_gNB_handle_ENDC_x2_setup_response(instance_t instance, return 0; } -static -int x2ap_gNB_handle_ENDC_sGNB_addition_request (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +static int x2ap_gNB_handle_ENDC_sGNB_addition_request(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu) { X2AP_SgNBAdditionRequest_t *x2SgNBAdditionRequest; X2AP_SgNBAdditionRequest_IEs_t *ie; @@ -1951,12 +1840,10 @@ LOG_I(RRC,"x2u tunnel: index %d target sgw ip %d.%d.%d.%d length %d gtp teid %u\ return 0; } - -static -int x2ap_eNB_handle_ENDC_sGNB_addition_response (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +static int x2ap_eNB_handle_ENDC_sGNB_addition_response(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu) { X2AP_SgNBAdditionRequestAcknowledge_t *x2SgNBAdditionRequest_ack; @@ -2103,11 +1990,10 @@ int x2ap_eNB_handle_ENDC_sGNB_addition_response (instance_t instance, return 0; } -static -int x2ap_gNB_handle_ENDC_sGNB_reconfiguration_complete (instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +static int x2ap_gNB_handle_ENDC_sGNB_reconfiguration_complete(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu) { X2AP_SgNBReconfigurationComplete_t *x2SgNBReconfigurationComplete; X2AP_SgNBReconfigurationComplete_IEs_t *ie; @@ -2190,11 +2076,10 @@ int x2ap_gNB_handle_ENDC_sGNB_reconfiguration_complete (instance_t instance, return 0; } -static -int x2ap_gNB_handle_ENDC_sGNB_release_request(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +static int x2ap_gNB_handle_ENDC_sGNB_release_request(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu) { /* the logic in this function is the following: when receiving a release * request, the UE may exist in X2. Or not. If it's not in X2, it can @@ -2294,22 +2179,20 @@ int x2ap_gNB_handle_ENDC_sGNB_release_request(instance_t instance, return 0; } -static -int x2ap_gNB_handle_ENDC_sGNB_release_request_acknowledge(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +static int x2ap_gNB_handle_ENDC_sGNB_release_request_acknowledge(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu) { /* nothing to do - may change at some point */ X2AP_INFO("received release request acknowledge\n"); return 0; } -static -int x2ap_gNB_handle_ENDC_sGNB_release_required(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +static int x2ap_gNB_handle_ENDC_sGNB_release_required(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu) { /* the logic in this function is the following: when receiving a release * required we don't care about the UE in X2. We simply send a message @@ -2383,11 +2266,10 @@ int x2ap_gNB_handle_ENDC_sGNB_release_required(instance_t instance, return 0; } -static -int x2ap_gNB_handle_ENDC_sGNB_release_confirm(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - X2AP_X2AP_PDU_t *pdu) +static int x2ap_gNB_handle_ENDC_sGNB_release_confirm(instance_t instance, + sctp_assoc_t assoc_id, + uint32_t stream, + X2AP_X2AP_PDU_t *pdu) { /* nothing to do - may change at some point */ X2AP_INFO("received release confirm\n"); diff --git a/openair2/X2AP/x2ap_eNB_handler.h b/openair2/X2AP/x2ap_eNB_handler.h index 65f411895f..b0a4d33d58 100644 --- a/openair2/X2AP/x2ap_eNB_handler.h +++ b/openair2/X2AP/x2ap_eNB_handler.h @@ -33,7 +33,10 @@ void x2ap_handle_x2_setup_message(x2ap_eNB_instance_t *instance_p, x2ap_eNB_data_t *eNB_desc_p, int sctp_shutdown); -int x2ap_eNB_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - const uint8_t * const data, const uint32_t data_length); +int x2ap_eNB_handle_message(instance_t instance, + sctp_assoc_t assoc_id, + int32_t stream, + const uint8_t *const data, + const uint32_t data_length); #endif /* X2AP_ENB_HANDLERS_H_ */ diff --git a/openair2/X2AP/x2ap_eNB_itti_messaging.c b/openair2/X2AP/x2ap_eNB_itti_messaging.c index 66be3520e2..f80e2da34b 100644 --- a/openair2/X2AP/x2ap_eNB_itti_messaging.c +++ b/openair2/X2AP/x2ap_eNB_itti_messaging.c @@ -30,8 +30,11 @@ #include "x2ap_eNB_itti_messaging.h" -void x2ap_eNB_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer, - uint32_t buffer_length, uint16_t stream) +void x2ap_eNB_itti_send_sctp_data_req(instance_t instance, + sctp_assoc_t assoc_id, + uint8_t *buffer, + uint32_t buffer_length, + uint16_t stream) { MessageDef *message_p; sctp_data_req_t *sctp_data_req; @@ -49,7 +52,7 @@ void x2ap_eNB_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uin } -void x2ap_eNB_itti_send_sctp_close_association(instance_t instance, int32_t assoc_id) +void x2ap_eNB_itti_send_sctp_close_association(instance_t instance, sctp_assoc_t assoc_id) { MessageDef *message_p = NULL; sctp_close_association_t *sctp_close_association_p = NULL; diff --git a/openair2/X2AP/x2ap_eNB_itti_messaging.h b/openair2/X2AP/x2ap_eNB_itti_messaging.h index ee946880ac..7358f3bdb1 100644 --- a/openair2/X2AP/x2ap_eNB_itti_messaging.h +++ b/openair2/X2AP/x2ap_eNB_itti_messaging.h @@ -29,11 +29,13 @@ #ifndef X2AP_ENB_ITTI_MESSAGING_H_ #define X2AP_ENB_ITTI_MESSAGING_H_ -void x2ap_eNB_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer, - uint32_t buffer_length, uint16_t stream); +void x2ap_eNB_itti_send_sctp_data_req(instance_t instance, + sctp_assoc_t assoc_id, + uint8_t *buffer, + uint32_t buffer_length, + uint16_t stream); - -void x2ap_eNB_itti_send_sctp_close_association(instance_t instance, int32_t assoc_id); +void x2ap_eNB_itti_send_sctp_close_association(instance_t instance, sctp_assoc_t assoc_id); #endif /* X2AP_ENB_ITTI_MESSAGING_H_ */ diff --git a/openair2/X2AP/x2ap_eNB_management_procedures.c b/openair2/X2AP/x2ap_eNB_management_procedures.c index a0cc0d1124..465949a58e 100644 --- a/openair2/X2AP/x2ap_eNB_management_procedures.c +++ b/openair2/X2AP/x2ap_eNB_management_procedures.c @@ -122,9 +122,7 @@ printf("---------------------------------------------\n"); } } -struct x2ap_eNB_data_s *x2ap_get_eNB(x2ap_eNB_instance_t *instance_p, - int32_t assoc_id, - uint16_t cnx_id) +struct x2ap_eNB_data_s *x2ap_get_eNB(x2ap_eNB_instance_t *instance_p, sctp_assoc_t assoc_id, uint16_t cnx_id) { struct x2ap_eNB_data_s temp; struct x2ap_eNB_data_s *found; diff --git a/openair2/X2AP/x2ap_eNB_management_procedures.h b/openair2/X2AP/x2ap_eNB_management_procedures.h index 7082f5ac95..5b5ed993a2 100644 --- a/openair2/X2AP/x2ap_eNB_management_procedures.h +++ b/openair2/X2AP/x2ap_eNB_management_procedures.h @@ -47,8 +47,6 @@ x2ap_eNB_data_t* x2ap_is_eNB_assoc_id_in_list(uint32_t sctp_assoc_id); x2ap_eNB_data_t* x2ap_is_eNB_pci_in_list (const uint32_t pci); -struct x2ap_eNB_data_s *x2ap_get_eNB(x2ap_eNB_instance_t *instance_p, - int32_t assoc_id, - uint16_t cnx_id); +struct x2ap_eNB_data_s *x2ap_get_eNB(x2ap_eNB_instance_t *instance_p, sctp_assoc_t assoc_id, uint16_t cnx_id); #endif /* __X2AP_ENB_MANAGEMENT_PROCEDURES__H__ */ diff --git a/openair3/M3AP/m3ap_MCE_defs.h b/openair3/M3AP/m3ap_MCE_defs.h index c90ba38a66..06386301c4 100644 --- a/openair3/M3AP/m3ap_MCE_defs.h +++ b/openair3/M3AP/m3ap_MCE_defs.h @@ -115,7 +115,7 @@ typedef struct m3ap_MCE_data_s { uint16_t cnx_id; /* SCTP association id */ - int32_t assoc_id; + sctp_assoc_t assoc_id; /* Nid cells */ uint32_t Nid_cell[MAX_NUM_CCs]; diff --git a/openair3/M3AP/m3ap_MCE_generate_messsages.c b/openair3/M3AP/m3ap_MCE_generate_messsages.c index 0bedc0e4a2..490ba2fd4f 100644 --- a/openair3/M3AP/m3ap_MCE_generate_messsages.c +++ b/openair3/M3AP/m3ap_MCE_generate_messsages.c @@ -312,7 +312,7 @@ int m2ap_eNB_generate_m2_setup_request( //} //int m2ap_MCE_generate_m2_setup_failure(instance_t instance, -// uint32_t assoc_id, +// sctp_assoc_t assoc_id, // M2AP_Cause_PR cause_type, // long cause_value, // long time_to_wait) diff --git a/openair3/M3AP/m3ap_MCE_handler.c b/openair3/M3AP/m3ap_MCE_handler.c index dc40829aec..e791b2a47c 100644 --- a/openair3/M3AP/m3ap_MCE_handler.c +++ b/openair3/M3AP/m3ap_MCE_handler.c @@ -69,9 +69,11 @@ static char *m3ap_direction_String[] = { return(m3ap_direction_String[m3ap_dir]); } - -int m3ap_MCE_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - const uint8_t * const data, const uint32_t data_length) +int m3ap_MCE_handle_message(instance_t instance, + sctp_assoc_t assoc_id, + int32_t stream, + const uint8_t *const data, + const uint32_t data_length) { M3AP_M3AP_PDU_t pdu; int ret; diff --git a/openair3/M3AP/m3ap_MCE_handler.h b/openair3/M3AP/m3ap_MCE_handler.h index 09eca351b6..b09195c180 100644 --- a/openair3/M3AP/m3ap_MCE_handler.h +++ b/openair3/M3AP/m3ap_MCE_handler.h @@ -33,11 +33,13 @@ //void m3ap_handle_m2_setup_message(m2ap_eNB_instance_t *instance_p, m2ap_eNB_data_t *eNB_desc_p, int sctp_shutdown); -//int m3ap_eNB_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, +//int m3ap_eNB_handle_message(instance_t instance, sctp_assoc_t assoc_id, int32_t stream, //const uint8_t * const data, const uint32_t data_length); -int m3ap_MCE_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - const uint8_t * const data, const uint32_t data_length); - +int m3ap_MCE_handle_message(instance_t instance, + sctp_assoc_t assoc_id, + int32_t stream, + const uint8_t *const data, + const uint32_t data_length); #endif /* __M3AP_MCE_HANDLER__H__ */ diff --git a/openair3/M3AP/m3ap_MCE_interface_management.c b/openair3/M3AP/m3ap_MCE_interface_management.c index 82fc044d3e..5d58e49bb7 100644 --- a/openair3/M3AP/m3ap_MCE_interface_management.c +++ b/openair3/M3AP/m3ap_MCE_interface_management.c @@ -57,11 +57,8 @@ extern m3ap_setup_req_t * m3ap_mce_data_g; - -int MCE_handle_MBMS_SESSION_START_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu){ +int MCE_handle_MBMS_SESSION_START_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ // LOG_W(M3AP, "MCE_handle_MBMS_SESSION_START_REQUEST assoc_id %d\n",assoc_id); // MessageDef *message_p; @@ -212,11 +209,8 @@ int MCE_send_MBMS_SESSION_START_FAILURE(instance_t instance, m3ap_session_start_ return 0; } -int MCE_handle_MBMS_SESSION_STOP_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu){ - +int MCE_handle_MBMS_SESSION_STOP_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ //AssertFatal(1==0,"Not implemented yet\n"); LOG_D(M3AP, "MCE_handle_MBMS_SESSION_STOP_REQUEST assoc_id %d\n",assoc_id); @@ -317,10 +311,7 @@ int MCE_send_MBMS_SESSION_STOP_RESPONSE(instance_t instance, m3ap_session_start_ /* * Session Update */ -int MCE_handle_MBMS_SESSION_UPDATE_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu) +int MCE_handle_MBMS_SESSION_UPDATE_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) { //AssertFatal(1==0,"Not implemented yet\n"); LOG_D(M3AP, "MCE_handle_MBMS_SESSION_UPDATE_REQUEST assoc_id %d\n",assoc_id); @@ -653,10 +644,7 @@ int MCE_send_M3_SETUP_REQUEST(m3ap_MCE_instance_t *instance_p, m3ap_MCE_data_t * -int MCE_handle_M3_SETUP_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu) +int MCE_handle_M3_SETUP_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) { LOG_D(M3AP, "MCE_handle_M3_SETUP_RESPONSE\n"); @@ -700,15 +688,8 @@ int MCE_handle_M3_SETUP_RESPONSE(instance_t instance, } // SETUP FAILURE -int MCE_handle_M3_SETUP_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu) { - LOG_E(M3AP, "MCE_handle_M3_SETUP_FAILURE\n"); - return 0; +int MCE_handle_M3_SETUP_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ + LOG_E(M3AP, "MCE_handle_M3_SETUP_FAILURE\n"); + return 0; } - - - - - diff --git a/openair3/M3AP/m3ap_MCE_interface_management.h b/openair3/M3AP/m3ap_MCE_interface_management.h index 76e13bb8d8..974332f497 100644 --- a/openair3/M3AP/m3ap_MCE_interface_management.h +++ b/openair3/M3AP/m3ap_MCE_interface_management.h @@ -37,10 +37,7 @@ * Session Start */ -int MCE_handle_MBMS_SESSION_START_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); +int MCE_handle_MBMS_SESSION_START_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); int MCE_send_MBMS_SESSION_START_RESPONSE(instance_t instance, m3ap_session_start_resp_t * m3ap_session_start_resp); int MCE_send_MBMS_SESSION_START_FAILURE(instance_t instance, m3ap_session_start_failure_t * m3ap_session_start_failure); @@ -48,18 +45,12 @@ int MCE_send_MBMS_SESSION_START_FAILURE(instance_t instance, m3ap_session_start_ * Session Stop */ -int MCE_handle_MBMS_SESSION_STOP_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); +int MCE_handle_MBMS_SESSION_STOP_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); /* * Session Update */ -int MCE_handle_MBMS_SESSION_UPDATE_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); +int MCE_handle_MBMS_SESSION_UPDATE_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); int MCE_send_MBMS_SESSION_UPDATE_RESPONSE(instance_t instance, m3ap_mbms_session_update_resp_t * m3ap_mbms_session_update_resp); int MCE_send_MBMS_SESSION_UPDATE_FAILURE(instance_t instance, m3ap_mbms_session_update_failure_t * m3ap_mbms_session_update_failure); @@ -75,43 +66,25 @@ int MCE_send_MBMS_SESSION_STOP_RESPONSE(instance_t instance, m3ap_session_start_ /* * Reset */ -int MCE_handle_RESET(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); +int MCE_handle_RESET(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); int MCE_send_RESET_ACKKNOWLEDGE(instance_t instance, M3AP_ResetAcknowledge_t *ResetAcknowledge); int MCE_send_RESET(instance_t instance, M3AP_Reset_t *Reset); -int MCE_handle_RESET_ACKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); +int MCE_handle_RESET_ACKNOWLEDGE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); /* * M3AP Setup */ int MCE_send_M3_SETUP_REQUEST( m3ap_MCE_instance_t *instance_p, m3ap_MCE_data_t *m3ap_MCE_data_p); -int MCE_handle_M3_SETUP_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); +int MCE_handle_M3_SETUP_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); -int MCE_handle_M3_SETUP_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); +int MCE_handle_M3_SETUP_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); /* * Error Indication */ int MCE_send_ERROR_INDICATION(instance_t instance, M3AP_M3AP_PDU_t *pdu_p); -int MCE_handle_ERROR_INDICATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); - - - +int MCE_handle_ERROR_INDICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); #endif /* M3AP_MCE_INTERFACE_MANAGEMENT_H_ */ diff --git a/openair3/M3AP/m3ap_MCE_management_procedures.c b/openair3/M3AP/m3ap_MCE_management_procedures.c index 065d4b9616..c58cc7c5f1 100644 --- a/openair3/M3AP/m3ap_MCE_management_procedures.c +++ b/openair3/M3AP/m3ap_MCE_management_procedures.c @@ -122,9 +122,7 @@ printf("---------------------------------------------\n"); } } -struct m3ap_MCE_data_s *m3ap_get_MCE(m3ap_MCE_instance_t *instance_p, - int32_t assoc_id, - uint16_t cnx_id) +struct m3ap_MCE_data_s *m3ap_get_MCE(m3ap_MCE_instance_t *instance_p, sctp_assoc_t assoc_id, uint16_t cnx_id) { struct m3ap_MCE_data_s temp; struct m3ap_MCE_data_s *found; diff --git a/openair3/M3AP/m3ap_MCE_management_procedures.h b/openair3/M3AP/m3ap_MCE_management_procedures.h index 27e8c928a0..2a5ada2fbe 100644 --- a/openair3/M3AP/m3ap_MCE_management_procedures.h +++ b/openair3/M3AP/m3ap_MCE_management_procedures.h @@ -46,8 +46,6 @@ m3ap_MCE_data_t* m3ap_is_MCE_assoc_id_in_list(uint32_t sctp_assoc_id); m3ap_MCE_data_t* m3ap_is_MCE_pci_in_list (const uint32_t pci); -struct m3ap_MCE_data_s *m3ap_get_MCE(m3ap_MCE_instance_t *instance_p, - int32_t assoc_id, - uint16_t cnx_id); +struct m3ap_MCE_data_s *m3ap_get_MCE(m3ap_MCE_instance_t *instance_p, sctp_assoc_t assoc_id, uint16_t cnx_id); #endif /* __M3AP_MCE_MANAGEMENT_PROCEDURES__H__ */ diff --git a/openair3/M3AP/m3ap_MME_defs.h b/openair3/M3AP/m3ap_MME_defs.h index 7d3186915f..54603c6997 100644 --- a/openair3/M3AP/m3ap_MME_defs.h +++ b/openair3/M3AP/m3ap_MME_defs.h @@ -115,7 +115,7 @@ typedef struct m3ap_MME_data_s { uint16_t cnx_id; /* SCTP association id */ - int32_t assoc_id; + sctp_assoc_t assoc_id; /* Nid cells */ uint32_t Nid_cell[MAX_NUM_CCs]; diff --git a/openair3/M3AP/m3ap_MME_generate_messages.c b/openair3/M3AP/m3ap_MME_generate_messages.c index 3a4c1bb473..d513fcd3db 100644 --- a/openair3/M3AP/m3ap_MME_generate_messages.c +++ b/openair3/M3AP/m3ap_MME_generate_messages.c @@ -314,7 +314,7 @@ int m2ap_MCE_generate_m2_setup_response(m2ap_MCE_instance_t *instance_p, m2ap_MC } int m2ap_MCE_generate_m2_setup_failure(instance_t instance, - uint32_t assoc_id, + sctp_assoc_t assoc_id, M2AP_Cause_PR cause_type, long cause_value, long time_to_wait) diff --git a/openair3/M3AP/m3ap_MME_generate_messages.h b/openair3/M3AP/m3ap_MME_generate_messages.h index 146f58825a..a1dbe837c3 100644 --- a/openair3/M3AP/m3ap_MME_generate_messages.h +++ b/openair3/M3AP/m3ap_MME_generate_messages.h @@ -38,7 +38,7 @@ int m2ap_MCE_generate_m2_setup_request(m2ap_MCE_instance_t *instance_p, int m2ap_MCE_generate_m2_setup_response(m2ap_MCE_instance_t *instance_p, m2ap_MCE_data_t *m2ap_MCE_data_p); int m2ap_MCE_generate_m2_setup_failure(instance_t instance, - uint32_t assoc_id, + sctp_assoc_t assoc_id, M2AP_Cause_PR cause_type, long cause_value, long time_to_wait); diff --git a/openair3/M3AP/m3ap_MME_handler.c b/openair3/M3AP/m3ap_MME_handler.c index 6c8184336e..a459d1000c 100644 --- a/openair3/M3AP/m3ap_MME_handler.c +++ b/openair3/M3AP/m3ap_MME_handler.c @@ -68,9 +68,11 @@ static char *m3ap_direction_String[] = { return(m3ap_direction_String[m3ap_dir]); } - -int m3ap_MME_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - const uint8_t * const data, const uint32_t data_length) +int m3ap_MME_handle_message(instance_t instance, + sctp_assoc_t assoc_id, + int32_t stream, + const uint8_t *const data, + const uint32_t data_length) { M3AP_M3AP_PDU_t pdu; int ret; diff --git a/openair3/M3AP/m3ap_MME_handler.h b/openair3/M3AP/m3ap_MME_handler.h index feabfe256c..ce8939ada7 100644 --- a/openair3/M3AP/m3ap_MME_handler.h +++ b/openair3/M3AP/m3ap_MME_handler.h @@ -33,11 +33,13 @@ //void m3ap_handle_m2_setup_message(m2ap_eNB_instance_t *instance_p, m2ap_eNB_data_t *eNB_desc_p, int sctp_shutdown); -//int m3ap_eNB_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, +//int m3ap_eNB_handle_message(instance_t instance, sctp_assoc_t assoc_id, int32_t stream, //const uint8_t * const data, const uint32_t data_length); -int m3ap_MME_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - const uint8_t * const data, const uint32_t data_length); - +int m3ap_MME_handle_message(instance_t instance, + sctp_assoc_t assoc_id, + int32_t stream, + const uint8_t *const data, + const uint32_t data_length); #endif /* M3AP_MME_HANDLERS_H_ */ diff --git a/openair3/M3AP/m3ap_MME_interface_management.c b/openair3/M3AP/m3ap_MME_interface_management.c index 38e58c9b98..823cccc6a1 100644 --- a/openair3/M3AP/m3ap_MME_interface_management.c +++ b/openair3/M3AP/m3ap_MME_interface_management.c @@ -61,8 +61,9 @@ uint8_t m3ap_start_message[] = { /* * MBMS Session start */ -int MME_send_MBMS_SESSION_START_REQUEST(instance_t instance/*, uint32_t assoc_id*/,m3ap_session_start_req_t* m3ap_session_start_req){ - +int MME_send_MBMS_SESSION_START_REQUEST(instance_t instance /*, sctp_assoc_t assoc_id*/, + m3ap_session_start_req_t *m3ap_session_start_req) +{ //AssertFatal(1==0,"Not implemented yet\n"); //module_id_t enb_mod_idP=0; @@ -239,13 +240,10 @@ int MME_send_MBMS_SESSION_START_REQUEST(instance_t instance/*, uint32_t assoc_id m3ap_MME_itti_send_sctp_data_req(instance, m3ap_mme_data_from_mce->assoc_id, buffer, len, 0); return 0; - } -int MME_handle_MBMS_SESSION_START_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu){ +int MME_handle_MBMS_SESSION_START_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ // AssertFatal(1==0,"Not implemented yet\n"); LOG_D(M3AP, "MME_handle_MBMS_SESSION_START_RESPONSE\n"); @@ -300,12 +298,9 @@ int MME_handle_MBMS_SESSION_START_RESPONSE(instance_t instance, // assoc_id,ENB_MODULE_ID_TO_INSTANCE(assoc_id)); itti_send_msg_to_task(TASK_MME_APP, ENB_MODULE_ID_TO_INSTANCE(assoc_id), msg_g); return 0; - } -int MME_handle_MBMS_SESSION_START_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu){ +int MME_handle_MBMS_SESSION_START_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } @@ -370,10 +365,8 @@ int MME_send_MBMS_SESSION_STOP_REQUEST(instance_t instance, m3ap_session_stop_re } -int MME_handle_MBMS_SESSION_STOP_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu){ +int MME_handle_MBMS_SESSION_STOP_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ //AssertFatal(1==0,"Not implemented yet\n"); LOG_D(M3AP, "eNB_handle_MBMS_SESSION_STOP_RESPONSE\n"); @@ -432,12 +425,8 @@ int MME_handle_MBMS_SESSION_STOP_RESPONSE(instance_t instance, return 0; } - - -int MME_handle_MBMS_SESSION_STOP_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu){ +int MME_handle_MBMS_SESSION_STOP_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } @@ -456,19 +445,14 @@ int MME_send_RESET(instance_t instance, m3ap_reset_t * m3ap_reset) { } - -int MME_handle_RESET_ACKKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu) { +int MME_handle_RESET_ACKKNOWLEDGE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } -int MME_handle_RESET(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu) { +int MME_handle_RESET(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } @@ -479,10 +463,7 @@ int MME_send_RESET_ACKNOWLEDGE(instance_t instance, M3AP_ResetAcknowledge_t *Res /* * M3 Setup */ -int MME_handle_M3_SETUP_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu) +int MME_handle_M3_SETUP_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) { LOG_D(M2AP, "MCE_handle_M3_SETUP_REQUEST assoc_id %d\n",assoc_id); @@ -632,8 +613,9 @@ int MME_handle_M3_SETUP_REQUEST(instance_t instance, return 0; } -int MME_send_M3_SETUP_RESPONSE(instance_t instance, /*uint32_t assoc_id,*/ - m3ap_setup_resp_t *m3ap_setup_resp) { +int MME_send_M3_SETUP_RESPONSE(instance_t instance, /*sctp_assoc_t assoc_id,*/ + m3ap_setup_resp_t *m3ap_setup_resp) +{ M3AP_M3AP_PDU_t pdu; M3AP_M3SetupResponse_t *out; M3AP_M3SetupResponseIEs_t *ie; @@ -774,19 +756,16 @@ int MME_send_M3_SETUP_FAILURE(instance_t instance,m3ap_setup_failure_t* m3ap_set * MME Configuration Update */ - -int MME_handle_MME_CONFIGURATION_UPDATE_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu){ +int MME_handle_MME_CONFIGURATION_UPDATE_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } - int MME_handle_MME_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu){ + sctp_assoc_t assoc_id, + uint32_t stream, + M3AP_M3AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } @@ -795,11 +774,8 @@ int MME_handle_MME_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance, * MCE Configuration Update */ - -int MME_handle_MCE_CONFIGURATION_UPDATE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu){ +int MME_handle_MCE_CONFIGURATION_UPDATE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } @@ -812,10 +788,8 @@ int MME_handle_MCE_CONFIGURATION_UPDATE(instance_t instance, * Error Indication */ -int MME_handle_ERROR_INDICATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu) { +int MME_handle_ERROR_INDICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); @@ -1003,12 +977,8 @@ int MME_send_MBMS_SESSION_UPDATE_REQUEST(instance_t instance, m3ap_mbms_session_ } - - -int MME_handle_MBMS_SESSION_UPDATE_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu){ +int MME_handle_MBMS_SESSION_UPDATE_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ //AssertFatal(1==0,"Not implemented yet\n"); LOG_D(M3AP, "MME_handle_MBMS_SESSION_UPDATE_RESPONSE\n"); @@ -1067,30 +1037,18 @@ int MME_handle_MBMS_SESSION_UPDATE_RESPONSE(instance_t instance, } - - -int MME_handle_MBMS_SESSION_UPDATE_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu){ +int MME_handle_MBMS_SESSION_UPDATE_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } - - -int MME_handle_MBMS_SERVICE_COUNTING_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu){ +int MME_handle_MBMS_SERVICE_COUNTING_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } - - -int MME_handle_MBMS_SESSION_COUNTING_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu){ +int MME_handle_MBMS_SESSION_COUNTING_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } @@ -1101,9 +1059,10 @@ int MME_handle_MBMS_SESSION_COUNTING_FAILURE(instance_t instance, */ int MME_handle_MBMS_SESSION_COUNTING_RESULTS_REPORT(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu){ + sctp_assoc_t assoc_id, + uint32_t stream, + M3AP_M3AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } @@ -1112,10 +1071,8 @@ int MME_handle_MBMS_SESSION_COUNTING_RESULTS_REPORT(instance_t instance, /* * Overload Notification */ -int MME_handle_MBMS_OVERLOAD_NOTIFICATION(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu){ +int MME_handle_MBMS_OVERLOAD_NOTIFICATION(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu) +{ AssertFatal(1==0,"Not implemented yet\n"); } diff --git a/openair3/M3AP/m3ap_MME_interface_management.h b/openair3/M3AP/m3ap_MME_interface_management.h index d3765182ce..a4f8db8946 100644 --- a/openair3/M3AP/m3ap_MME_interface_management.h +++ b/openair3/M3AP/m3ap_MME_interface_management.h @@ -35,75 +35,45 @@ /* * MBMS Session start */ -int MME_send_MBMS_SESSION_START_REQUEST(instance_t instance/*, - uint32_t assoc_id*/,m3ap_session_start_req_t* m3ap_session_start_req); -int MME_handle_MBMS_SESSION_START_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); +int MME_send_MBMS_SESSION_START_REQUEST(instance_t instance, + /*sctp_assoc_t assoc_id,*/ + m3ap_session_start_req_t *m3ap_session_start_req); +int MME_handle_MBMS_SESSION_START_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); -int MME_handle_MBMS_SESSION_START_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); +int MME_handle_MBMS_SESSION_START_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); /* * MBMS Session stop */ int MME_send_MBMS_SESSION_STOP_REQUEST(instance_t instance, m3ap_session_stop_req_t* m3ap_session_stop_req); -int MME_handle_MBMS_SESSION_STOP_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); +int MME_handle_MBMS_SESSION_STOP_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); /* * Update */ -int MME_handle_MBMS_SESSION_UPDATE_RESPONSE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); - -int MME_handle_MBMS_SESSION_UPDATE_FAILURE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); - +int MME_handle_MBMS_SESSION_UPDATE_RESPONSE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); +int MME_handle_MBMS_SESSION_UPDATE_FAILURE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); /* * Reset */ int MME_send_RESET(instance_t instance, m3ap_reset_t * m3ap_reset); -int MME_handle_RESET_ACKKNOWLEDGE(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); +int MME_handle_RESET_ACKKNOWLEDGE(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); -int MME_handle_RESET(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); +int MME_handle_RESET(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); int MME_send_RESET_ACKNOWLEDGE(instance_t instance, M3AP_ResetAcknowledge_t *ResetAcknowledge); /* * M3AP Setup */ -int MME_handle_M3_SETUP_REQUEST(instance_t instance, - uint32_t assoc_id, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); - -int MME_send_M3_SETUP_RESPONSE(instance_t instance,/*uint32_t assoc_id,*/ m3ap_setup_resp_t *m3ap_setup_resp); - -int MME_send_M3_SETUP_FAILURE(instance_t instance, /*uint32_t assoc_id*/ m3ap_setup_failure_t * m3ap_setup_failure); - - - +int MME_handle_M3_SETUP_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); +int MME_send_M3_SETUP_RESPONSE(instance_t instance, /*sctp_assoc_t assoc_id,*/ m3ap_setup_resp_t *m3ap_setup_resp); +int MME_send_M3_SETUP_FAILURE(instance_t instance, /*sctp_assoc_t assoc_id*/ m3ap_setup_failure_t *m3ap_setup_failure); #endif /* M3AP_MME_INTERFACE_MANAGEMENT_H_ */ diff --git a/openair3/M3AP/m3ap_MME_management_procedures.c b/openair3/M3AP/m3ap_MME_management_procedures.c index 151aba04e4..1225db2213 100644 --- a/openair3/M3AP/m3ap_MME_management_procedures.c +++ b/openair3/M3AP/m3ap_MME_management_procedures.c @@ -122,9 +122,7 @@ printf("---------------------------------------------\n"); } } -struct m3ap_MME_data_s *m3ap_get_MME(m3ap_MME_instance_t *instance_p, - int32_t assoc_id, - uint16_t cnx_id) +struct m3ap_MME_data_s *m3ap_get_MME(m3ap_MME_instance_t *instance_p, sctp_assoc_t assoc_id, uint16_t cnx_id) { struct m3ap_MME_data_s temp; struct m3ap_MME_data_s *found; diff --git a/openair3/M3AP/m3ap_MME_management_procedures.h b/openair3/M3AP/m3ap_MME_management_procedures.h index b21189b915..b5a75f8a23 100644 --- a/openair3/M3AP/m3ap_MME_management_procedures.h +++ b/openair3/M3AP/m3ap_MME_management_procedures.h @@ -47,8 +47,6 @@ m3ap_MME_data_t* m3ap_is_MME_assoc_id_in_list(uint32_t sctp_assoc_id); m3ap_MME_data_t* m3ap_is_MME_pci_in_list (const uint32_t pci); -struct m3ap_MME_data_s *m3ap_get_MME(m3ap_MME_instance_t *instance_p, - int32_t assoc_id, - uint16_t cnx_id); +struct m3ap_MME_data_s *m3ap_get_MME(m3ap_MME_instance_t *instance_p, sctp_assoc_t assoc_id, uint16_t cnx_id); #endif /* __M3AP_MME_MANAGEMENT_PROCEDURES__H__ */ diff --git a/openair3/M3AP/m3ap_common.h b/openair3/M3AP/m3ap_common.h index 5d40b29363..d59407c2ec 100644 --- a/openair3/M3AP/m3ap_common.h +++ b/openair3/M3AP/m3ap_common.h @@ -74,30 +74,15 @@ extern int asn1_xer_print; /** \brief Function callback prototype. **/ -typedef int (*m3ap_message_decoded_callback)( - instance_t instance, - uint32_t assocId, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); - +typedef int (*m3ap_message_decoded_callback)(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); /** \brief Function callback prototype. **/ -typedef int (*m3ap_MCE_message_decoded_callback)( - instance_t instance, - uint32_t assocId, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); +typedef int (*m3ap_MCE_message_decoded_callback)(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); /** \brief Function callback prototype. **/ -typedef int (*m3ap_MME_message_decoded_callback)( - instance_t instance, - uint32_t assocId, - uint32_t stream, - M3AP_M3AP_PDU_t *pdu); - - +typedef int (*m3ap_MME_message_decoded_callback)(instance_t instance, sctp_assoc_t assoc_id, uint32_t stream, M3AP_M3AP_PDU_t *pdu); /** \brief Encode a successfull outcome message \param buffer pointer to buffer in which data will be encoded diff --git a/openair3/M3AP/m3ap_handler.c b/openair3/M3AP/m3ap_handler.c index 41675ac749..f4cad1bd08 100644 --- a/openair3/M3AP/m3ap_handler.c +++ b/openair3/M3AP/m3ap_handler.c @@ -69,9 +69,11 @@ static char *m3ap_direction_String[] = { return(m3ap_direction_String[m3ap_dir]); } - -int m3ap_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - const uint8_t * const data, const uint32_t data_length) +int m3ap_handle_message(instance_t instance, + sctp_assoc_t assoc_id, + int32_t stream, + const uint8_t *const data, + const uint32_t data_length) { M3AP_M3AP_PDU_t pdu; int ret; diff --git a/openair3/M3AP/m3ap_handler.h b/openair3/M3AP/m3ap_handler.h index 4b01307807..5dcc71204e 100644 --- a/openair3/M3AP/m3ap_handler.h +++ b/openair3/M3AP/m3ap_handler.h @@ -33,11 +33,14 @@ //void m3ap_handle_m2_setup_message(m2ap_eNB_instance_t *instance_p, m2ap_eNB_data_t *eNB_desc_p, int sctp_shutdown); -//int m3ap_eNB_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, +//int m3ap_eNB_handle_message(instance_t instance, sctp_assoc_t assoc_id, int32_t stream, //const uint8_t * const data, const uint32_t data_length); -int m3ap_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream, - const uint8_t * const data, const uint32_t data_length); +int m3ap_handle_message(instance_t instance, + sctp_assoc_t assoc_id, + int32_t stream, + const uint8_t *const data, + const uint32_t data_length); #endif /* M2AP_MCE_HANDLERS_H_ */ diff --git a/openair3/M3AP/m3ap_itti_messaging.c b/openair3/M3AP/m3ap_itti_messaging.c index 42e689343f..83b51f0091 100644 --- a/openair3/M3AP/m3ap_itti_messaging.c +++ b/openair3/M3AP/m3ap_itti_messaging.c @@ -30,8 +30,11 @@ #include "m3ap_itti_messaging.h" -void m3ap_MCE_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer, - uint32_t buffer_length, uint16_t stream) +void m3ap_MCE_itti_send_sctp_data_req(instance_t instance, + sctp_assoc_t assoc_id, + uint8_t *buffer, + uint32_t buffer_length, + uint16_t stream) { MessageDef *message_p; sctp_data_req_t *sctp_data_req; @@ -51,7 +54,7 @@ void m3ap_MCE_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uin } -void m3ap_MCE_itti_send_sctp_close_association(instance_t instance, int32_t assoc_id) +void m3ap_MCE_itti_send_sctp_close_association(instance_t instance, sctp_assoc_t assoc_id) { MessageDef *message_p = NULL; sctp_close_association_t *sctp_close_association_p = NULL; @@ -63,9 +66,11 @@ void m3ap_MCE_itti_send_sctp_close_association(instance_t instance, int32_t asso itti_send_msg_to_task(TASK_SCTP, instance, message_p); } - -void m3ap_MME_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer, - uint32_t buffer_length, uint16_t stream) +void m3ap_MME_itti_send_sctp_data_req(instance_t instance, + sctp_assoc_t assoc_id, + uint8_t *buffer, + uint32_t buffer_length, + uint16_t stream) { MessageDef *message_p; sctp_data_req_t *sctp_data_req; @@ -83,7 +88,7 @@ void m3ap_MME_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uin } -void m3ap_MME_itti_send_sctp_close_association(instance_t instance, int32_t assoc_id) +void m3ap_MME_itti_send_sctp_close_association(instance_t instance, sctp_assoc_t assoc_id) { MessageDef *message_p = NULL; sctp_close_association_t *sctp_close_association_p = NULL; diff --git a/openair3/M3AP/m3ap_itti_messaging.h b/openair3/M3AP/m3ap_itti_messaging.h index 8a4069da9b..bd22cc87f8 100644 --- a/openair3/M3AP/m3ap_itti_messaging.h +++ b/openair3/M3AP/m3ap_itti_messaging.h @@ -29,18 +29,21 @@ #ifndef M3AP_MCE_ITTI_MESSAGING_H_ #define M3AP_MCE_ITTI_MESSAGING_H_ -void m3ap_MCE_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer, - uint32_t buffer_length, uint16_t stream); +void m3ap_MCE_itti_send_sctp_data_req(instance_t instance, + sctp_assoc_t assoc_id, + uint8_t *buffer, + uint32_t buffer_length, + uint16_t stream); +void m3ap_MCE_itti_send_sctp_close_association(instance_t instance, sctp_assoc_t assoc_id); -void m3ap_MCE_itti_send_sctp_close_association(instance_t instance, int32_t assoc_id); +void m3ap_MME_itti_send_sctp_data_req(instance_t instance, + sctp_assoc_t assoc_id, + uint8_t *buffer, + uint32_t buffer_length, + uint16_t stream); - -void m3ap_MME_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer, - uint32_t buffer_length, uint16_t stream); - - -void m3ap_MME_itti_send_sctp_close_association(instance_t instance, int32_t assoc_id); +void m3ap_MME_itti_send_sctp_close_association(instance_t instance, sctp_assoc_t assoc_id); diff --git a/openair3/NGAP/ngap_common.h b/openair3/NGAP/ngap_common.h index 41f6093c08..8c66a11cd0 100644 --- a/openair3/NGAP/ngap_common.h +++ b/openair3/NGAP/ngap_common.h @@ -127,11 +127,7 @@ extern int asn1_xer_print; /** \brief Function callback prototype. **/ -typedef int (*ngap_message_decoded_callback)( - uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu -); +typedef int (*ngap_message_decoded_callback)(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu); /** \brief Handle criticality \param criticality Criticality of the IE diff --git a/openair3/NGAP/ngap_gNB_defs.h b/openair3/NGAP/ngap_gNB_defs.h index 5591ecb061..c93d448723 100644 --- a/openair3/NGAP/ngap_gNB_defs.h +++ b/openair3/NGAP/ngap_gNB_defs.h @@ -203,7 +203,7 @@ typedef struct ngap_gNB_amf_data_s { uint16_t cnx_id; /* SCTP association id */ - int32_t assoc_id; + sctp_assoc_t assoc_id; /* This is served PLMN IDs communicated to the AMF via an index over the * MCC/MNC array in ngap_gNB_instance */ diff --git a/openair3/NGAP/ngap_gNB_handlers.c b/openair3/NGAP/ngap_gNB_handlers.c index 788f56381f..1835b51cb6 100644 --- a/openair3/NGAP/ngap_gNB_handlers.c +++ b/openair3/NGAP/ngap_gNB_handlers.c @@ -105,10 +105,8 @@ void ngap_handle_ng_setup_message(ngap_gNB_amf_data_t *amf_desc_p, int sctp_shut } } -static -int ngap_gNB_handle_ng_setup_failure(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu) { +static int ngap_gNB_handle_ng_setup_failure(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) +{ NGAP_NGSetupFailure_t *container; NGAP_NGSetupFailureIEs_t *ie; ngap_gNB_amf_data_t *amf_desc_p; @@ -142,10 +140,8 @@ int ngap_gNB_handle_ng_setup_failure(uint32_t assoc_id, return 0; } -static -int ngap_gNB_handle_ng_setup_response(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu) { +static int ngap_gNB_handle_ng_setup_response(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) +{ NGAP_NGSetupResponse_t *container; NGAP_NGSetupResponseIEs_t *ie; ngap_gNB_amf_data_t *amf_desc_p; @@ -297,12 +293,8 @@ int ngap_gNB_handle_ng_setup_response(uint32_t assoc_id, return 0; } - -static -int ngap_gNB_handle_error_indication(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu) { - +static int ngap_gNB_handle_error_indication(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) +{ NGAP_ErrorIndication_t *container; NGAP_ErrorIndicationIEs_t *ie; ngap_gNB_amf_data_t *amf_desc_p; @@ -678,7 +670,7 @@ int ngap_gNB_handle_error_indication(uint32_t assoc_id, return 0; } -static int ngap_gNB_handle_initial_context_request(uint32_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) +static int ngap_gNB_handle_initial_context_request(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) { int i; ngap_gNB_amf_data_t *amf_desc_p = NULL; @@ -838,10 +830,8 @@ static int ngap_gNB_handle_initial_context_request(uint32_t assoc_id, uint32_t s return 0; } -static -int ngap_gNB_handle_ue_context_release_command(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu) { +static int ngap_gNB_handle_ue_context_release_command(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) +{ ngap_gNB_amf_data_t *amf_desc_p = NULL; MessageDef *message_p = NULL; uint64_t amf_ue_ngap_id; @@ -906,11 +896,9 @@ int ngap_gNB_handle_ue_context_release_command(uint32_t assoc_id, return 0; } -static -int ngap_gNB_handle_pdusession_setup_request(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu) { -// NGAP_AMF_UE_NGAP_ID_t amf_ue_ngap_id; +static int ngap_gNB_handle_pdusession_setup_request(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) +{ + // NGAP_AMF_UE_NGAP_ID_t amf_ue_ngap_id; uint64_t amf_ue_ngap_id; NGAP_RAN_UE_NGAP_ID_t ran_ue_ngap_id; ngap_gNB_amf_data_t *amf_desc_p = NULL; @@ -989,12 +977,8 @@ int ngap_gNB_handle_pdusession_setup_request(uint32_t assoc_id, return 0; } - -static -int ngap_gNB_handle_paging(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu) { - +static int ngap_gNB_handle_paging(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) +{ ngap_gNB_amf_data_t *amf_desc_p = NULL; ngap_gNB_instance_t *ngap_gNB_instance = NULL; NGAP_Paging_t *container; @@ -1082,7 +1066,7 @@ int ngap_gNB_handle_paging(uint32_t assoc_id, return 0; } -static int ngap_gNB_handle_pdusession_modify_request(uint32_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) +static int ngap_gNB_handle_pdusession_modify_request(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) { ngap_gNB_amf_data_t *amf_desc_p = NULL; NGAP_PDUSessionResourceModifyRequest_t *container; @@ -1176,11 +1160,8 @@ static int ngap_gNB_handle_pdusession_modify_request(uint32_t assoc_id, uint32_t } // handle pdu session release command and send it to rrc_end -static -int ngap_gNB_handle_pdusession_release_command(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu) { - +static int ngap_gNB_handle_pdusession_release_command(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) +{ int i; ngap_gNB_amf_data_t *amf_desc_p = NULL; NGAP_PDUSessionResourceReleaseCommand_t *container; @@ -1263,29 +1244,21 @@ int ngap_gNB_handle_pdusession_release_command(uint32_t assoc_id, return 0; } -static -int ngap_gNB_handle_ng_path_switch_request_ack(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu) { +static int ngap_gNB_handle_ng_path_switch_request_ack(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) +{ // TODO return 0; } -static -int ngap_gNB_handle_ng_path_switch_request_failure(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu) { - +static int ngap_gNB_handle_ng_path_switch_request_failure(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) +{ // TODO return 0; } -static -int ngap_gNB_handle_ng_ENDC_pdusession_modification_confirm(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu){ - - LOG_W(NGAP, "Implementation of NGAP Pdusession Modification confirm handler is pending...\n"); +static int ngap_gNB_handle_ng_ENDC_pdusession_modification_confirm(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) +{ + LOG_W(NGAP, "Implementation of NGAP Pdusession Modification confirm handler is pending...\n"); return 0; } @@ -1347,7 +1320,7 @@ const ngap_message_decoded_callback ngap_messages_callback[][3] = { }; -int ngap_gNB_handle_message(uint32_t assoc_id, int32_t stream, const uint8_t *const data, const uint32_t data_length) +int ngap_gNB_handle_message(sctp_assoc_t assoc_id, int32_t stream, const uint8_t *const data, const uint32_t data_length) { NGAP_NGAP_PDU_t pdu; int ret; diff --git a/openair3/NGAP/ngap_gNB_handlers.h b/openair3/NGAP/ngap_gNB_handlers.h index 889946dd44..5291b78fa8 100644 --- a/openair3/NGAP/ngap_gNB_handlers.h +++ b/openair3/NGAP/ngap_gNB_handlers.h @@ -32,7 +32,6 @@ void ngap_handle_ng_setup_message(ngap_gNB_amf_data_t *amf_desc_p, int sctp_shutdown); -int ngap_gNB_handle_message(uint32_t assoc_id, int32_t stream, - const uint8_t * const data, const uint32_t data_length); +int ngap_gNB_handle_message(sctp_assoc_t assoc_id, int32_t stream, const uint8_t *const data, const uint32_t data_length); #endif /* NGAP_GNB_HANDLERS_H_ */ diff --git a/openair3/NGAP/ngap_gNB_itti_messaging.c b/openair3/NGAP/ngap_gNB_itti_messaging.c index 87b4ba4c73..4f4a3b2654 100644 --- a/openair3/NGAP/ngap_gNB_itti_messaging.c +++ b/openair3/NGAP/ngap_gNB_itti_messaging.c @@ -31,8 +31,11 @@ #include "ngap_gNB_itti_messaging.h" -void ngap_gNB_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer, - uint32_t buffer_length, uint16_t stream) +void ngap_gNB_itti_send_sctp_data_req(instance_t instance, + sctp_assoc_t assoc_id, + uint8_t *buffer, + uint32_t buffer_length, + uint16_t stream) { MessageDef *message_p; sctp_data_req_t *sctp_data_req; @@ -66,7 +69,7 @@ void ngap_gNB_itti_send_nas_downlink_ind(instance_t instance, uint32_t gNB_ue_ng itti_send_msg_to_task(TASK_RRC_GNB, instance, message_p); } -void ngap_gNB_itti_send_sctp_close_association(instance_t instance, int32_t assoc_id) +void ngap_gNB_itti_send_sctp_close_association(instance_t instance, sctp_assoc_t assoc_id) { MessageDef *message_p = NULL; sctp_close_association_t *sctp_close_association_p = NULL; diff --git a/openair3/NGAP/ngap_gNB_itti_messaging.h b/openair3/NGAP/ngap_gNB_itti_messaging.h index 08224a27f5..362c9a0266 100644 --- a/openair3/NGAP/ngap_gNB_itti_messaging.h +++ b/openair3/NGAP/ngap_gNB_itti_messaging.h @@ -30,13 +30,14 @@ #ifndef NGAP_GNB_ITTI_MESSAGING_H_ #define NGAP_GNB_ITTI_MESSAGING_H_ -void ngap_gNB_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer, - uint32_t buffer_length, uint16_t stream); +void ngap_gNB_itti_send_sctp_data_req(instance_t instance, + sctp_assoc_t assoc_id, + uint8_t *buffer, + uint32_t buffer_length, + uint16_t stream); void ngap_gNB_itti_send_nas_downlink_ind(instance_t instance, uint32_t gNB_ue_ngap_id, uint8_t *nas_pdu, uint32_t nas_pdu_length); -void ngap_gNB_itti_send_sctp_close_association(instance_t instance, - int32_t assoc_id); - +void ngap_gNB_itti_send_sctp_close_association(instance_t instance, sctp_assoc_t assoc_id); #endif /* NGAP_GNB_ITTI_MESSAGING_H_ */ diff --git a/openair3/NGAP/ngap_gNB_management_procedures.c b/openair3/NGAP/ngap_gNB_management_procedures.c index 85167ed7f0..6ed06d9324 100644 --- a/openair3/NGAP/ngap_gNB_management_procedures.c +++ b/openair3/NGAP/ngap_gNB_management_procedures.c @@ -89,9 +89,7 @@ void ngap_gNB_insert_new_instance(ngap_gNB_instance_t *new_instance_p) new_instance_p, ngap_gNB_entries); } -struct ngap_gNB_amf_data_s *ngap_gNB_get_AMF( - ngap_gNB_instance_t *instance_p, - int32_t assoc_id, uint16_t cnx_id) +struct ngap_gNB_amf_data_s *ngap_gNB_get_AMF(ngap_gNB_instance_t *instance_p, sctp_assoc_t assoc_id, uint16_t cnx_id) { struct ngap_gNB_amf_data_s temp; struct ngap_gNB_amf_data_s *found; diff --git a/openair3/NGAP/ngap_gNB_management_procedures.h b/openair3/NGAP/ngap_gNB_management_procedures.h index e192f71be9..fa62f53382 100644 --- a/openair3/NGAP/ngap_gNB_management_procedures.h +++ b/openair3/NGAP/ngap_gNB_management_procedures.h @@ -31,9 +31,7 @@ #ifndef NGAP_GNB_MANAGEMENT_PROCEDURES_H_ #define NGAP_GNB_MANAGEMENT_PROCEDURES_H_ -struct ngap_gNB_amf_data_s *ngap_gNB_get_AMF( - ngap_gNB_instance_t *instance_p, - int32_t assoc_id, uint16_t cnx_id); +struct ngap_gNB_amf_data_s *ngap_gNB_get_AMF(ngap_gNB_instance_t *instance_p, sctp_assoc_t assoc_id, uint16_t cnx_id); struct ngap_gNB_amf_data_s *ngap_gNB_get_AMF_from_instance(ngap_gNB_instance_t *instance_p); diff --git a/openair3/NGAP/ngap_gNB_nas_procedures.c b/openair3/NGAP/ngap_gNB_nas_procedures.c index f9c7041006..690e603042 100644 --- a/openair3/NGAP/ngap_gNB_nas_procedures.c +++ b/openair3/NGAP/ngap_gNB_nas_procedures.c @@ -292,9 +292,7 @@ int ngap_gNB_handle_nas_first_req(instance_t instance, ngap_nas_first_req_t *UEf } //------------------------------------------------------------------------------ -int ngap_gNB_handle_nas_downlink(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu) +int ngap_gNB_handle_nas_downlink(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) //------------------------------------------------------------------------------ { diff --git a/openair3/NGAP/ngap_gNB_nas_procedures.h b/openair3/NGAP/ngap_gNB_nas_procedures.h index e7552cd47e..da55a349ed 100644 --- a/openair3/NGAP/ngap_gNB_nas_procedures.h +++ b/openair3/NGAP/ngap_gNB_nas_procedures.h @@ -31,10 +31,7 @@ #ifndef NGAP_GNB_NAS_PROCEDURES_H_ #define NGAP_GNB_NAS_PROCEDURES_H_ -int ngap_gNB_handle_nas_downlink( - uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu); +int ngap_gNB_handle_nas_downlink(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu); int ngap_gNB_nas_uplink(instance_t instance, ngap_uplink_nas_t *ngap_uplink_nas_p); diff --git a/openair3/NGAP/ngap_gNB_overload.c b/openair3/NGAP/ngap_gNB_overload.c index 318a2124bd..d8512c0695 100644 --- a/openair3/NGAP/ngap_gNB_overload.c +++ b/openair3/NGAP/ngap_gNB_overload.c @@ -45,17 +45,13 @@ #include "assertions.h" -int ngap_gNB_handle_overload_start(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu) +int ngap_gNB_handle_overload_start(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) { //TODO return 0; } -int ngap_gNB_handle_overload_stop(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu) +int ngap_gNB_handle_overload_stop(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) { /* We received Overload stop message, meaning that the AMF is no more * overloaded. This is an empty message, with only message header and no diff --git a/openair3/NGAP/ngap_gNB_overload.h b/openair3/NGAP/ngap_gNB_overload.h index 0b7ab52c26..b893194a4b 100644 --- a/openair3/NGAP/ngap_gNB_overload.h +++ b/openair3/NGAP/ngap_gNB_overload.h @@ -36,9 +36,7 @@ // int ngap_gNB_handle_overload_start(gNB_amf_desc_t *gNB_desc_p, // sctp_queue_item_t *packet_p, // struct ngap_message_s *message_p); -int ngap_gNB_handle_overload_start(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu); +int ngap_gNB_handle_overload_start(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu); /** * \brief Handle an overload stop message @@ -46,8 +44,6 @@ int ngap_gNB_handle_overload_start(uint32_t assoc_id, // int ngap_gNB_handle_overload_stop(gNB_amf_desc_t *gNB_desc_p, // sctp_queue_item_t *packet_p, // struct ngap_message_s *message_p); -int ngap_gNB_handle_overload_stop(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu); +int ngap_gNB_handle_overload_stop(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu); #endif /* NGAP_GNB_OVERLOAD_H_ */ diff --git a/openair3/NGAP/ngap_gNB_trace.c b/openair3/NGAP/ngap_gNB_trace.c index f3e216988c..8fc0968ccd 100644 --- a/openair3/NGAP/ngap_gNB_trace.c +++ b/openair3/NGAP/ngap_gNB_trace.c @@ -45,18 +45,13 @@ #include "ngap_gNB_itti_messaging.h" #include "ngap_gNB_management_procedures.h" - -int ngap_gNB_handle_trace_start(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu) +int ngap_gNB_handle_trace_start(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu) { //TODO return 0; } -int ngap_gNB_handle_deactivate_trace(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *message_p) +int ngap_gNB_handle_deactivate_trace(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *message_p) { // NGAP_DeactivateTraceIEs_t *deactivate_trace_p; // diff --git a/openair3/NGAP/ngap_gNB_trace.h b/openair3/NGAP/ngap_gNB_trace.h index 70863e3737..b35354a16f 100644 --- a/openair3/NGAP/ngap_gNB_trace.h +++ b/openair3/NGAP/ngap_gNB_trace.h @@ -30,12 +30,8 @@ #ifndef NGAP_GNB_TRACE_H_ #define NGAP_GNB_TRACE_H_ -int ngap_gNB_handle_trace_start(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu); +int ngap_gNB_handle_trace_start(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu); -int ngap_gNB_handle_deactivate_trace(uint32_t assoc_id, - uint32_t stream, - NGAP_NGAP_PDU_t *pdu); +int ngap_gNB_handle_deactivate_trace(sctp_assoc_t assoc_id, uint32_t stream, NGAP_NGAP_PDU_t *pdu); #endif /* NGAP_GNB_TRACE_H_ */ diff --git a/openair3/S1AP/s1ap_common.h b/openair3/S1AP/s1ap_common.h index 65baea44c6..a452d284e5 100644 --- a/openair3/S1AP/s1ap_common.h +++ b/openair3/S1AP/s1ap_common.h @@ -28,6 +28,8 @@ #include "common/utils/LOG/log.h" #include "oai_asn1.h" +#include "netinet/in.h" +#include "netinet/sctp.h" #include "S1AP_ProtocolIE-Field.h" #include "S1AP_S1AP-PDU.h" @@ -85,11 +87,7 @@ extern int asn1_xer_print; } while(0) /** \brief Function callback prototype. **/ -typedef int (*s1ap_message_decoded_callback)( - uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu -); +typedef int (*s1ap_message_decoded_callback)(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); /** \brief Handle criticality \param criticality Criticality of the IE diff --git a/openair3/S1AP/s1ap_eNB_defs.h b/openair3/S1AP/s1ap_eNB_defs.h index ed0909d66e..89f31f6486 100644 --- a/openair3/S1AP/s1ap_eNB_defs.h +++ b/openair3/S1AP/s1ap_eNB_defs.h @@ -156,7 +156,7 @@ typedef struct s1ap_eNB_mme_data_s { uint16_t cnx_id; /* SCTP association id */ - int32_t assoc_id; + sctp_assoc_t assoc_id; /* This is served PLMN IDs communicated to the MME via an index over the * MCC/MNC array in s1ap_eNB_instance */ diff --git a/openair3/S1AP/s1ap_eNB_handlers.c b/openair3/S1AP/s1ap_eNB_handlers.c index 6bad1ce455..241abc459f 100644 --- a/openair3/S1AP/s1ap_eNB_handlers.c +++ b/openair3/S1AP/s1ap_eNB_handlers.c @@ -50,64 +50,28 @@ #include "assertions.h" #include "conversions.h" -static -int s1ap_eNB_handle_s1_setup_response(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); -static -int s1ap_eNB_handle_s1_setup_failure(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); +static int s1ap_eNB_handle_s1_setup_response(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); +static int s1ap_eNB_handle_s1_setup_failure(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); -static -int s1ap_eNB_handle_error_indication(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); +static int s1ap_eNB_handle_error_indication(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); -static -int s1ap_eNB_handle_initial_context_request(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); +static int s1ap_eNB_handle_initial_context_request(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); -static -int s1ap_eNB_handle_ue_context_release_command(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); +static int s1ap_eNB_handle_ue_context_release_command(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); -static -int s1ap_eNB_handle_e_rab_setup_request(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); +static int s1ap_eNB_handle_e_rab_setup_request(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); -static -int s1ap_eNB_handle_paging(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); +static int s1ap_eNB_handle_paging(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); -static -int s1ap_eNB_handle_e_rab_modify_request(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); +static int s1ap_eNB_handle_e_rab_modify_request(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); -static -int s1ap_eNB_handle_e_rab_release_command(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); +static int s1ap_eNB_handle_e_rab_release_command(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); -static -int s1ap_eNB_handle_s1_path_switch_request_ack(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); +static int s1ap_eNB_handle_s1_path_switch_request_ack(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); -static -int s1ap_eNB_handle_s1_path_switch_request_failure(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); +static int s1ap_eNB_handle_s1_path_switch_request_failure(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); -static -int s1ap_eNB_handle_s1_ENDC_e_rab_modification_confirm(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); +static int s1ap_eNB_handle_s1_ENDC_e_rab_modification_confirm(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); static int s1ap_eNB_snd_s1_setup_request( s1ap_eNB_instance_t *instance_p, @@ -228,8 +192,8 @@ void s1ap_handle_s1_setup_message(s1ap_eNB_mme_data_t *mme_desc_p, int sctp_shut } } -int s1ap_eNB_handle_message(uint32_t assoc_id, int32_t stream, - const uint8_t *const data, const uint32_t data_length) { +int s1ap_eNB_handle_message(sctp_assoc_t assoc_id, int32_t stream, const uint8_t *const data, const uint32_t data_length) +{ S1AP_S1AP_PDU_t pdu; int ret; DevAssert(data != NULL); @@ -268,10 +232,8 @@ int s1ap_eNB_handle_message(uint32_t assoc_id, int32_t stream, return ret; } -static -int s1ap_eNB_handle_s1_setup_failure(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu) { +static int s1ap_eNB_handle_s1_setup_failure(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu) +{ S1AP_S1SetupFailure_t *container; S1AP_S1SetupFailureIEs_t *ie; s1ap_eNB_mme_data_t *mme_desc_p; @@ -361,10 +323,8 @@ int s1ap_eNB_handle_s1_setup_failure(uint32_t assoc_id, return 0; } -static -int s1ap_eNB_handle_s1_setup_response(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu) { +static int s1ap_eNB_handle_s1_setup_response(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu) +{ S1AP_S1SetupResponse_t *container; S1AP_S1SetupResponseIEs_t *ie; s1ap_eNB_mme_data_t *mme_desc_p; @@ -478,11 +438,8 @@ int s1ap_eNB_handle_s1_setup_response(uint32_t assoc_id, return 0; } - -static -int s1ap_eNB_handle_error_indication(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu) { +static int s1ap_eNB_handle_error_indication(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu) +{ S1AP_ErrorIndication_t *container; S1AP_ErrorIndicationIEs_t *ie; s1ap_eNB_mme_data_t *mme_desc_p; @@ -817,11 +774,8 @@ int s1ap_eNB_handle_error_indication(uint32_t assoc_id, return 0; } - -static -int s1ap_eNB_handle_initial_context_request(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu) { +static int s1ap_eNB_handle_initial_context_request(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu) +{ int i; s1ap_eNB_mme_data_t *mme_desc_p = NULL; s1ap_eNB_ue_context_t *ue_desc_p = NULL; @@ -987,11 +941,8 @@ int s1ap_eNB_handle_initial_context_request(uint32_t assoc_id, return 0; } - -static -int s1ap_eNB_handle_ue_context_release_command(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu) { +static int s1ap_eNB_handle_ue_context_release_command(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu) +{ s1ap_eNB_mme_data_t *mme_desc_p = NULL; s1ap_eNB_ue_context_t *ue_desc_p = NULL; MessageDef *message_p = NULL; @@ -1078,13 +1029,10 @@ int s1ap_eNB_handle_ue_context_release_command(uint32_t assoc_id, S1AP_ERROR( "Mandatory Element Nothing : UEContextReleaseCommand(UE_S1AP_IDs)\n" ); return -1; } - } -static -int s1ap_eNB_handle_e_rab_setup_request(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu) { +static int s1ap_eNB_handle_e_rab_setup_request(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu) +{ int i; S1AP_MME_UE_S1AP_ID_t mme_ue_s1ap_id; S1AP_ENB_UE_S1AP_ID_t enb_ue_s1ap_id; @@ -1204,10 +1152,8 @@ int s1ap_eNB_handle_e_rab_setup_request(uint32_t assoc_id, return 0; } -static -int s1ap_eNB_handle_paging(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu) { +static int s1ap_eNB_handle_paging(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu) +{ s1ap_eNB_mme_data_t *mme_desc_p = NULL; s1ap_eNB_instance_t *s1ap_eNB_instance = NULL; MessageDef *message_p = NULL; @@ -1374,10 +1320,8 @@ int s1ap_eNB_handle_paging(uint32_t assoc_id, return 0; } -static -int s1ap_eNB_handle_e_rab_modify_request(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu) { +static int s1ap_eNB_handle_e_rab_modify_request(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu) +{ int i, nb_of_e_rabs_failed; s1ap_eNB_mme_data_t *mme_desc_p = NULL; s1ap_eNB_ue_context_t *ue_desc_p = NULL; @@ -1510,10 +1454,8 @@ int s1ap_eNB_handle_e_rab_modify_request(uint32_t assoc_id, return 0; } // handle e-rab release command and send it to rrc_end -static -int s1ap_eNB_handle_e_rab_release_command(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu) { +static int s1ap_eNB_handle_e_rab_release_command(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu) +{ int i; s1ap_eNB_mme_data_t *mme_desc_p = NULL; s1ap_eNB_ue_context_t *ue_desc_p = NULL; @@ -1614,10 +1556,8 @@ int s1ap_eNB_handle_e_rab_release_command(uint32_t assoc_id, return 0; } -static -int s1ap_eNB_handle_s1_path_switch_request_ack(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu) { +static int s1ap_eNB_handle_s1_path_switch_request_ack(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu) +{ s1ap_eNB_mme_data_t *mme_desc_p = NULL; s1ap_eNB_ue_context_t *ue_desc_p = NULL; MessageDef *message_p = NULL; @@ -1776,10 +1716,8 @@ int s1ap_eNB_handle_s1_path_switch_request_ack(uint32_t assoc_id, return 0; } -static -int s1ap_eNB_handle_s1_path_switch_request_failure(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu) { +static int s1ap_eNB_handle_s1_path_switch_request_failure(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu) +{ s1ap_eNB_mme_data_t *mme_desc_p = NULL; S1AP_PathSwitchRequestFailure_t *pathSwitchRequestFailure; S1AP_PathSwitchRequestFailureIEs_t *ie; @@ -1843,12 +1781,9 @@ int s1ap_eNB_handle_s1_path_switch_request_failure(uint32_t assoc_ return 0; } -static -int s1ap_eNB_handle_s1_ENDC_e_rab_modification_confirm(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu){ - - LOG_I(S1AP, "Received S1AP E-RAB Modification confirm message \n"); +static int s1ap_eNB_handle_s1_ENDC_e_rab_modification_confirm(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu) +{ + LOG_I(S1AP, "Received S1AP E-RAB Modification confirm message \n"); return 0; } diff --git a/openair3/S1AP/s1ap_eNB_handlers.h b/openair3/S1AP/s1ap_eNB_handlers.h index d0e93faa4d..ea9873679d 100644 --- a/openair3/S1AP/s1ap_eNB_handlers.h +++ b/openair3/S1AP/s1ap_eNB_handlers.h @@ -24,7 +24,6 @@ void s1ap_handle_s1_setup_message(s1ap_eNB_mme_data_t *mme_desc_p, int sctp_shutdown); -int s1ap_eNB_handle_message(uint32_t assoc_id, int32_t stream, - const uint8_t * const data, const uint32_t data_length); +int s1ap_eNB_handle_message(sctp_assoc_t assoc_id, int32_t stream, const uint8_t *const data, const uint32_t data_length); #endif /* S1AP_ENB_HANDLERS_H_ */ diff --git a/openair3/S1AP/s1ap_eNB_itti_messaging.c b/openair3/S1AP/s1ap_eNB_itti_messaging.c index 8a6539a118..ffaed8d5fb 100644 --- a/openair3/S1AP/s1ap_eNB_itti_messaging.c +++ b/openair3/S1AP/s1ap_eNB_itti_messaging.c @@ -23,8 +23,11 @@ #include "s1ap_eNB_itti_messaging.h" -void s1ap_eNB_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer, - uint32_t buffer_length, uint16_t stream) +void s1ap_eNB_itti_send_sctp_data_req(instance_t instance, + sctp_assoc_t assoc_id, + uint8_t *buffer, + uint32_t buffer_length, + uint16_t stream) { MessageDef *message_p; sctp_data_req_t *sctp_data_req; @@ -63,7 +66,7 @@ void s1ap_eNB_itti_send_nas_downlink_ind(instance_t instance, itti_send_msg_to_task(TASK_RRC_ENB, instance, message_p); } -void s1ap_eNB_itti_send_sctp_close_association(instance_t instance, int32_t assoc_id) +void s1ap_eNB_itti_send_sctp_close_association(instance_t instance, sctp_assoc_t assoc_id) { MessageDef *message_p = NULL; sctp_close_association_t *sctp_close_association_p = NULL; diff --git a/openair3/S1AP/s1ap_eNB_itti_messaging.h b/openair3/S1AP/s1ap_eNB_itti_messaging.h index cd6b3cebcc..ac4ad8ffae 100644 --- a/openair3/S1AP/s1ap_eNB_itti_messaging.h +++ b/openair3/S1AP/s1ap_eNB_itti_messaging.h @@ -22,8 +22,14 @@ #ifndef S1AP_ENB_ITTI_MESSAGING_H_ #define S1AP_ENB_ITTI_MESSAGING_H_ -void s1ap_eNB_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer, - uint32_t buffer_length, uint16_t stream); +#include +#include + +void s1ap_eNB_itti_send_sctp_data_req(instance_t instance, + sctp_assoc_t assoc_id, + uint8_t *buffer, + uint32_t buffer_length, + uint16_t stream); void s1ap_eNB_itti_send_nas_downlink_ind(instance_t instance, uint16_t ue_initial_id, @@ -31,8 +37,6 @@ void s1ap_eNB_itti_send_nas_downlink_ind(instance_t instance, uint8_t *nas_pdu, uint32_t nas_pdu_length); -void s1ap_eNB_itti_send_sctp_close_association(instance_t instance, - int32_t assoc_id); - +void s1ap_eNB_itti_send_sctp_close_association(instance_t instance, sctp_assoc_t assoc_id); #endif /* S1AP_ENB_ITTI_MESSAGING_H_ */ diff --git a/openair3/S1AP/s1ap_eNB_management_procedures.c b/openair3/S1AP/s1ap_eNB_management_procedures.c index a870e975a2..e9effa7824 100644 --- a/openair3/S1AP/s1ap_eNB_management_procedures.c +++ b/openair3/S1AP/s1ap_eNB_management_procedures.c @@ -89,9 +89,7 @@ void s1ap_eNB_insert_new_instance(s1ap_eNB_instance_t *new_instance_p) new_instance_p, s1ap_eNB_entries); } -struct s1ap_eNB_mme_data_s *s1ap_eNB_get_MME( - s1ap_eNB_instance_t *instance_p, - int32_t assoc_id, uint16_t cnx_id) +struct s1ap_eNB_mme_data_s *s1ap_eNB_get_MME(s1ap_eNB_instance_t *instance_p, sctp_assoc_t assoc_id, uint16_t cnx_id) { struct s1ap_eNB_mme_data_s temp; struct s1ap_eNB_mme_data_s *found; diff --git a/openair3/S1AP/s1ap_eNB_management_procedures.h b/openair3/S1AP/s1ap_eNB_management_procedures.h index 83df7f8919..4ec8fba2f4 100644 --- a/openair3/S1AP/s1ap_eNB_management_procedures.h +++ b/openair3/S1AP/s1ap_eNB_management_procedures.h @@ -22,9 +22,7 @@ #ifndef S1AP_ENB_MANAGEMENT_PROCEDURES_H_ #define S1AP_ENB_MANAGEMENT_PROCEDURES_H_ -struct s1ap_eNB_mme_data_s *s1ap_eNB_get_MME( - s1ap_eNB_instance_t *instance_p, - int32_t assoc_id, uint16_t cnx_id); +struct s1ap_eNB_mme_data_s *s1ap_eNB_get_MME(s1ap_eNB_instance_t *instance_p, sctp_assoc_t assoc_id, uint16_t cnx_id); struct s1ap_eNB_mme_data_s *s1ap_eNB_get_MME_from_instance(s1ap_eNB_instance_t *instance_p); diff --git a/openair3/S1AP/s1ap_eNB_nas_procedures.c b/openair3/S1AP/s1ap_eNB_nas_procedures.c index d1eefc8b21..c8c844ac56 100644 --- a/openair3/S1AP/s1ap_eNB_nas_procedures.c +++ b/openair3/S1AP/s1ap_eNB_nas_procedures.c @@ -316,9 +316,7 @@ int s1ap_eNB_handle_nas_first_req( } //------------------------------------------------------------------------------ -int s1ap_eNB_handle_nas_downlink(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu) +int s1ap_eNB_handle_nas_downlink(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu) //------------------------------------------------------------------------------ { s1ap_eNB_mme_data_t *mme_desc_p = NULL; diff --git a/openair3/S1AP/s1ap_eNB_nas_procedures.h b/openair3/S1AP/s1ap_eNB_nas_procedures.h index 47f71cc795..35eaa94f89 100644 --- a/openair3/S1AP/s1ap_eNB_nas_procedures.h +++ b/openair3/S1AP/s1ap_eNB_nas_procedures.h @@ -22,10 +22,7 @@ #ifndef S1AP_ENB_NAS_PROCEDURES_H_ #define S1AP_ENB_NAS_PROCEDURES_H_ -int s1ap_eNB_handle_nas_downlink( - uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); +int s1ap_eNB_handle_nas_downlink(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); int s1ap_eNB_nas_uplink(instance_t instance, s1ap_uplink_nas_t *s1ap_uplink_nas_p); diff --git a/openair3/S1AP/s1ap_eNB_overload.c b/openair3/S1AP/s1ap_eNB_overload.c index 4266a7090c..15092c19f8 100644 --- a/openair3/S1AP/s1ap_eNB_overload.c +++ b/openair3/S1AP/s1ap_eNB_overload.c @@ -43,9 +43,7 @@ #include "assertions.h" -int s1ap_eNB_handle_overload_start(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu) +int s1ap_eNB_handle_overload_start(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu) { s1ap_eNB_mme_data_t *mme_desc_p; S1AP_OverloadStart_t *container; @@ -88,9 +86,7 @@ int s1ap_eNB_handle_overload_start(uint32_t assoc_id, return 0; } -int s1ap_eNB_handle_overload_stop(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu) +int s1ap_eNB_handle_overload_stop(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu) { /* We received Overload stop message, meaning that the MME is no more * overloaded. This is an empty message, with only message header and no diff --git a/openair3/S1AP/s1ap_eNB_overload.h b/openair3/S1AP/s1ap_eNB_overload.h index 8133345dee..bf6f95ac9d 100644 --- a/openair3/S1AP/s1ap_eNB_overload.h +++ b/openair3/S1AP/s1ap_eNB_overload.h @@ -28,9 +28,7 @@ // int s1ap_eNB_handle_overload_start(eNB_mme_desc_t *eNB_desc_p, // sctp_queue_item_t *packet_p, // struct s1ap_message_s *message_p); -int s1ap_eNB_handle_overload_start(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); +int s1ap_eNB_handle_overload_start(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); /** * \brief Handle an overload stop message @@ -38,8 +36,6 @@ int s1ap_eNB_handle_overload_start(uint32_t assoc_id, // int s1ap_eNB_handle_overload_stop(eNB_mme_desc_t *eNB_desc_p, // sctp_queue_item_t *packet_p, // struct s1ap_message_s *message_p); -int s1ap_eNB_handle_overload_stop(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); +int s1ap_eNB_handle_overload_stop(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); #endif /* S1AP_ENB_OVERLOAD_H_ */ diff --git a/openair3/S1AP/s1ap_eNB_trace.c b/openair3/S1AP/s1ap_eNB_trace.c index 38787a6999..1eb7abe704 100644 --- a/openair3/S1AP/s1ap_eNB_trace.c +++ b/openair3/S1AP/s1ap_eNB_trace.c @@ -101,9 +101,7 @@ void s1ap_eNB_generate_trace_failure(struct s1ap_eNB_ue_context_s *ue_desc_p, length, ue_desc_p->tx_stream); } -int s1ap_eNB_handle_trace_start(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu) +int s1ap_eNB_handle_trace_start(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu) { S1AP_TraceStart_t *container; S1AP_TraceStartIEs_t *ie; @@ -142,9 +140,7 @@ int s1ap_eNB_handle_trace_start(uint32_t assoc_id, return 0; } -int s1ap_eNB_handle_deactivate_trace(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *message_p) +int s1ap_eNB_handle_deactivate_trace(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *message_p) { // S1AP_DeactivateTraceIEs_t *deactivate_trace_p; // diff --git a/openair3/S1AP/s1ap_eNB_trace.h b/openair3/S1AP/s1ap_eNB_trace.h index 75f7a59dc4..b933221098 100644 --- a/openair3/S1AP/s1ap_eNB_trace.h +++ b/openair3/S1AP/s1ap_eNB_trace.h @@ -32,15 +32,11 @@ // int s1ap_eNB_handle_trace_start(eNB_mme_desc_t *eNB_desc_p, // sctp_queue_item_t *packet_p, // struct s1ap_message_s *message_p); -int s1ap_eNB_handle_trace_start(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); +int s1ap_eNB_handle_trace_start(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); // int s1ap_eNB_handle_deactivate_trace(eNB_mme_desc_t *eNB_desc_p, // sctp_queue_item_t *packet_p, // struct s1ap_message_s *message_p); -int s1ap_eNB_handle_deactivate_trace(uint32_t assoc_id, - uint32_t stream, - S1AP_S1AP_PDU_t *pdu); +int s1ap_eNB_handle_deactivate_trace(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu); #endif /* S1AP_ENB_TRACE_H_ */ diff --git a/openair3/SCTP/sctp_eNB_defs.h b/openair3/SCTP/sctp_eNB_defs.h index 9d3b4119b5..6f4551cd83 100644 --- a/openair3/SCTP/sctp_eNB_defs.h +++ b/openair3/SCTP/sctp_eNB_defs.h @@ -19,11 +19,13 @@ * contact@openairinterface.org */ -#include "queue.h" - #ifndef SCTP_ENB_DEFS_H_ #define SCTP_ENB_DEFS_H_ +#include "queue.h" +#include +#include + typedef struct sctp_queue_item_s { /* Pair of stream on which we received this packet */ uint16_t local_stream; @@ -32,7 +34,7 @@ typedef struct sctp_queue_item_s { uint16_t remote_port; /* Remote address */ uint32_t remote_addr; - uint32_t assoc_id; + sctp_assoc_t assoc_id; /* PPID used for the packet */ uint32_t ppid; @@ -52,7 +54,7 @@ typedef struct { /* Unique SCTP association ID (Local to host), used to distinguish * associations between MME and eNB. */ - int32_t assoc_id; + sctp_assoc_t assoc_id; /* Current remote port used for transmission */ uint16_t remote_port; diff --git a/openair3/SCTP/sctp_eNB_itti_messaging.c b/openair3/SCTP/sctp_eNB_itti_messaging.c index c31d4ba9ed..40472ed923 100644 --- a/openair3/SCTP/sctp_eNB_itti_messaging.c +++ b/openair3/SCTP/sctp_eNB_itti_messaging.c @@ -38,9 +38,12 @@ int sctp_itti_send_init_msg_multi_cnf(task_id_t task_id, instance_t instance, in return itti_send_msg_to_task(task_id, instance, message_p); } -int sctp_itti_send_new_message_ind(task_id_t task_id, instance_t instance, - uint32_t assoc_id, uint8_t *buffer, - uint32_t buffer_length, uint16_t stream) +int sctp_itti_send_new_message_ind(task_id_t task_id, + instance_t instance, + sctp_assoc_t assoc_id, + uint8_t *buffer, + uint32_t buffer_length, + uint16_t stream) { MessageDef *message_p; sctp_data_ind_t *sctp_data_ind_p; @@ -61,10 +64,13 @@ int sctp_itti_send_new_message_ind(task_id_t task_id, instance_t instance, return itti_send_msg_to_task(task_id, instance, message_p); } -int sctp_itti_send_association_resp(task_id_t task_id, instance_t instance, - int32_t assoc_id, - uint16_t cnx_id, enum sctp_state_e state, - uint16_t out_streams, uint16_t in_streams) +int sctp_itti_send_association_resp(task_id_t task_id, + instance_t instance, + sctp_assoc_t assoc_id, + uint16_t cnx_id, + enum sctp_state_e state, + uint16_t out_streams, + uint16_t in_streams) { MessageDef *message_p; sctp_new_association_resp_t *sctp_new_association_resp_p; @@ -82,9 +88,12 @@ int sctp_itti_send_association_resp(task_id_t task_id, instance_t instance, return itti_send_msg_to_task(task_id, instance, message_p); } -int sctp_itti_send_association_ind(task_id_t task_id, instance_t instance, - int32_t assoc_id, uint16_t port, - uint16_t out_streams, uint16_t in_streams) +int sctp_itti_send_association_ind(task_id_t task_id, + instance_t instance, + sctp_assoc_t assoc_id, + uint16_t port, + uint16_t out_streams, + uint16_t in_streams) { MessageDef *message_p; sctp_new_association_ind_t *sctp_new_association_ind_p; diff --git a/openair3/SCTP/sctp_eNB_itti_messaging.h b/openair3/SCTP/sctp_eNB_itti_messaging.h index a35dc2219a..a91e95493c 100644 --- a/openair3/SCTP/sctp_eNB_itti_messaging.h +++ b/openair3/SCTP/sctp_eNB_itti_messaging.h @@ -24,18 +24,26 @@ int sctp_itti_send_init_msg_multi_cnf(task_id_t task_id, instance_t instance, int multi_sd); -int sctp_itti_send_new_message_ind(task_id_t task_id, instance_t instance, - uint32_t assoc_id, uint8_t *buffer, - uint32_t buffer_length, uint16_t stream); +int sctp_itti_send_new_message_ind(task_id_t task_id, + instance_t instance, + sctp_assoc_t assoc_id, + uint8_t *buffer, + uint32_t buffer_length, + uint16_t stream); -int sctp_itti_send_association_resp(task_id_t task_id, instance_t instance, - int32_t assoc_id, - uint16_t cnx_id, enum sctp_state_e state, - uint16_t out_streams, uint16_t in_streams); - -int sctp_itti_send_association_ind(task_id_t task_id, instance_t instance, - int32_t assoc_id, uint16_t port, - uint16_t out_streams, uint16_t in_streams); +int sctp_itti_send_association_resp(task_id_t task_id, + instance_t instance, + sctp_assoc_t assoc_id, + uint16_t cnx_id, + enum sctp_state_e state, + uint16_t out_streams, + uint16_t in_streams); +int sctp_itti_send_association_ind(task_id_t task_id, + instance_t instance, + sctp_assoc_t assoc_id, + uint16_t port, + uint16_t out_streams, + uint16_t in_streams); #endif /* SCTP_ITTI_MESSAGING_H_ */ diff --git a/openair3/SCTP/sctp_eNB_task.c b/openair3/SCTP/sctp_eNB_task.c index 35a2692bd4..6701521b8c 100644 --- a/openair3/SCTP/sctp_eNB_task.c +++ b/openair3/SCTP/sctp_eNB_task.c @@ -77,7 +77,7 @@ typedef struct sctp_cnx_list_elm_s { uint16_t in_streams; ///< Number of input streams negociated for this connection uint16_t out_streams; ///< Number of output streams negotiated for this connection uint16_t ppid; ///< Payload protocol Identifier - int32_t assoc_id; ///< SCTP association id for the connection (note4debug host byte order) + sctp_assoc_t assoc_id; ///< SCTP association id for the connection (note4debug host byte order) uint32_t messages_recv; ///< Number of messages received on this connection uint32_t messages_sent; ///< Number of messages sent on this connection task_id_t task_id; ///< Task id of the task who asked for this connection @@ -93,7 +93,7 @@ static STAILQ_HEAD(sctp_cnx_list_head, sctp_cnx_list_elm_s) sctp_cnx_list; static uint16_t sctp_nb_cnx = 0; //------------------------------------------------------------------------------ -struct sctp_cnx_list_elm_s *sctp_get_cnx(int32_t assoc_id, int sd) +struct sctp_cnx_list_elm_s *sctp_get_cnx(sctp_assoc_t assoc_id, int sd) { struct sctp_cnx_list_elm_s *elm; @@ -225,7 +225,7 @@ sctp_handle_new_association_req_multi( int ns; int sd; - int32_t assoc_id = 0; + sctp_assoc_t assoc_id = 0; struct sctp_cnx_list_elm_s *sctp_cnx = NULL; enum sctp_connection_type_e connection_type = SCTP_TYPE_CLIENT; @@ -362,7 +362,7 @@ sctp_handle_new_association_req( const sctp_new_association_req_t * const sctp_new_association_req_p) { int sd = 0; - int32_t assoc_id = 0; + sctp_assoc_t assoc_id = 0; struct sctp_event_subscribe events={0};