- Use correct data pointer during a comparison.

- Add expert info to show when DRX command is received
- Get rid of some tabs

svn path=/trunk/; revision=35568

diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c
index 9c67d26f3770a04044e0adb75b6660f033c050d3..f20d6cda4ade11c67c0ff0bef40d2463d37f3c66 100644 (file)
--- a/epan/dissectors/packet-mac-lte.c
+++ b/epan/dissectors/packet-mac-lte.c
@@ -893,7 +893,7 @@ static gboolean dissect_mac_lte_heur(tvbuff_t *tvb, packet_info *pinfo,
     p_mac_lte_info->rntiType = tvb_get_guint8(tvb, offset++);
 
     /* Initialize RNTI with a default value in case optional field is not present */
-       switch (p_mac_lte_info->rntiType) {
+    switch (p_mac_lte_info->rntiType) {
         case P_RNTI:
             p_mac_lte_info->rnti = 0xFFFE;
             break;
@@ -1642,7 +1642,7 @@ static int DetectIfDLHARQResend(packet_info *pinfo, tvbuff_t *tvb, volatile int
                 /* Compare time, ndi, data to see if this looks like a retx */
                 if ((tvb_length_remaining(tvb, offset) == lastData->length) &&
                     (p_mac_lte_info->detailed_phy_info.dl_info.ndi == lastData->ndi) &&
-                   tvb_memeql(tvb, offset, lastData->data, MIN(lastData->length, MAX_EXPECTED_PDU_LENGTH)) == 0) {
+                    tvb_memeql(tvb, offset, lastData->data, MIN(lastData->length, MAX_EXPECTED_PDU_LENGTH)) == 0) {
 
                     /* Work out gap between frames */
                     gint seconds_between_packets = (gint)
@@ -1683,7 +1683,7 @@ static int DetectIfDLHARQResend(packet_info *pinfo, tvbuff_t *tvb, volatile int
         thisData = &(ueData->harqid[transport_block-1][harq_id]);
         thisData->inUse = TRUE;
         thisData->length = tvb_length_remaining(tvb, offset);
-       tvb_memcpy(tvb, thisData->data, offset, MIN(thisData->length, MAX_EXPECTED_PDU_LENGTH));
+        tvb_memcpy(tvb, thisData->data, offset, MIN(thisData->length, MAX_EXPECTED_PDU_LENGTH));
         thisData->ndi = p_mac_lte_info->detailed_phy_info.dl_info.ndi;
         thisData->framenum = pinfo->fd->num;
         thisData->received_time = pinfo->fd->abs_ts;
@@ -1769,10 +1769,11 @@ static void TrackReportedULHARQResend(packet_info *pinfo, tvbuff_t *tvb, volatil
                 /* Looking for frame previously on this harq-id */
                 lastData = &(ueData->harqid[p_mac_lte_info->detailed_phy_info.ul_info.harq_id]);
                 if (lastData->inUse) {
+
                     /* Compare time, sf, data to see if this looks like a retx */
                     if ((tvb_length_remaining(tvb, offset) == lastData->length) &&
                         (p_mac_lte_info->detailed_phy_info.ul_info.ndi == lastData->ndi) &&
-                       tvb_memeql(tvb, offset, lastData->data, MIN(thisData->length, MAX_EXPECTED_PDU_LENGTH)) == 0) {
+                        tvb_memeql(tvb, offset, lastData->data, MIN(lastData->length, MAX_EXPECTED_PDU_LENGTH)) == 0) {
 
                         /* Work out gap between frames */
                         gint seconds_between_packets = (gint)
@@ -1805,7 +1806,7 @@ static void TrackReportedULHARQResend(packet_info *pinfo, tvbuff_t *tvb, volatil
         thisData = &(ueData->harqid[p_mac_lte_info->detailed_phy_info.ul_info.harq_id]);
         thisData->inUse = TRUE;
         thisData->length = tvb_length_remaining(tvb, offset);
-       tvb_memcpy(tvb, thisData->data, offset, MIN(thisData->length, MAX_EXPECTED_PDU_LENGTH));
+        tvb_memcpy(tvb, thisData->data, offset, MIN(thisData->length, MAX_EXPECTED_PDU_LENGTH));
         thisData->ndi = p_mac_lte_info->detailed_phy_info.ul_info.ndi;
         thisData->framenum = pinfo->fd->num;
         thisData->received_time = pinfo->fd->abs_ts;
@@ -2195,6 +2196,11 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree
                                      "(%s",
                                      val_to_str_const(lcids[number_of_headers],
                                                       dlsch_lcid_vals, "(Unknown LCID)"));
+            if (lcids[number_of_headers] == DRX_COMMAND_LCID) {
+                expert_add_info_format(pinfo, lcid_ti, PI_SEQUENCE, PI_NOTE,
+                                       "DRX command received for UE %u (RNTI %u)",
+                                       p_mac_lte_info->ueid, p_mac_lte_info->rnti);
+            }
         }
         offset++;
 
@@ -2389,7 +2395,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree
                                 crResult->msg3FrameNum = msg3Data->framenum;
 
                                 /* Compare the 6 bytes */
-                               if (tvb_memeql(tvb, offset, msg3Data->data, 6) == 0) {
+                                if (tvb_memeql(tvb, offset, msg3Data->data, 6) == 0) {
                                     crResult->status = Msg3Match;
                                 }
                                 else {
@@ -2732,7 +2738,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 
                 /* Fill in data details */
                 data->framenum = pinfo->fd->num;
-               tvb_memcpy(tvb, data->data, offset, data_length);
+                tvb_memcpy(tvb, data->data, offset, data_length);
                 data->msg3Time = pinfo->fd->abs_ts;
             }
         }