From 592e7f60f621effceb1023c72f86777e61ee681d Mon Sep 17 00:00:00 2001 From: Lionel Gauthier <lionel.gauthier@eurecom.fr> Date: Wed, 5 Nov 2014 11:00:54 +0000 Subject: [PATCH] git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5972 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- openair2/LAYER2/PDCP_v10.1.0/pdcp.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c index 72a879bba2..03d32ffa15 100755 --- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c +++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c @@ -415,6 +415,7 @@ boolean_t pdcp_data_ind( boolean_t packet_forwarded = FALSE; #if defined(LINK_PDCP_TO_GTPV1U) MessageDef *message_p = NULL; + uint8_t *gtpu_buffer_p = NULL; #endif @@ -692,15 +693,15 @@ boolean_t pdcp_data_ind( #if defined(LINK_PDCP_TO_GTPV1U) if ((TRUE == enb_flagP) && (FALSE == srb_flagP)) { LOG_I(PDCP,"Sending to GTPV1U %d bytes\n", sdu_buffer_sizeP - payload_offset); - gtpu_buffer = itti_malloc(TASK_PDCP_ENB, TASK_GTPV1_U, sdu_buffer_sizeP - payload_offset); - AssertFatal(gtpu_buffer != NULL, "OUT OF MEMORY"); - memcpy(gtpu_buffer, &sdu_buffer_pP->data[payload_offset], sdu_buffer_sizeP - payload_offset); - message_p = itti_alloc_new_message(TASK_PDCP_ENB, GTPV1U_TUNNEL_DATA_REQ); + gtpu_buffer_p = itti_malloc(TASK_PDCP_ENB, TASK_GTPV1_U, sdu_buffer_sizeP - payload_offset); + AssertFatal(gtpu_buffer_p != NULL, "OUT OF MEMORY"); + memcpy(gtpu_buffer_p, &sdu_buffer_pP->data[payload_offset], sdu_buffer_sizeP - payload_offset); + message_p = itti_alloc_new_message(TASK_PDCP_ENB, GTPV1U_ENB_TUNNEL_DATA_REQ); AssertFatal(message_p != NULL, "OUT OF MEMORY"); - GTPV1U_TUNNEL_DATA_REQ(message_p).buffer = gtpu_buffer); - GTPV1U_TUNNEL_DATA_REQ(message_p).length = sdu_buffer_sizeP - payload_offset; - GTPV1U_TUNNEL_DATA_REQ(message_p).ue_module_id = ue_mod_idP; - GTPV1U_TUNNEL_DATA_REQ(message_p).rab_id; = rb_id + 4; + GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).buffer = gtpu_buffer_p; + GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).length = sdu_buffer_sizeP - payload_offset; + GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).ue_index = ue_mod_idP; + GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).rab_id = rb_id + 4; itti_send_msg_to_task(TASK_GTPV1_U, INSTANCE_DEFAULT, message_p); /*gtpv1u_new_data_req( enb_mod_idP, //gtpv1u_data_t *gtpv1u_data_p, -- 2.26.2