diff options
| author | sake <sake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-03-08 11:26:34 +0000 |
|---|---|---|
| committer | sake <sake@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-03-08 11:26:34 +0000 |
| commit | a3a62c9aaab08e0b207d7d6afdeee5c10e978b34 (patch) | |
| tree | 0760e61af07041d521046e07dbbd60917a0253ba /epan/dissectors/packet-tcp.c | |
| parent | f8b32c33857fb5b8006364c5c9a2918d15e858b5 (diff) | |
Fix for bug 5743 : tshark incorrectly calculates tcp stream for SYN packets when port numbers are re-used
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36162 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-tcp.c')
| -rw-r--r-- | epan/dissectors/packet-tcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index c01aaba68b..9e25196117 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -3662,9 +3662,6 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) conv=find_or_create_conversation(pinfo); tcpd=get_tcp_conversation_data(conv,pinfo); - item = proto_tree_add_uint(tcp_tree, hf_tcp_stream, tvb, offset, 0, conv->index); - PROTO_ITEM_SET_GENERATED(item); - /* If this is a SYN packet, then check if it's seq-nr is different * from the base_seq of the retrieved conversation. If this is the * case, create a new conversation with the same addresses and ports @@ -3684,6 +3681,9 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tcpd->ta->flags|=TCP_A_REUSED_PORTS; } + item = proto_tree_add_uint(tcp_tree, hf_tcp_stream, tvb, offset, 0, conv->index); + PROTO_ITEM_SET_GENERATED(item); + /* Do we need to calculate timestamps relative to the tcp-stream? */ if (tcp_calculate_ts) { |