From f30e4818ae1f3d07c2cb2618dbd5b1ced64392ee Mon Sep 17 00:00:00 2001 From: Lionel Gauthier Date: Thu, 6 Nov 2014 11:34:54 +0000 Subject: [PATCH] git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5996 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c | 8 ++------ openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c | 5 ++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c b/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c index ab2c3be188..90743c8918 100644 --- a/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c +++ b/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c @@ -521,12 +521,8 @@ nwGtpv1uProcessGpdu( NwGtpv1uStackT *thiz, */ if(NW_GTPV1U_OK == rc) { NwGtpv1uMsgT *pMsg = (NwGtpv1uMsgT *) hMsg; - GTPU_DEBUG("Received T-PDU over tunnel end-point '%x' of size %u (decapsulated %u)from "NW_IPV4_ADDR"\n", - ntohl(msgHdr->teid), gpduLen, pMsg->msgLen, NW_IPV4_ADDR_FORMAT((peerIp))); - - AssertFatal(gpduLen == (pMsg->msgLen + pMsg->msgBufOffset), - "Mismatch gpduLen %u / buffer offset %u / msg len %u / buffer len %u", - gpduLen, pMsg->msgBufOffset, pMsg->msgLen, pMsg->msgBufLen); + GTPU_DEBUG("Received T-PDU over tunnel end-point '%x' of size %u (%u) (decapsulated %u)from "NW_IPV4_ADDR"\n", + ntohl(msgHdr->teid), gpduLen, pMsg->msgLen, pMsg->msgBufLen, NW_IPV4_ADDR_FORMAT((peerIp))); rc = nwGtpSessionSendMsgApiToUlpEntity(pTunnelEndPoint, pMsg); } diff --git a/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c b/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c index c076221d14..dd08249a9b 100644 --- a/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c +++ b/openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c @@ -271,7 +271,10 @@ nwGtpv1uMsgFromBufferNew( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle, pMsg->nextExtHdrType = *(pBuf++); } pMsg->msgBufOffset = (NwU32T)(pBuf - pMsg->msgBuf); - pMsg->msgLen = bufLen - pMsg->msgBufOffset; + pMsg->msgBufLen = bufLen - pMsg->msgBufOffset; + pMsg->msgLen = bufLen; + GTPU_DEBUG("nwGtpv1uMsgFromBufferNew() msgLen %u msgBufLen %u msgBufOffset %u ", + pMsg->msgLen, pMsg->msgBufLen, pMsg->msgBufOffset); *phMsg = (NwGtpv1uMsgHandleT) pMsg; return NW_GTPV1U_OK; }