maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lionel Gauthier
2014-11-06 11:34:54 +00:00
parent 9d2408fe4f
commit f30e4818ae
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1u.c
+2 -6
View File
@@ -521,12 +521,8 @@ nwGtpv1uProcessGpdu( NwGtpv1uStackT *thiz,
*/ */
if(NW_GTPV1U_OK == rc) { if(NW_GTPV1U_OK == rc) {
NwGtpv1uMsgT *pMsg = (NwGtpv1uMsgT *) hMsg; NwGtpv1uMsgT *pMsg = (NwGtpv1uMsgT *) hMsg;
GTPU_DEBUG("Received T-PDU over tunnel end-point '%x' of size %u (decapsulated %u)from "NW_IPV4_ADDR"\n", 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, NW_IPV4_ADDR_FORMAT((peerIp))); ntohl(msgHdr->teid), gpduLen, pMsg->msgLen, pMsg->msgBufLen, 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);
rc = nwGtpSessionSendMsgApiToUlpEntity(pTunnelEndPoint, pMsg); rc = nwGtpSessionSendMsgApiToUlpEntity(pTunnelEndPoint, pMsg);
} }
openair-cn/GTPV1-U/nw-gtpv1u/src/NwGtpv1uMsg.c
+4 -1
View File
@@ -271,7 +271,10 @@ nwGtpv1uMsgFromBufferNew( NW_IN NwGtpv1uStackHandleT hGtpuStackHandle,
pMsg->nextExtHdrType = *(pBuf++); pMsg->nextExtHdrType = *(pBuf++);
} }
pMsg->msgBufOffset = (NwU32T)(pBuf - pMsg->msgBuf); 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; *phMsg = (NwGtpv1uMsgHandleT) pMsg;
return NW_GTPV1U_OK; return NW_GTPV1U_OK;
} }