aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2016-06-15 08:53:14 +0200
committerMichael Mann <mmann78@netscape.net>2016-06-15 13:04:48 +0000
commitb26e757b310180bd2ab867dd5ad0cc0261993135 (patch)
treebff7d25f12fb9c12aa4165a7570a3f499772daa0
parent0ef1d941ea971fc4367b97ca7e7ab7a2ee9e9b88 (diff)
Let the calculated window scale be 16 bit wide.
Even though TCP window scale shift is only 8 bits, the scale calculated from it is max 16384. therefor a 16 bit value. Let the tree item map to the single byte in the TVB, while allowing the value to be 16 bit. Bug: 12525 Change-Id: I41cebc62f6b8b09e13efa5f3b7432001e8d994e1 Reviewed-on: https://code.wireshark.org/review/15914 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/dissectors/packet-tcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index ac7d9217a0..27753c6037 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -6342,7 +6342,7 @@ proto_register_tcp(void)
BASE_DEC, NULL, 0x0, "Logarithmically encoded power of 2 scale factor", HFILL}},
{ &hf_tcp_option_wscale_multiplier,
- { "Multiplier", "tcp.options.wscale.multiplier", FT_UINT8,
+ { "Multiplier", "tcp.options.wscale.multiplier", FT_UINT16,
BASE_DEC, NULL, 0x0, "Multiply segment window size by this for scaled window size", HFILL}},
{ &hf_tcp_option_exp,