diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-11-21 21:37:26 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-11-21 21:37:26 +0000 |
| commit | bd90493d46399161487bb21997af3e6450c5425d (patch) | |
| tree | 7de4277446513b58f5731ee8e63d1733368f117f /packet-tcp.c | |
| parent | 99e2d7e62691d4c21089b01e6f499c0b1cddd646 (diff) | |
If we have to worry about subdissectors changing the "packet_info"
structure, we may have to worry about it in more places than the places
that *used* to set "pi.len" and "pi.captured_len", so there's no point
in just saving and restoring it there. We'll remove those
saves/restores, and worry about saves and restores when we find a
problem.
svn path=/trunk/; revision=4245
Diffstat (limited to 'packet-tcp.c')
| -rw-r--r-- | packet-tcp.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/packet-tcp.c b/packet-tcp.c index 85cf2d3356..64cdd9897f 100644 --- a/packet-tcp.c +++ b/packet-tcp.c @@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c,v 1.115 2001/11/20 22:29:04 guy Exp $ + * $Id: packet-tcp.c,v 1.116 2001/11/21 21:37:26 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -375,7 +375,6 @@ desegment_tcp(tvbuff_t *tvb, packet_info *pinfo, int offset, */ if(nxtseq >= (tsk->start_seq + tsk->tot_len)){ /* ok, lest call subdissector with desegmented data */ - packet_info save_pi; tvbuff_t *next_tvb; /* create a new TVB structure for desegmented data */ @@ -392,25 +391,11 @@ desegment_tcp(tvbuff_t *tvb, packet_info *pinfo, int offset, /* indicate that this is reassembled data */ tcpinfo->is_reassembled = TRUE; - /* XXX - is this still necessary? Do we have to - worry about subdissectors changing "*pinfo", or, - given that we're no longer doing so, is that no - longer an issue? */ - save_pi = *pinfo; - /* call subdissector */ decode_tcp_ports(next_tvb, 0, pinfo, tree, sport, dport); called_dissector = TRUE; - /* - * Don't trash the new values of "desegment_offset" - * and "desegment_len". - */ - save_pi.desegment_offset = pinfo->desegment_offset; - save_pi.desegment_len = pinfo->desegment_len; - *pinfo = save_pi; - /* Did the subdissector ask us to desegment some more data? This means that the data at the beginning of this segment completed a higher-level PDU, |