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-wcp.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-wcp.c')
| -rw-r--r-- | packet-wcp.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/packet-wcp.c b/packet-wcp.c index a06b898b78..ab47a90385 100644 --- a/packet-wcp.c +++ b/packet-wcp.c @@ -2,7 +2,7 @@ * Routines for Wellfleet Compression frame disassembly * Copyright 2001, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-wcp.c,v 1.13 2001/11/20 22:29:04 guy Exp $ + * $Id: packet-wcp.c,v 1.14 2001/11/21 21:37:26 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -308,8 +308,6 @@ void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int wcp_header_len; guint16 temp, cmd, ext_cmd, seq; tvbuff_t *next_tvb; - packet_info save_pi; - gboolean must_restore_pi = FALSE; pinfo->current_proto = "WCP"; @@ -395,12 +393,6 @@ void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { "[Malformed Frame: Bad WCP compressed data]" ); return; } - - /* XXX - is this still necessary? Do we have to worry - about subdissectors changing "pi", or, given that - we're no longer doing so, is that no longer an issue? */ - save_pi = pi; - must_restore_pi = TRUE; } if ( tree) /* add the check byte */ @@ -410,9 +402,6 @@ void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { dissect_fr_uncompressed(next_tvb, pinfo, tree); - if (must_restore_pi) - pi = save_pi; - return; } |