maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add itti_receive_msg at CU and DU

Browse Source
This commit is contained in:
Bing-Kai Hong
2018-09-07 14:13:56 +02:00
parent c4370d9df0
commit 17cc510a3c
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/F1AP/CU_F1AP.c
+1
View File
@@ -134,6 +134,7 @@ void *F1AP_CU_task(void *arg) {
itti_mark_task_ready(TASK_CU_F1); itti_mark_task_ready(TASK_CU_F1);
while (1) { while (1) {
itti_receive_msg(TASK_CU_F1, &received_msg);
switch (ITTI_MSG_ID(received_msg)) { switch (ITTI_MSG_ID(received_msg)) {
case F1AP_CU_SCTP_REQ: case F1AP_CU_SCTP_REQ:
openair2/F1AP/DU_F1AP.c
+2
View File
@@ -117,6 +117,8 @@ void *F1AP_DU_task(void *arg) {
// SCTP // SCTP
while (1) { while (1) {
itti_receive_msg(TASK_DU_F1, &received_msg);
switch (ITTI_MSG_ID(received_msg)) { switch (ITTI_MSG_ID(received_msg)) {
// case TERMINATE_MESSAGE: // case TERMINATE_MESSAGE:
openair2/F1AP/f1ap_handlers.c
+4 -4
View File
@@ -54,7 +54,7 @@ int f1ap_handle_f1_setup_request(uint32_t assoc_id,
/* Handlers matrix. Only f1 related procedure present here */ /* Handlers matrix. Only f1 related procedure present here */
f1ap_message_decoded_callback messages_callback[][3] = { f1ap_message_decoded_callback f1ap_messages_callback[][3] = {
{ 0, 0, 0 }, /* Reset */ { 0, 0, 0 }, /* Reset */
@@ -110,7 +110,7 @@ int f1ap_handle_message(uint32_t assoc_id, int32_t stream,
} }
/* Checking procedure Code and direction of message */ /* Checking procedure Code and direction of message */
if (pdu.choice.initiatingMessage->procedureCode > sizeof(messages_callback) / (3 * sizeof( if (pdu.choice.initiatingMessage->procedureCode > sizeof(f1ap_messages_callback) / (3 * sizeof(
f1ap_message_decoded_callback)) f1ap_message_decoded_callback))
|| (pdu.present > F1AP_F1AP_PDU_PR_unsuccessfulOutcome)) { || (pdu.present > F1AP_F1AP_PDU_PR_unsuccessfulOutcome)) {
//F1AP_ERROR("[SCTP %d] Either procedureCode %ld or direction %d exceed expected\n", //F1AP_ERROR("[SCTP %d] Either procedureCode %ld or direction %d exceed expected\n",
@@ -124,7 +124,7 @@ int f1ap_handle_message(uint32_t assoc_id, int32_t stream,
/* No handler present. /* No handler present.
* This can mean not implemented or no procedure for eNB (wrong direction). * This can mean not implemented or no procedure for eNB (wrong direction).
*/ */
if (messages_callback[pdu.choice.initiatingMessage->procedureCode][pdu.present - 1] == NULL) { if (f1ap_messages_callback[pdu.choice.initiatingMessage->procedureCode][pdu.present - 1] == NULL) {
// F1AP_ERROR("[SCTP %d] No handler for procedureCode %ld in %s\n", // F1AP_ERROR("[SCTP %d] No handler for procedureCode %ld in %s\n",
// assoc_id, pdu.choice.initiatingMessage->procedureCode, // assoc_id, pdu.choice.initiatingMessage->procedureCode,
// f1ap_direction2String(pdu.present - 1)); // f1ap_direction2String(pdu.present - 1));
@@ -136,7 +136,7 @@ int f1ap_handle_message(uint32_t assoc_id, int32_t stream,
} }
/* Calling the right handler */ /* Calling the right handler */
ret = (*messages_callback[pdu.choice.initiatingMessage->procedureCode][pdu.present - 1]) ret = (*f1ap_messages_callback[pdu.choice.initiatingMessage->procedureCode][pdu.present - 1])
(assoc_id, stream, &pdu); (assoc_id, stream, &pdu);
ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_F1AP_F1AP_PDU, &pdu); ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_F1AP_F1AP_PDU, &pdu);
return ret; return ret;