From f4633ba26059e90e98426715176cdee219e65968 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 14 Sep 2018 17:15:55 +0200 Subject: [PATCH] Correctly add headers for RRC message transfer, remove warnings --- openair2/F1AP/f1ap_cu_rrc_message_transfer.c | 24 +++++++++++++------- openair2/F1AP/f1ap_cu_rrc_message_transfer.h | 17 ++++++++++---- openair2/F1AP/f1ap_du_rrc_message_transfer.c | 15 +++++++++--- openair2/F1AP/f1ap_du_rrc_message_transfer.h | 17 +++++++++++++- 4 files changed, 57 insertions(+), 16 deletions(-) diff --git a/openair2/F1AP/f1ap_cu_rrc_message_transfer.c b/openair2/F1AP/f1ap_cu_rrc_message_transfer.c index fb59a57901..52a6a63320 100644 --- a/openair2/F1AP/f1ap_cu_rrc_message_transfer.c +++ b/openair2/F1AP/f1ap_cu_rrc_message_transfer.c @@ -31,6 +31,9 @@ */ #include "f1ap_common.h" +#include "f1ap_encoder.h" +#include "f1ap_decoder.h" +#include "f1ap_itti_messaging.h" #include "f1ap_cu_rrc_message_transfer.h" // undefine C_RNTI from // openair1/PHY/LTE_TRANSPORT/transport_common.h which @@ -42,7 +45,8 @@ Initial UL RRC Message Transfer */ -int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(int32_t assoc_id, +int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(instance_t instance, + uint32_t assoc_id, uint32_t stream, F1AP_F1AP_PDU_t *pdu) { @@ -54,13 +58,10 @@ int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(int32_t assoc_id, F1AP_InitialULRRCMessageTransfer_t *container; F1AP_InitialULRRCMessageTransferIEs_t *ie; - SRB_INFO* Srb_info; - protocol_ctxt_t ctxt; rnti_t rnti; uint8_t *ccch_sdu; sdu_size_t ccch_sdu_len; int CC_id =0; - int instance=0; uint64_t du_ue_f1ap_id; DevAssert(pdu != NULL); @@ -82,7 +83,6 @@ int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(int32_t assoc_id, /* NRCGI */ F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_InitialULRRCMessageTransferIEs_t, ie, container, F1AP_ProtocolIE_ID_id_NRCGI, true); - instance = 0; ///ie->value.choice. ?? //@Todo /* RNTI */ F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_InitialULRRCMessageTransferIEs_t, ie, container, @@ -140,6 +140,8 @@ int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(int32_t assoc_id, */ // if size > 0 // CU_send_DL_RRC_MESSAGE_TRANSFER(C.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Tx_buffer.Payload, RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Tx_buffer.payload_size) + + return 0; } @@ -148,7 +150,7 @@ int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(int32_t assoc_id, */ //void CU_send_DL_RRC_MESSAGE_TRANSFER(F1AP_DLRRCMessageTransfer_t *DLRRCMessageTransfer) { -void CU_send_DL_RRC_MESSAGE_TRANSFER(void) { +int CU_send_DL_RRC_MESSAGE_TRANSFER(instance_t instance) { F1AP_F1AP_PDU_t pdu; F1AP_DLRRCMessageTransfer_t *out; F1AP_DLRRCMessageTransferIEs_t *ie; @@ -244,6 +246,7 @@ void CU_send_DL_RRC_MESSAGE_TRANSFER(void) { /* encode */ if (f1ap_encode_pdu(&pdu, &buffer, &len) < 0) { printf("Failed to encode F1 setup request\n"); + return -1; } printf("\n"); @@ -251,14 +254,19 @@ void CU_send_DL_RRC_MESSAGE_TRANSFER(void) { /* decode */ if (f1ap_decode_pdu(&pdu, buffer, len) > 0) { printf("Failed to decode F1 setup request\n"); + return -1; } - //AssertFatal(1==0,"Not implemented yet\n"); + + return 0; } /* UL RRC Message Transfer */ -void CU_handle_UL_RRC_MESSAGE_TRANSFER(F1AP_ULRRCMessageTransfer_t *ULRRCMessageTransfer) { +int CU_handle_UL_RRC_MESSAGE_TRANSFER(instance_t instance, + uint32_t assoc_id, + uint32_t stream, + F1AP_F1AP_PDU_t *pdu) { AssertFatal(1==0,"Not implemented yet\n"); } diff --git a/openair2/F1AP/f1ap_cu_rrc_message_transfer.h b/openair2/F1AP/f1ap_cu_rrc_message_transfer.h index 77fd25da29..952297b0dd 100644 --- a/openair2/F1AP/f1ap_cu_rrc_message_transfer.h +++ b/openair2/F1AP/f1ap_cu_rrc_message_transfer.h @@ -33,7 +33,16 @@ #ifndef F1AP_CU_RRC_MESSAGE_TRANSFER_H_ #define F1AP_CU_RRC_MESSAGE_TRANSFER_H_ -int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(int32_t assoc_id, - uint32_t stream, - F1AP_F1AP_PDU_t *pdu); -#endif /* F1AP_CU_RRC_MESSAGE_TRANSFER_H_ */ \ No newline at end of file +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_send_DL_RRC_MESSAGE_TRANSFER(instance_t instance); + +int CU_handle_UL_RRC_MESSAGE_TRANSFER(instance_t instance, + uint32_t assoc_id, + uint32_t stream, + F1AP_F1AP_PDU_t *pdu); + +#endif /* F1AP_CU_RRC_MESSAGE_TRANSFER_H_ */ diff --git a/openair2/F1AP/f1ap_du_rrc_message_transfer.c b/openair2/F1AP/f1ap_du_rrc_message_transfer.c index ffa698e646..fef7fac097 100644 --- a/openair2/F1AP/f1ap_du_rrc_message_transfer.c +++ b/openair2/F1AP/f1ap_du_rrc_message_transfer.c @@ -33,6 +33,7 @@ #include "f1ap_common.h" #include "f1ap_encoder.h" #include "f1ap_decoder.h" +#include "f1ap_itti_messaging.h" #include "f1ap_du_rrc_message_transfer.h" // undefine C_RNTI from // openair1/PHY/LTE_TRANSPORT/transport_common.h which @@ -43,12 +44,15 @@ extern f1ap_setup_req_t *f1ap_du_data; /* DL RRC Message Transfer */ -void DU_handle_DL_RRC_MESSAGE_TRANSFER(F1AP_DLRRCMessageTransfer_t *DLRRCMessageTransfer) { +int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance, + uint32_t assoc_id, + uint32_t stream, + F1AP_F1AP_PDU_t *pdu) { AssertFatal(1==0,"Not implemented yet\n"); } //void DU_send_UL_RRC_MESSAGE_TRANSFER(F1AP_ULRRCMessageTransfer_t *ULRRCMessageTransfer) { -void DU_send_UL_RRC_MESSAGE_TRANSFER(void) { +int DU_send_UL_RRC_MESSAGE_TRANSFER(void) { F1AP_F1AP_PDU_t pdu; F1AP_ULRRCMessageTransfer_t *out; F1AP_ULRRCMessageTransferIEs_t *ie; @@ -107,6 +111,7 @@ void DU_send_UL_RRC_MESSAGE_TRANSFER(void) { /* encode */ if (f1ap_encode_pdu(&pdu, &buffer, &len) < 0) { printf("Failed to encode F1 setup request\n"); + return -1; } printf("\n"); @@ -117,10 +122,12 @@ void DU_send_UL_RRC_MESSAGE_TRANSFER(void) { // printf("Failed to decode F1 setup request\n"); // } //AssertFatal(1==0,"Not implemented yet\n"); + + return 0; } /* UL RRC Message Transfer */ -void DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER( +int DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER( module_id_t module_idP, int CC_idP, int UE_id, @@ -204,11 +211,13 @@ void DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER( /* encode */ if (f1ap_encode_pdu(&pdu, &buffer, &len) < 0) { printf("Failed to encode F1 setup request\n"); + return -1; } printf("\n"); du_f1ap_itti_send_sctp_data_req(0, f1ap_du_data->assoc_id, buffer, len, 0); + return 0; /* decode */ // if (f1ap_decode_pdu(&pdu, buffer, len) > 0) { // printf("Failed to decode F1 setup request\n"); diff --git a/openair2/F1AP/f1ap_du_rrc_message_transfer.h b/openair2/F1AP/f1ap_du_rrc_message_transfer.h index 24a48fdcdd..a841d7a7ba 100644 --- a/openair2/F1AP/f1ap_du_rrc_message_transfer.h +++ b/openair2/F1AP/f1ap_du_rrc_message_transfer.h @@ -34,4 +34,19 @@ #ifndef F1AP_DU_RRC_MESSAGE_TRANSFER_H_ #define F1AP_DU_RRC_MESSAGE_TRANSFER_H_ -#endif /* F1AP_DU_RRC_MESSAGE_TRANSFER_H_ */ \ No newline at end of file +int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance, + uint32_t assoc_id, + uint32_t stream, + F1AP_F1AP_PDU_t *pdu); + +int DU_send_UL_RRC_MESSAGE_TRANSFER(void); + +int DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER( + module_id_t module_idP, + int CC_idP, + int UE_id, + rnti_t rntiP, + uint8_t *sduP, + sdu_size_t sdu_lenP); + +#endif /* F1AP_DU_RRC_MESSAGE_TRANSFER_H_ */