diff options
| author | Juanjo Martin <juanjo@rti.com> | 2016-03-01 15:46:00 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-03-01 21:39:44 +0000 |
| commit | 7ebbf11c599b9714aefc5eb881716afcc8a74cf9 (patch) | |
| tree | 2ff3a88833268a786e54c2d06e36efabdc5b061f /epan | |
| parent | 6b54fbf3bfb7a3b0519637d01fa36bba8cec9c98 (diff) | |
RTITCP: Fixed header length when using the CRC
Before, the function get_rtitcp_pdu_len didn't take into account
the case where the CRC is sent (header_length is increased by 8).
This has been fixed.
Change-Id: I3eb22ec2aadc7406ccdcfcc8a5beaa98b48ed143
Reviewed-on: https://code.wireshark.org/review/14265
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan')
| -rwxr-xr-x | epan/dissectors/packet-rtitcp.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/epan/dissectors/packet-rtitcp.c b/epan/dissectors/packet-rtitcp.c index 1daa98d987..3508bf9ed4 100755 --- a/epan/dissectors/packet-rtitcp.c +++ b/epan/dissectors/packet-rtitcp.c @@ -690,8 +690,7 @@ static gint dissect_rtitcp_common(tvbuff_t *tvb, packet_info *pinfo, rtitcp_msg_length = tvb_get_guint16(tvb, offset+2, ENC_BIG_ENDIAN); - ti = proto_tree_add_item(tree, proto_rtitcp, tvb, offset, - rtitcp_msg_length + 8, ENC_NA); + ti = proto_tree_add_item(tree, proto_rtitcp, tvb, offset, -1, ENC_NA); rtitcp_tree = proto_item_add_subtree(ti, ett_rtitcp); offset_header = 0; /* Remember the offset that delimits the header */ @@ -706,6 +705,7 @@ static gint dissect_rtitcp_common(tvbuff_t *tvb, packet_info *pinfo, header_length += 8; /* header increases in 8 bytes */ offset += 8; /* Because of 0xCRC32 + actual CRC (4 bytes) */ } + proto_item_set_len(ti, rtitcp_msg_length + header_length); /* At this point, offset is 8 or 16 bytes and we have now data. This data can be RTPS or RTI TCP Signaling messages */ @@ -743,7 +743,7 @@ static gint dissect_rtitcp_common(tvbuff_t *tvb, packet_info *pinfo, static guint get_rtitcp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, gint offset, void * data _U_) { guint16 plen; - + guint16 header_length = 8; /* * Get the length of the RTITCP packet. */ @@ -751,13 +751,14 @@ static guint get_rtitcp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, /* * That length doesn't include the header field itself; add that in. */ - + if (tvb_get_ntohl(tvb, offset+8) == RTITCP_CRC_MAGIC_NUMBER) + header_length += 8; /* We don't expect plen to be greater than 0xfff8 since adding the header * exceeds the size */ if (plen >= 0xfff8) return 1; - return plen + 8; + return plen + header_length; } static gint dissect_rtitcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { |