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

openair-cn/GTPV1-U/gtpv1u_eNB.c

@@ -200,6 +200,7 @@ NwGtpv1uRcT gtpv1u_eNB_send_udp_msg(
     message_p = itti_alloc_new_message(TASK_GTPV1_U, UDP_DATA_REQ);
 
     if (message_p) {
+        LOG_D(GTPU, "Sending UDP_DATA_REQ length %u offset %u", buffer_len, buffer_offset);
         udp_data_req_p = &message_p->ittiMsg.udp_data_req;
         udp_data_req_p->peer_address  = peerIpAddr;
         udp_data_req_p->peer_port     = peerPort;

openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c

@@ -231,7 +231,7 @@ nwGtpv1uCreateAndSendMsg( NwGtpv1uStackT *thiz, NwU32T peerIp, NwU16T peerPort,
 
     rc = thiz->udp.udpDataReqCallback(thiz->udp.hUdp,
                                       pMsg->msgBuf,
-                                      pMsg->msgLen,
+                                      pMsg->msgBufLen,
                                       pMsg->msgBufOffset,
                                       peerIp,
                                       peerPort);

openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c

@@ -143,6 +143,9 @@ nwGtpv1uGpduMsgNew( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
         pMsg->msgBuf       = tpdu;
         pMsg->msgBufLen    = tpduLength + msgExtraLen + NW_GTPV1U_EPC_MIN_HEADER_SIZE;
         pMsg->msgBufOffset = tpduOffset - (msgExtraLen + NW_GTPV1U_EPC_MIN_HEADER_SIZE);
+        LOG_E(GTPU, "MSG length %u, offset %u -> length %u offset %u\n",
+                tpduLength, tpduOffset,
+                pMsg->msgBufLen, pMsg->msgBufOffset);
 
         // Version field: This field is used to determine the version of the GTP-U protocol.
         // The version number shall be set to '1'.
@@ -178,11 +181,11 @@ nwGtpv1uGpduMsgNew( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
         // mandatory part of the GTP header (that is the first 8 octets).
         // The Sequence Number, the N-PDU Number or any Extension headers shall be considered to be part of the payload,
         // i.e. included in the length count.
-        header_len          = ((pMsg->seqNumFlag || pMsg->npduNumFlag || pMsg->extHdrFlag ) ?
-                                NW_GTPV1U_EPC_SPECIFIC_HEADER_SIZE : NW_GTPV1U_EPC_MIN_HEADER_SIZE);
-        pMsg->msgLen        = ((pMsg->seqNumFlag || pMsg->npduNumFlag
-                                || pMsg->extHdrFlag ) ?
-                                (NW_GTPV1U_EPC_SPECIFIC_HEADER_SIZE - NW_GTPV1U_EPC_MIN_HEADER_SIZE) + tpduLength : tpduLength);
+        //header_len          = ((pMsg->seqNumFlag || pMsg->npduNumFlag || pMsg->extHdrFlag ) ?
+        //                        NW_GTPV1U_EPC_SPECIFIC_HEADER_SIZE : NW_GTPV1U_EPC_MIN_HEADER_SIZE);
+        //pMsg->msgLen        = ((pMsg->seqNumFlag || pMsg->npduNumFlag
+        //                        || pMsg->extHdrFlag ) ?
+        //                        (NW_GTPV1U_EPC_SPECIFIC_HEADER_SIZE - NW_GTPV1U_EPC_MIN_HEADER_SIZE) + tpduLength : tpduLength);
 
         // Tunnel Endpoint Identifier (TEID): This field unambiguously identifies a tunnel endpoint in the receiving
         // GTP-U protocol entity. The receiving end side of a GTP tunnel locally assigns the TEID value the transmitting