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

From Francesco Fondelli: 

Gerrit Renker fixed a bug in DCCP dissector about long timestamps. (bad offsets)
He wrote:
> attached is a patch which updates the offsets of the timestamps.
> I have verified this against [RFC 4342, sec. 13] and it seems correct.

Also fixed file properties

svn path=/trunk/; revision=20606
This commit is contained in:
Jaap Keuter 2007-01-29 18:06:45 +00:00
parent 3e924d9def
commit 54f4d487f4
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
epan/dissectors/packet-dcp.c
View File

@ -6,7 +6,7 @@
*
* Francesco Fondelli <francesco dot fondelli, gmail dot com>
*
* $Id: README.developer 11973 2004-09-11 23:10:14Z guy $
* $Id$
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -44,6 +44,10 @@
* (unlike UDP/packet-udp, from which the code stems,
* zero checksums are illegal in DCCP (as in TCP))
* (Gerrit Renker)
*
* Jan 29, 2007: updates the offsets of the timestamps to be
* compliant to (cf. RFC 4342, sec. 13).
* (Gerrit Renker)
*/
#ifdef HAVE_CONFIG_H
@ -499,14 +503,14 @@ static void dissect_options(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *d
proto_tree_add_uint(dcp_options_tree, hf_dcp_timestamp_echo, tvb, offset + 2, 4,
tvb_get_ntohl(tvb, offset + 2));
proto_tree_add_uint(dcp_options_tree, hf_dcp_elapsed_time, tvb, offset + 4, 2,
tvb_get_ntohs(tvb, offset + 4));
proto_tree_add_uint(dcp_options_tree, hf_dcp_elapsed_time, tvb, offset + 6, 2,
tvb_get_ntohs(tvb, offset + 6));
} else if (option_len==10) {
proto_tree_add_uint(dcp_options_tree, hf_dcp_timestamp_echo, tvb, offset + 2, 4,
tvb_get_ntohl(tvb, offset + 2));
proto_tree_add_uint(dcp_options_tree, hf_dcp_elapsed_time, tvb, offset + 4, 4,
tvb_get_ntohl(tvb, offset + 4));
proto_tree_add_uint(dcp_options_tree, hf_dcp_elapsed_time, tvb, offset + 6, 4,
tvb_get_ntohl(tvb, offset + 6));
} else
proto_tree_add_text(dcp_options_tree, tvb, offset, option_len, "Wrong Timestamp Echo length");
break;
@ -1103,13 +1107,13 @@ void proto_register_dcp(void)
{ &hf_dcp_options,
{ "Options", "dcp.options", FT_NONE, BASE_DEC, NULL, 0x0,
"DCP Options fields", HFILL }},
"DCP Options fields", HFILL }}
};
static gint *ett[] = {
&ett_dcp,
&ett_dcp_options,
&ett_dcp_options
};
proto_dcp = proto_register_protocol("Datagram Congestion Control Protocol", "DCP", "dcp");