Commit 77b529c3 authored by Anurag Asokan's avatar Anurag Asokan

Final working changes

parent c6107fd0
......@@ -338,6 +338,7 @@ void *rrc_enb_process_msg(void *);
TASK_DEF(TASK_VNG, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_VTP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_DRB, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_DRB_ACP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_VT_TIMER, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_ENB_APP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_GNB_APP, TASK_PRIORITY_MED, 200, NULL, NULL) \
......
......@@ -86,6 +86,10 @@ int create_tasks(uint32_t enb_nb) {
rc = itti_create_task(TASK_SS_DRB, ss_eNB_drb_task, NULL);
AssertFatal(rc >= 0, "Create task for SS DRB failed\n");
rc = itti_create_task(TASK_SS_DRB_ACP, ss_eNB_drb_acp_task, NULL);
AssertFatal(rc >= 0, "Create task for SS DRB ACP failed\n");
/* Task for support Virtual Time for TTCN engine */
rc = itti_create_task(TASK_VTP, ss_eNB_vtp_task, NULL);
AssertFatal(rc >= 0, "Create task for SS VTP failed\n");
......
......@@ -195,6 +195,7 @@ static void ss_task_handle_drb_pdu_req(struct DRB_COMMON_REQ *req,int cell_index
LOG_A(ENB_APP, "Send res: %d", send_res);
}
}
#if 0
SS_DRB_PDU_REQ(message_p).rnti = SS_context.SSCell_list[cell_index].ss_rnti_g;
int send_res = itti_send_msg_to_task(TASK_RRC_ENB, instance_g, message_p);
......@@ -202,8 +203,8 @@ static void ss_task_handle_drb_pdu_req(struct DRB_COMMON_REQ *req,int cell_index
{
LOG_A(ENB_APP, "[SS_DRB] Error in itti_send_msg_to_task");
}
LOG_A(ENB_APP, "Send res: %d", send_res);
#endif
}
......@@ -213,6 +214,7 @@ ss_eNB_read_from_drb_socket(acpCtx_t ctx){
size_t msgSize = size; //2
int cell_index;
LOG_A(ENB_SS, "Entry in fxn:%s\n", __FUNCTION__);
while (1)
{
int userId = acpRecvMsg(ctx, &msgSize, buffer);
......@@ -234,10 +236,10 @@ ss_eNB_read_from_drb_socket(acpCtx_t ctx){
acpGetMsgSidlStatus(msgSize, buffer, &sidlStatus);
}
else if (userId == -ACP_PEER_DISCONNECTED){
LOG_A(GNB_APP, "[SS_SRB] Peer ordered shutdown\n");
LOG_A(GNB_APP, "[SS_DRB] Peer ordered shutdown\n");
}
else if (userId == -ACP_PEER_CONNECTED){
LOG_A(GNB_APP, "[SS_SRB] Peer connection established\n");
LOG_A(GNB_APP, "[SS_DRB] Peer connection established\n");
}
else
{
......@@ -277,6 +279,7 @@ ss_eNB_read_from_drb_socket(acpCtx_t ctx){
}
acpDrbProcessFromSSFreeSrv(req);
LOG_A(ENB_SS, "Exit from fxn:%s at line:%d \n", __FUNCTION__, __LINE__);
return;
}
else if (MSG_DrbProcessToSS_userId == userId)
......@@ -286,18 +289,20 @@ ss_eNB_read_from_drb_socket(acpCtx_t ctx){
}
}
LOG_A(ENB_SS, "Exit from fxn:%s at line:%d \n", __FUNCTION__, __LINE__);
}
void *ss_eNB_drb_process_itti_msg(void *notUsed)
{
MessageDef *received_msg = NULL;
int result = 0;
itti_receive_msg(TASK_SS_DRB, &received_msg);
/* Check if there is a packet to handle */
if (received_msg != NULL)
{
switch (ITTI_MSG_ID(received_msg))
{
case SS_DRB_PDU_IND:
......@@ -343,8 +348,11 @@ void *ss_eNB_drb_process_itti_msg(void *notUsed)
break;
}
}
else
{
}
ss_eNB_read_from_drb_socket(ctx_drb_g);
// ss_eNB_read_from_drb_socket(ctx_drb_g);
return NULL;
......@@ -392,13 +400,22 @@ void ss_eNB_drb_init(void)
void *ss_eNB_drb_task(void *arg)
{
ss_eNB_drb_init();
while (1)
{
(void)ss_eNB_drb_process_itti_msg(NULL);
}
acpFree(buffer);
return NULL;
}
void *ss_eNB_drb_acp_task(void *arg)
{
ss_eNB_drb_init();
while (1)
{
ss_eNB_read_from_drb_socket(ctx_drb_g);
}
//acpFree(buffer);
return NULL;
}
......
......@@ -4,6 +4,7 @@
void ss_eNB_drb_init(void);
void *ss_eNB_drb_process_itti_msg(void *);
void *ss_eNB_drb_task(void *arg);
void *ss_eNB_drb_acp_task(void *arg);
#endif /* SS_ENB_DRB_TASK_H_ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment