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

From Martin Visser: 

Please change the dissector so that TCP packets that have the "SACK permitted"
option set, set the "tcp.options.sack_perm" field to 1.

svn path=/trunk/; revision=32273
This commit is contained in:
Jaap Keuter 2010-03-23 20:05:04 +00:00
parent cfb6f1531a
commit 3f6e8b0284
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
epan/dissectors/packet-tcp.c
View File

@ -2098,6 +2098,17 @@ tcp_info_append_str(packet_info *pinfo, const char *abbrev, const char *val)
col_append_fstr(pinfo->cinfo, COL_INFO, " %s[%s]", abbrev, val);
}
static void
dissect_tcpopt_sack_perm(const ip_tcp_opt *optp _U_, tvbuff_t *tvb,
int offset, guint optlen, packet_info *pinfo, proto_tree *opt_tree)
{
proto_item *hidden_item;
hidden_item = proto_tree_add_boolean(opt_tree, hf_tcp_option_sack_perm, tvb, offset,
optlen, TRUE);
tcp_info_append_uint(pinfo, "SACK_PERM", TRUE);
}
static void
dissect_tcpopt_maxseg(const ip_tcp_opt *optp, tvbuff_t *tvb,
int offset, guint optlen, packet_info *pinfo, proto_tree *opt_tree)
@ -2604,7 +2615,7 @@ static const ip_tcp_opt tcpopts[] = {
NULL,
FIXED_LENGTH,
TCPOLEN_SACK_PERM,
NULL,
dissect_tcpopt_sack_perm,
},
{
TCPOPT_SACK,
@ -3853,20 +3864,20 @@ proto_register_tcp(void)
HFILL}},
{ &hf_tcp_option_sack_perm,
{ "TCP Sack Perm Option", "tcp.options.sack_perm",
{ "TCP SACK Permitted Option", "tcp.options.sack_perm",
FT_BOOLEAN,
BASE_NONE, NULL, 0x0, NULL, HFILL}},
{ &hf_tcp_option_sack,
{ "TCP Sack Option", "tcp.options.sack", FT_BOOLEAN,
{ "TCP SACK Option", "tcp.options.sack", FT_BOOLEAN,
BASE_NONE, NULL, 0x0, NULL, HFILL}},
{ &hf_tcp_option_sack_sle,
{"TCP Sack Left Edge", "tcp.options.sack_le", FT_UINT32,
{"TCP SACK Left Edge", "tcp.options.sack_le", FT_UINT32,
BASE_DEC, NULL, 0x0, NULL, HFILL}},
{ &hf_tcp_option_sack_sre,
{"TCP Sack Right Edge", "tcp.options.sack_re", FT_UINT32,
{"TCP SACK Right Edge", "tcp.options.sack_re", FT_UINT32,
BASE_DEC, NULL, 0x0, NULL, HFILL}},
{ &hf_tcp_option_echo,