osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Show grant-subframe from context info. 

svn path=/trunk/; revision=33437
This commit is contained in:
Martin Mathieson 2010-07-05 16:45:36 +00:00
parent 419dd3e945
commit b2a872cd9f
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epan/dissectors/packet-catapult-dct2000.c
View 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);
}

8
epan/dissectors/packet-mac-lte.c
View 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
}
},

4
epan/dissectors/packet-mac-lte.h
View 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 */