diff options
author | Anders Broman <anders.broman@ericsson.com> | 2008-07-30 12:23:18 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2008-07-30 12:23:18 +0000 |
commit | 832a507988340d11b67c0a39770c47d3c0f8e337 (patch) | |
tree | ecb14e6d54f32aa3b1bbb53075440ed51cb5aca4 | |
parent | 68c6088a5103614a32711ae4cc224e67a929b81f (diff) |
From Gerhard Olsson :
tcp_dissect_pdus will not req one_more_segm when tvb<fixed_len
svn path=/trunk/; revision=25869
-rw-r--r-- | epan/dissectors/packet-tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 8322e44092..fca2ca78ab 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -1894,7 +1894,7 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * need, and return. */ pinfo->desegment_offset = offset; - pinfo->desegment_len = fixed_len - length_remaining; + pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT; return; } } @@ -1925,7 +1925,7 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* * Display the PDU length as a field */ - item=proto_tree_add_uint(pinfo->tcp_tree, hf_tcp_pdu_size, tvb, 0, 0, plen); + item=proto_tree_add_uint(pinfo->tcp_tree, hf_tcp_pdu_size, tvb, offset, plen, plen); PROTO_ITEM_SET_GENERATED(item); |