Show grant-subframe from context info.
authormartinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 5 Jul 2010 16:45:36 +0000 (16:45 +0000)
committermartinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 5 Jul 2010 16:45:36 +0000 (16:45 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33437 f5534014-38df-0310-8fa8-9805f1628bb7

epan/dissectors/packet-catapult-dct2000.c
epan/dissectors/packet-mac-lte.c
epan/dissectors/packet-mac-lte.h

index b0c3869a8c969d47e40f1178428e9c465c10af7c..340a2d90c3adc47e57d762b111a4754e195897ff 100644 (file)
@@ -1429,6 +1429,11 @@ static void attach_mac_lte_info(packet_info *pinfo)
         }
     }
 
+    if (p_mac_lte_info->direction == DIRECTION_UPLINK) {
+        p_mac_lte_info->subframeNumberOfGrantPresent = TRUE;
+        p_mac_lte_info->subframeNumberOfGrant = outhdr_values[i++];
+    }
+
     /* Store info in packet */
     p_add_proto_data(pinfo->fd, proto_mac_lte, p_mac_lte_info);
 }
index 170f39daddf1fc85c8a2306a2f2b088619e35de9..a33c67059fef423a6b1c59c0819c068629b26efe 100644 (file)
@@ -2959,6 +2959,12 @@ void dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         p_mac_lte_info->subframeNumber = 9;
     }
 
+    if (p_mac_lte_info->subframeNumberOfGrantPresent) {
+        ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_grant_subframe_number,
+                                 tvb, 0, 0, p_mac_lte_info->subframeNumberOfGrant);
+        PROTO_ITEM_SET_GENERATED(ti);
+    }
+
     if (p_mac_lte_info->rntiType != NO_RNTI) {
         ti = proto_tree_add_uint(context_tree, hf_mac_lte_context_rnti,
                                  tvb, 0, 0, p_mac_lte_info->rnti);
@@ -3747,7 +3753,7 @@ void proto_register_mac_lte(void)
         },
         { &hf_mac_lte_suspected_dl_retx_original_frame,
             { "Frame with previous tx",
-              "mac-lte.dlsch.retx.original_frame", FT_FRAMENUM, BASE_NONE, 0, 0x0,
+              "mac-lte.dlsch.retx.original-frame", FT_FRAMENUM, BASE_NONE, 0, 0x0,
               NULL, HFILL
             }
         },
index 9d7a52d1e79c9f3f1fee0d4d01164a9519cdaa24..5230b7cbb9b6e8793754cd577819575299f1ca7b 100644 (file)
@@ -88,7 +88,9 @@ typedef struct mac_lte_info
     /* Extra info to display */
     guint16         rnti;
     guint16         ueid;
-    guint16         subframeNumber;
+    guint8          subframeNumber;
+    gboolean        subframeNumberOfGrantPresent;
+    guint8          subframeNumberOfGrant;
     guint8          isPredefinedData;
     guint16         length;
     guint8          reTxCount;   /* UL */