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

itti dynamic queue creation, and 64 bits instance id

Browse Source
This commit is contained in:
Laurent
2020-12-23 13:56:01 +01:00
parent d23a7e83f6
commit 42a110338c
183 changed files with 718 additions and 12086 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/M2AP/m2ap_MCE.c
+21 -21
View File
@@ -105,7 +105,7 @@ void m2ap_MCE_handle_sctp_association_resp(instance_t instance, sctp_new_associa
DevAssert(sctp_new_association_resp != NULL);
if (sctp_new_association_resp->sctp_state != SCTP_STATE_ESTABLISHED) {
LOG_W(M2AP, "Received unsuccessful result for SCTP association (%u), instance %d, cnx_id %u\n",
LOG_W(M2AP, "Received unsuccessful result for SCTP association (%u), instance %ld, cnx_id %u\n",
sctp_new_association_resp->sctp_state,
instance,
sctp_new_association_resp->ulp_cnx_id);
@@ -233,7 +233,7 @@ int m2ap_MCE_init_sctp (m2ap_MCE_instance_t *instance_p,
sctp_init_t *sctp_init = NULL;
DevAssert(instance_p != NULL);
DevAssert(local_ip_addr != NULL);
message = itti_alloc_new_message (TASK_M2AP_MCE, SCTP_INIT_MSG_MULTI_REQ);
message = itti_alloc_new_message (TASK_M2AP_MCE, 0, SCTP_INIT_MSG_MULTI_REQ);
sctp_init = &message->ittiMsg.sctp_init_multi;
sctp_init->port = mce_port_for_M2C;
sctp_init->ppid = M2AP_SCTP_PPID;
@@ -267,7 +267,7 @@ static void m2ap_MCE_register_MCE(m2ap_MCE_instance_t *instance_p,
m2ap_MCE_data_t *m2ap_mce_data = NULL;
DevAssert(instance_p != NULL);
DevAssert(target_MCE_ip_address != NULL);
message = itti_alloc_new_message(TASK_M2AP_MCE, SCTP_NEW_ASSOCIATION_REQ_MULTI);
message = itti_alloc_new_message(TASK_M2AP_MCE, 0, SCTP_NEW_ASSOCIATION_REQ_MULTI);
sctp_new_association_req = &message->ittiMsg.sctp_new_association_req_multi;
sctp_new_association_req->port = mce_port_for_M2C;
sctp_new_association_req->ppid = M2AP_SCTP_PPID;
@@ -312,7 +312,7 @@ void m2ap_MCE_handle_register_MCE(instance_t instance,
DevCheck(new_instance->tac == m2ap_register_MCE->tac, new_instance->tac, m2ap_register_MCE->tac, 0);
DevCheck(new_instance->mcc == m2ap_register_MCE->mcc, new_instance->mcc, m2ap_register_MCE->mcc, 0);
DevCheck(new_instance->mnc == m2ap_register_MCE->mnc, new_instance->mnc, m2ap_register_MCE->mnc, 0);
M2AP_WARN("MCE[%d] already registered\n", instance);
M2AP_WARN("MCE[%ld] already registered\n", instance);
} else {
new_instance = calloc(1, sizeof(m2ap_MCE_instance_t));
DevAssert(new_instance != NULL);
@@ -356,7 +356,7 @@ void m2ap_MCE_handle_register_MCE(instance_t instance,
new_instance->mce_port_for_M2C = m2ap_register_MCE->mce_port_for_M2C;
/* Add the new instance to the list of MCE (meaningfull in virtual mode) */
m2ap_MCE_insert_new_instance(new_instance);
M2AP_INFO("Registered new MCE[%d] and %s MCE id %u\n",
M2AP_INFO("Registered new MCE[%ld] and %s MCE id %u\n",
instance,
m2ap_register_MCE->cell_type == CELL_MACRO_ENB ? "macro" : "home",
m2ap_register_MCE->MCE_id);
@@ -367,7 +367,7 @@ void m2ap_MCE_handle_register_MCE(instance_t instance,
return;
}
M2AP_INFO("MCE[%d] MCE id %u acting as a listner (server)\n",
M2AP_INFO("MCE[%ld] MCE id %u acting as a listner (server)\n",
instance, m2ap_register_MCE->MCE_id);
}
}
@@ -394,7 +394,7 @@ void m2ap_MCE_handle_sctp_init_msg_multi_cnf(
/* Trying to connect to the provided list of MCE ip address */
for (index = 0; index < instance->nb_m2; index++) {
M2AP_INFO("MCE[%d] MCE id %u acting as an initiator (client)\n",
M2AP_INFO("MCE[%ld] MCE id %u acting as an initiator (client)\n",
instance_id, instance->MCE_id);
m2ap_MCE_register_MCE(instance,
&instance->target_mce_m2_ip_address[index],
@@ -507,7 +507,7 @@ void MCE_task_send_sctp_init_req(instance_t enb_id, m2ap_mce_sctp_req_t * m2ap_m
LOG_I(M2AP, "M2AP_SCTP_REQ(create socket)\n");
MessageDef *message_p = NULL;
message_p = itti_alloc_new_message (TASK_M2AP_MCE, SCTP_INIT_MSG);
message_p = itti_alloc_new_message (TASK_M2AP_MCE, 0, SCTP_INIT_MSG);
// if( m2ap_mce_sctp_req == NULL ){
// message_p->ittiMsg.sctp_init.port = M2AP_PORT_NUMBER;
@@ -558,7 +558,7 @@ void *m2ap_MCE_task(void *arg) {
switch (ITTI_MSG_ID(received_msg)) {
case MESSAGE_TEST:
LOG_W(M2AP,"MCE Received MESSAGE_TEST Message\n");
//MessageDef * message_p = itti_alloc_new_message(TASK_M2AP_MCE, MESSAGE_TEST);
//MessageDef * message_p = itti_alloc_new_message(TASK_M2AP_MCE, 0, MESSAGE_TEST);
//itti_send_msg_to_task(TASK_M3AP, 1/*ctxt_pP->module_id*/, message_p);
break;
case TERMINATE_MESSAGE:
@@ -567,29 +567,29 @@ void *m2ap_MCE_task(void *arg) {
break;
case M2AP_MCE_SCTP_REQ:
MCE_task_send_sctp_init_req(ITTI_MESSAGE_GET_INSTANCE(received_msg),
MCE_task_send_sctp_init_req(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
&M2AP_MCE_SCTP_REQ(received_msg));
break;
case M2AP_SUBFRAME_PROCESS:
m2ap_check_timers(ITTI_MESSAGE_GET_INSTANCE(received_msg));
m2ap_check_timers(ITTI_MSG_DESTINATION_INSTANCE(received_msg));
break;
case M2AP_REGISTER_MCE_REQ:
LOG_I(M2AP,"MCE Received M2AP_REGISTER_MCE_REQ Message\n");
m2ap_MCE_handle_register_MCE(ITTI_MESSAGE_GET_INSTANCE(received_msg),
m2ap_MCE_handle_register_MCE(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
&M2AP_REGISTER_MCE_REQ(received_msg));
break;
case M2AP_SETUP_RESP:
LOG_I(M2AP,"MCE Received M2AP_SETUP_RESP Message\n");
MCE_send_M2_SETUP_RESPONSE(ITTI_MESSAGE_GET_INSTANCE(received_msg),
MCE_send_M2_SETUP_RESPONSE(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
&M2AP_SETUP_RESP(received_msg));
break;
case M2AP_SETUP_FAILURE:
LOG_I(M2AP,"MCE Received M2AP_SETUP_FAILURE Message\n");
MCE_send_M2_SETUP_FAILURE(ITTI_MESSAGE_GET_INSTANCE(received_msg),
MCE_send_M2_SETUP_FAILURE(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
&M2AP_SETUP_FAILURE(received_msg));
break;
@@ -644,41 +644,41 @@ void *m2ap_MCE_task(void *arg) {
// case M2AP_HANDOVER_REQ:
// m2ap_MCE_handle_handover_req(ITTI_MESSAGE_GET_INSTANCE(received_msg),
// m2ap_MCE_handle_handover_req(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
// &M2AP_HANDOVER_REQ(received_msg));
// break;
//
// case M2AP_HANDOVER_REQ_ACK:
// m2ap_MCE_handle_handover_req_ack(ITTI_MESSAGE_GET_INSTANCE(received_msg),
// m2ap_MCE_handle_handover_req_ack(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
// &M2AP_HANDOVER_REQ_ACK(received_msg));
// break;
//
// case M2AP_UE_CONTEXT_RELEASE:
// m2ap_MCE_ue_context_release(ITTI_MESSAGE_GET_INSTANCE(received_msg),
// m2ap_MCE_ue_context_release(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
// &M2AP_UE_CONTEXT_RELEASE(received_msg));
// break;
//
case SCTP_INIT_MSG_MULTI_CNF:
LOG_D(M2AP,"MCE Received SCTP_INIT_MSG_MULTI_CNF Message\n");
m2ap_MCE_handle_sctp_init_msg_multi_cnf(ITTI_MESSAGE_GET_INSTANCE(received_msg),
m2ap_MCE_handle_sctp_init_msg_multi_cnf(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
&received_msg->ittiMsg.sctp_init_msg_multi_cnf);
break;
case SCTP_NEW_ASSOCIATION_RESP:
LOG_D(M2AP,"MCE Received SCTP_NEW_ASSOCIATION_RESP Message\n");
m2ap_MCE_handle_sctp_association_resp(ITTI_MESSAGE_GET_INSTANCE(received_msg),
m2ap_MCE_handle_sctp_association_resp(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
&received_msg->ittiMsg.sctp_new_association_resp);
break;
case SCTP_NEW_ASSOCIATION_IND:
LOG_D(M2AP,"MCE Received SCTP_NEW_ASSOCIATION Message\n");
m2ap_MCE_handle_sctp_association_ind(ITTI_MESSAGE_GET_INSTANCE(received_msg),
m2ap_MCE_handle_sctp_association_ind(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
&received_msg->ittiMsg.sctp_new_association_ind);
break;
case SCTP_DATA_IND:
LOG_D(M2AP,"MCE Received SCTP_DATA_IND Message\n");
m2ap_MCE_handle_sctp_data_ind(ITTI_MESSAGE_GET_INSTANCE(received_msg),
m2ap_MCE_handle_sctp_data_ind(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
&received_msg->ittiMsg.sctp_data_ind);
break;