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

add MAC UL PDUs to the wireshark

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7493 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Navid Nikaein
2015-05-28 16:24:45 +00:00
parent a6806580b1
commit 1c9ff497bc
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+2 -2
View File
@@ -98,9 +98,9 @@ void rx_sdu(
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RX_SDU,1); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RX_SDU,1);
if (opt_enabled == 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", 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); 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);
openair2/UTIL/OPT/probe.c
+4 -7
View File
@@ -313,6 +313,9 @@ static void SendFrame(guint8 radioType, guint8 direction, guint8 rntiType,
memcpy(g_frameBuffer+g_frameOffset, &tmp16, 2); memcpy(g_frameBuffer+g_frameOffset, &tmp16, 2);
g_frameOffset += 2; g_frameOffset += 2;
g_frameBuffer[g_frameOffset++] = MAC_LTE_CRC_STATUS_TAG;
g_frameBuffer[g_frameOffset++] = crcStatus;
#ifdef WIRESHARK_DEV #ifdef WIRESHARK_DEV
g_frameOffset += 2; g_frameOffset += 2;
tmp16 = htons(subframeNumber); // subframe 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++] = retx;
} }
g_frameBuffer[g_frameOffset++] = MAC_LTE_CRC_STATUS_TAG;
g_frameBuffer[g_frameOffset++] = crcStatus;
#ifdef WIRESHARK_DEV #ifdef WIRESHARK_DEV
/* Relating to out-of-band events */ /* Relating to out-of-band events */
@@ -366,12 +366,9 @@ static void SendFrame(guint8 radioType, guint8 direction, guint8 rntiType,
} }
#endif #endif
g_frameBuffer[g_frameOffset++] = MAC_LTE_PAYLOAD_TAG;
/***************************************/ /***************************************/
/* Now write the MAC PDU */ /* Now write the MAC PDU */
g_frameBuffer[g_frameOffset++] = MAC_LTE_PAYLOAD_TAG;
/* Append actual PDU */ /* Append actual PDU */
//memcpy(g_frameBuffer+g_frameOffset, g_PDUBuffer, g_PDUOffset); //memcpy(g_frameBuffer+g_frameOffset, g_PDUBuffer, g_PDUOffset);