summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2016-07-22 13:48:58 +0200
committerPascal Quantin <pascal.quantin@gmail.com>2016-07-22 14:15:54 +0000
commitba607a15277f6a9475ba19d0cb60f003b3a40019 (patch)
tree15388db92bafbfcbb5d1f9fc66394bf187819880
parent52ed7d3b5c25ca5337990f5f1311da975784353d (diff)
downloadwireshark-ba607a15277f6a9475ba19d0cb60f003b3a40019.tar.gz
MPTCP: fix offset used for AddrID field in MP_JOIN and MP_PRIO messages
Bug: 12641 Change-Id: I7ba5cbf795eef3e77a7161b8dc8752d9c10610f8 Reviewed-on: https://code.wireshark.org/review/16583 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-rw-r--r--epan/dissectors/packet-tcp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index d58ff69768..2c1ab1342e 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -3717,10 +3717,11 @@ dissect_tcpopt_mptcp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb,
proto_tree_add_bitmask(mptcp_tree, tvb, offset, hf_tcp_option_mptcp_flags,
ett_tcp_option_mptcp, tcp_option_mptcp_join_flags,
ENC_BIG_ENDIAN);
+ offset += 1;
proto_tree_add_item(mptcp_tree, hf_tcp_option_mptcp_address_id, tvb, offset,
- 2, ENC_BIG_ENDIAN);
- offset += 2;
+ 1, ENC_BIG_ENDIAN);
+ offset += 1;
proto_tree_add_item(mptcp_tree, hf_tcp_option_mptcp_sender_trunc_hmac, tvb, offset,
8, ENC_BIG_ENDIAN);
@@ -3931,6 +3932,7 @@ dissect_tcpopt_mptcp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb,
proto_tree_add_bitmask(mptcp_tree, tvb, offset, hf_tcp_option_mptcp_flags,
ett_tcp_option_mptcp, tcp_option_mptcp_join_flags,
ENC_BIG_ENDIAN);
+ offset += 1;
if (optlen == 4) {
proto_tree_add_item(mptcp_tree,