sync ENB source code (debug session on PDCP GTP UDP)

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5965 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair-cn/GTPV1-U/gtpv1u_eNB.c

@@ -858,7 +858,8 @@ void *gtpv1u_eNB_task(void *args)
                                       udp_data_ind_p->buffer_length,
                                       udp_data_ind_p->peer_port,
                                       udp_data_ind_p->peer_address);
-                free(udp_data_ind_p->buffer);
+                itti_free(ITTI_MSG_ORIGIN_ID(received_message_p), udp_data_ind_p->buffer);
+                udp_data_ind_p->buffer = NULL;
             }
             break;
 
@@ -914,7 +915,8 @@ void *gtpv1u_eNB_task(void *args)
                     }
                 }
                 /* Buffer is no longer needed, free it */
-                free(data_req_p->buffer);
+                itti_free(ITTI_MSG_ORIGIN_ID(received_message_p), data_req_p->buffer);
+                data_req_p->buffer = NULL;
             }
             break;
 

openair-cn/GTPV1-U/gtpv1u_task.c

@@ -387,7 +387,8 @@ static void *gtpv1u_thread(void *args)
                                       udp_data_ind_p->buffer_length,
                                       udp_data_ind_p->peer_port,
                                       udp_data_ind_p->peer_address);
-                free(udp_data_ind_p->buffer);
+                itti_free(ITTI_MSG_ORIGIN_ID(received_message_p), udp_data_ind_p->buffer);
+                udp_data_ind_p->buffer = NULL;
             }
             break;
 
@@ -453,7 +454,8 @@ static void *gtpv1u_thread(void *args)
                     }
                 }
                 /* Buffer is no longer needed, free it */
