diff --git a/common/utils/msc/msc.c b/common/utils/msc/msc.c index 8ff8846b70de9fc5bbfc999d0df0dfe58ae75a50..4e02cd00d2abe9f765b786231b1d9b3f7f020b83 100644 --- a/common/utils/msc/msc.c +++ b/common/utils/msc/msc.c @@ -333,6 +333,20 @@ int msc_init(const msc_env_t envP, const int max_threadsP) msc_log_declare_proto(i); } break; + case MSC_F1AP_CU: + rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "F1AP_CU"); + if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;} + //if ((envP == MSC_E_UTRAN) || (envP == MSC_MME_GW) || (envP == MSC_MME)) { + msc_log_declare_proto(i); + //} + break; + case MSC_F1AP_DU: + rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "F1AP_DU"); + if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;} + //if ((envP == MSC_E_UTRAN) || (envP == MSC_MME_GW) || (envP == MSC_MME)) { + msc_log_declare_proto(i); + //} + break; default: rv = snprintf(&g_msc_proto2str[i][0], MSC_MAX_PROTO_NAME_LENGTH, "UNKNOWN"); if (rv >= MSC_MAX_PROTO_NAME_LENGTH) {g_msc_proto2str[i][MSC_MAX_PROTO_NAME_LENGTH-1] = 0;} diff --git a/common/utils/msc/msc.h b/common/utils/msc/msc.h index 78eb6cdb080665290f80474328110f79a1d61f28..58a0d2c804d2d938a3055f60f45fee1bad08053a 100644 --- a/common/utils/msc/msc.h +++ b/common/utils/msc/msc.h @@ -62,6 +62,8 @@ typedef enum { MSC_S11_MME, MSC_S6A_MME, MSC_HSS, + MSC_F1AP_CU, + MSC_F1AP_DU, MAX_MSC_PROTOS, } msc_proto_t; diff --git a/openair2/F1AP/f1ap_cu_interface_management.c b/openair2/F1AP/f1ap_cu_interface_management.c index 075bdd6418e37ab535abb02e5c3d61a2b668bcc0..894bc792685ca8f083b1b350a5fab550dbb1517e 100644 --- a/openair2/F1AP/f1ap_cu_interface_management.c +++ b/openair2/F1AP/f1ap_cu_interface_management.c @@ -229,6 +229,16 @@ int CU_handle_F1_SETUP_REQUEST(instance_t instance, // } tdd; // } nr_mode_info[F1AP_MAX_NB_CELLS]; + + MSC_LOG_TX_MESSAGE( + MSC_F1AP_CU, + MSC_RRC_ENB, + 0, + 0, + MSC_AS_TIME_FMT" CU_handle_F1_SETUP_REQUEST", + 0,0//MSC_AS_TIME_ARGS(ctxt_pP), + ); + if (num_cells_available > 0) { itti_send_msg_to_task(TASK_RRC_ENB, ENB_MODULE_ID_TO_INSTANCE(instance), message_p); } else { diff --git a/openair2/F1AP/f1ap_du_interface_management.c b/openair2/F1AP/f1ap_du_interface_management.c index c3f139296d915716a4c3c4ff7d6eedc952c7ca88..c088c72aa9d72ee325f8212bfdda6c0db0a4586c 100644 --- a/openair2/F1AP/f1ap_du_interface_management.c +++ b/openair2/F1AP/f1ap_du_interface_management.c @@ -403,6 +403,15 @@ int DU_send_F1_SETUP_REQUEST(instance_t instance) { return -1; } + MSC_LOG_TX_MESSAGE( + MSC_F1AP_DU, + MSC_F1AP_CU, + (const char *)buffer, + len, + MSC_AS_TIME_FMT" F1_SETUP_REQUEST initiatingMessage gNB_DU_name %s", + 0,0,//MSC_AS_TIME_ARGS(ctxt_pP), + f1ap_du_data->gNB_DU_name); + du_f1ap_itti_send_sctp_data_req(instance, f1ap_du_data->assoc_id, buffer, len, 0); return 0; @@ -518,7 +527,15 @@ int DU_handle_F1_SETUP_RESPONSE(instance_t instance, for (int i=0;i<num_cells_to_activate;i++) AssertFatal(F1AP_SETUP_RESP (msg_p).num_SI[i] > 0, "System Information %d is missing",i); - + MSC_LOG_RX_MESSAGE( + MSC_F1AP_DU, + MSC_F1AP_CU, + 0, + 0, + MSC_AS_TIME_FMT" DU_handle_F1_SETUP_RESPONSE successfulOutcome assoc_id %d", + 0,0,//MSC_AS_TIME_ARGS(ctxt_pP), + assoc_id); + LOG_D(DU_F1AP, "Sending F1AP_SETUP_RESP ITTI message to ENB_APP with assoc_id (%d->%d)\n", assoc_id,ENB_MODULE_ID_TO_INSTANCE(assoc_id)); itti_send_msg_to_task(TASK_ENB_APP, ENB_MODULE_ID_TO_INSTANCE(assoc_id), msg_p);