osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

dissect_gtpv2_mbms_session_duration(): 'tree' is unused but 'item' is. Mark them as such. 

svn path=/trunk/; revision=40817
This commit is contained in:
Jeff Morriss 2012-02-02 21:35:51 +00:00
parent 29bde33be2
commit eba7aaecc0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
epan/dissectors/packet-gtpv2.c
View File

@ -3854,17 +3854,17 @@ dissect_gtpv2_ti(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_
* 8.69 MBMS Session Duration * 8.69 MBMS Session Duration
*/ */
static void static void
dissect_gtpv2_mbms_session_duration(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) dissect_gtpv2_mbms_session_duration(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_)
{ {
int bit_offset = 0; int bit_offset = 0;
guint32 days; guint32 days;
guint32 hours; guint32 hours;
guint32 seconds; guint32 seconds;
/* From 3GPP TS 29.061 17.7.7 MBMS-Session-Duration AVP */ /* From 3GPP TS 29.061 17.7.7 MBMS-Session-Duration AVP */
/* Total length is three; is it suitable to use tvb_get_bits32() in order to extract 24 bits? */ /* Total length is three; is it suitable to use tvb_get_bits32() in order to extract 24 bits? */
/* Bits: ssss ssss ssss ssss sddd dddd 0000 0000 where s bits = seconds, d bits = days /* Bits: ssss ssss ssss ssss sddd dddd 0000 0000 where s bits = seconds, d bits = days
* Will tvb_get_bits32() put the bits in the correct positions? * Will tvb_get_bits32() put the bits in the correct positions?
* It should be: 0000 0000 0000 000s ssss ssss ssss ssss (maximum = 131,071, maximum allowed = 86,400) * It should be: 0000 0000 0000 000s ssss ssss ssss ssss (maximum = 131,071, maximum allowed = 86,400)
* But I fear it is: ssss ssss ssss ssss s000 0000 0000 0000 (maximum = a very big number!) * But I fear it is: ssss ssss ssss ssss s000 0000 0000 0000 (maximum = a very big number!)
* The same for days. */ * The same for days. */
@ -3879,7 +3879,7 @@ dissect_gtpv2_mbms_session_duration(tvbuff_t *tvb, packet_info *pinfo _U_, proto
* I've implemented a basic check. */ * I've implemented a basic check. */
if((days>18) || (seconds>86400)) { if((days>18) || (seconds>86400)) {
/* Report potentially malformed packet */ /* Report potentially malformed packet */
} }
if((seconds&days) == 0xFFFFFFFF) { if((seconds&days) == 0xFFFFFFFF) {
proto_item_append_text(item, "Indefinite (always-on)"); proto_item_append_text(item, "Indefinite (always-on)");
@ -3934,14 +3934,14 @@ dissect_gtpv2_mbms_session_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
} }
/* /*
* 8.72 MBMS Flow Identifier * 8.72 MBMS Flow Identifier
*/ */
static void static void
dissect_gtpv2_mbms_flow_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) dissect_gtpv2_mbms_flow_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_)
{ {
/* Two octets OctetString. /* Two octets OctetString.
* 3GPP TS 29.061 17.7.23 */ * 3GPP TS 29.061 17.7.23 */
proto_item *expert_item; proto_item *expert_item;
expert_item = proto_tree_add_text(tree, tvb, 0, length, "IE data not dissected yet"); expert_item = proto_tree_add_text(tree, tvb, 0, length, "IE data not dissected yet");
@ -3950,7 +3950,7 @@ dissect_gtpv2_mbms_flow_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
} }
/* /*
* 8.73 MBMS IP Multicast Distribution * 8.73 MBMS IP Multicast Distribution
*/ */
static void static void