-                free(data_req_p->buffer);
+                itti_free(ITTI_MSG_ORIGIN_ID(received_message_p), data_req_p->buffer);
+                data_req_p->buffer = NULL;
             }
             break;
             case TERMINATE_MESSAGE: {

openair-cn/SGI/sgi_egress.c

@@ -40,6 +40,7 @@
 
 #include "sgi.h"
 #include "intertask_interface.h"
+#include "assertions.h"
 
 #include <netinet/ip6.h>
 #include <netinet/ip.h>
@@ -187,7 +188,7 @@ void sgi_process_raw_packet(sgi_data_t *sgi_data_pP, unsigned char* data_pP, int
         SGI_IF_ERROR("%s OUT OF MEMORY DROP EGRESS PACKET\n", __FUNCTION__);
         return;
     }
-    message_payload_p = malloc(packet_sizeP);
+    message_payload_p = itti_malloc(TASK_FW_IP, TASK_GTPV1_U, packet_sizeP);
     if (message_payload_p == NULL) {
         SGI_IF_ERROR("%s OUT OF MEMORY DROP EGRESS PACKET\n", __FUNCTION__);
         return;
@@ -201,7 +202,7 @@ void sgi_process_raw_packet(sgi_data_t *sgi_data_pP, unsigned char* data_pP, int
     gtpv1u_tunnel_data_req_p->local_S1u_teid = addr_mapping_p->sgw_S1U_teid;
     gtpv1u_tunnel_data_req_p->length       = packet_sizeP;
     gtpv1u_tunnel_data_req_p->buffer       = message_payload_p;
-    SGI_IF_DEBUG("%s send GTPV1U_TUNNEL_DATA_REQ to GTPV1U S1u_enb_teid %u local_S1u_teid %u size %u\n", __FUNCTION__, gtpv1u_tunnel_data_req_p->S1u_enb_teid, gtpv1u_tunnel_data_req_p->local_S1u_teid, packet_sizeP);
+    SGI_IF_DEBUG("%s ETHER send GTPV1U_TUNNEL_DATA_REQ to GTPV1U S1u_enb_teid %u local_S1u_teid %u size %u\n", __FUNCTION__, gtpv1u_tunnel_data_req_p->S1u_enb_teid, gtpv1u_tunnel_data_req_p->local_S1u_teid, packet_sizeP);
 
     itti_send_msg_to_task(TASK_GTPV1_U, INSTANCE_DEFAULT, message_p);
 
@@ -319,7 +320,8 @@ void sgi_process_raw_packet(sgi_data_t *sgi_data_pP, unsigned char* data_pP, int
         SGI_IF_ERROR("%s OUT OF MEMORY DROP EGRESS PACKET\n", __FUNCTION__);
         return;
     }
-    message_payload_p = malloc(packet_sizeP - sizeof(sgi_data_pP->eh));
+    AssertFatal((packet_sizeP - sizeof(sgi_data_pP->eh)) > 20, "BAD IP PACKET SIZE");
+    message_payload_p = itti_malloc(TASK_FW_IP, TASK_GTPV1_U, packet_sizeP - sizeof(sgi_data_pP->eh));
     if (message_payload_p == NULL) {
         SGI_IF_ERROR("%s OUT OF MEMORY DROP EGRESS PACKET\n", __FUNCTION__);
         return;
@@ -331,9 +333,13 @@ void sgi_process_raw_packet(sgi_data_t *sgi_data_pP, unsigned char* data_pP, int
 //#warning forced S1u_enb_teid to 1 for testing, waiting for MODIFY_BEARER REQUEST
 //    gtpv1u_tunnel_data_req_p->S1u_enb_teid   = 1;
     gtpv1u_tunnel_data_req_p->local_S1u_teid = addr_mapping_p->sgw_S1U_teid;
-    gtpv1u_tunnel_data_req_p->length       = packet_sizeP;
+    gtpv1u_tunnel_data_req_p->length       = packet_sizeP - sizeof(sgi_data_pP->eh);
     gtpv1u_tunnel_data_req_p->buffer       = message_payload_p;
-    SGI_IF_DEBUG("%s send GTPV1U_TUNNEL_DATA_REQ to GTPV1U S1u_enb_teid %u local_S1u_teid %u size %u\n", __FUNCTION__, gtpv1u_tunnel_data_req_p->S1u_enb_teid, gtpv1u_tunnel_data_req_p->local_S1u_teid, packet_sizeP);
+    SGI_IF_DEBUG("%s send GTPV1U_TUNNEL_DATA_REQ to GTPV1U S1u_enb_teid %u local_S1u_teid %u size %u\n",
+            __FUNCTION__,
+            gtpv1u_tunnel_data_req_p->S1u_enb_teid,
+            gtpv1u_tunnel_data_req_p->local_S1u_teid,
+            gtpv1u_tunnel_data_req_p->length);
 
     itti_send_msg_to_task(TASK_GTPV1_U, INSTANCE_DEFAULT, message_p);
 

openair-cn/SGI/sgi_socket.c

@@ -835,6 +835,7 @@ void* sgi_sock_raw_fw_2_gtpv1u_thread(void* args_p)
     while (1) {
         num_bytes = recvfrom(sgi_data_p->sd[socket_index], &sgi_data_p->recv_buffer[0][socket_index], SGI_BUFFER_RECV_LEN, 0, NULL, NULL);
         if (num_bytes > 0) {
+            SGI_IF_DEBUG("recvfrom bearer id %d %d bytes\n", socket_index + SGI_MIN_EPS_BEARER_ID, num_bytes);
             sgi_process_raw_packet(sgi_data_p, &sgi_data_p->recv_buffer[0][socket_index], num_bytes);
         } else {
             SGI_IF_DEBUG("recvfrom bearer id %d %d (%s:%d)\n", socket_index + SGI_MIN_EPS_BEARER_ID, num_bytes, strerror(errno), errno);

openair-cn/UDP/udp_eNB_task.c

@@ -247,7 +247,8 @@ void udp_eNB_receiver(struct udp_socket_desc_s *udp_sock_pP)
             LOG_W(UDP_, "Recvfrom returned 0\n");
         	return;
         } else{
-            forwarded_buffer = calloc(n, sizeof(uint8_t));
+            forwarded_buffer = itti_malloc(TASK_UDP, udp_sock_pP->task_id, n*sizeof(uint8_t));
+            DevAssert(forwarded_buffer != NULL);
             memcpy(forwarded_buffer, l_buffer, n);
             message_p = itti_alloc_new_message(TASK_UDP, UDP_DATA_IND);
             DevAssert(message_p != NULL);