From 1c9ff497bcd3d3b6337e66453653dd71b674e7b9 Mon Sep 17 00:00:00 2001
From: Navid Nikaein <navid.nikaein@eurecom.fr>
Date: Thu, 28 May 2015 16:24:45 +0000
Subject: [PATCH] add MAC UL PDUs to the wireshark
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7493 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c | 4 ++--
openair2/UTIL/OPT/probe.c | 13 +++++--------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
index 0a2ec290d72..03c3bb82e81 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
@@ -98,9 +98,9 @@ void rx_sdu(
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RX_SDU,1);
if (opt_enabled == 1) {
- trace_pdu(0, sduP,sdu_lenP, 0, 2, rntiP,frameP, 0,0);
+ trace_pdu(0, sduP,sdu_lenP, 0, 3, rntiP,subframeP, 0,0);
LOG_D(OPT,"[eNB %d][ULSCH] Frame %d rnti %x with size %d\n",
- enb_mod_idP, frameP, rntiP, rx_lengths[ii]);
+ enb_mod_idP, frameP, rntiP, sdu_lenP);
}
LOG_D(MAC,"[eNB %d] CC_id %d Received ULSCH sdu from PHY (rnti %x, UE_id %d), parsing header\n",enb_mod_idP,CC_idP,rntiP,UE_id);
diff --git a/openair2/UTIL/OPT/probe.c b/openair2/UTIL/OPT/probe.c
index f2db12b4f48..fc9bfc5bf58 100644
--- a/openair2/UTIL/OPT/probe.c
+++ b/openair2/UTIL/OPT/probe.c
@@ -313,6 +313,9 @@ static void SendFrame(guint8 radioType, guint8 direction, guint8 rntiType,
memcpy(g_frameBuffer+g_frameOffset, &tmp16, 2);
g_frameOffset += 2;
+ g_frameBuffer[g_frameOffset++] = MAC_LTE_CRC_STATUS_TAG;
+ g_frameBuffer[g_frameOffset++] = crcStatus;
+
#ifdef WIRESHARK_DEV
g_frameOffset += 2;
tmp16 = htons(subframeNumber); // subframe
@@ -332,9 +335,6 @@ static void SendFrame(guint8 radioType, guint8 direction, guint8 rntiType,
g_frameBuffer[g_frameOffset++] = retx;
}
- g_frameBuffer[g_frameOffset++] = MAC_LTE_CRC_STATUS_TAG;
- g_frameBuffer[g_frameOffset++] = crcStatus;
-
#ifdef WIRESHARK_DEV
/* Relating to out-of-band events */
@@ -366,13 +366,10 @@ static void SendFrame(guint8 radioType, guint8 direction, guint8 rntiType,
}
#endif
-
- g_frameBuffer[g_frameOffset++] = MAC_LTE_PAYLOAD_TAG;
/***************************************/
/* Now write the MAC PDU */
-
-
-
+ g_frameBuffer[g_frameOffset++] = MAC_LTE_PAYLOAD_TAG;
+
/* Append actual PDU */
//memcpy(g_frameBuffer+g_frameOffset, g_PDUBuffer, g_PDUOffset);
//g_frameOffset += g_PDUOffset;
--
GitLab