diff options
author | Guy Harris <guy@alum.mit.edu> | 2003-04-09 20:45:04 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2003-04-09 20:45:04 +0000 |
commit | 0cb78e65087dbcb85208001bf0fa339d5ae4d846 (patch) | |
tree | 703cc6d2a75fa5c9619277c9b85963cc27370329 /packet-ndps.c | |
parent | 2abb403b4e70e16f93dab06ae270f04b6afff407 (diff) | |
download | wireshark-0cb78e65087dbcb85208001bf0fa339d5ae4d846.tar.gz |
Instead of using passing the SPX hash value to subdissectors, attach to
frames that are retransmissions a data structure containing the frame
number of the original frame, and pass that to subdissectors (or, if not
present, pass NULL).
That means we can free the hash values when we're done with the first
pass through the packets.
svn path=/trunk/; revision=7432
Diffstat (limited to 'packet-ndps.c')
-rw-r--r-- | packet-ndps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-ndps.c b/packet-ndps.c index 33865d6694..183006beb8 100644 --- a/packet-ndps.c +++ b/packet-ndps.c @@ -3,7 +3,7 @@ * Greg Morris <gmorris@novell.com> * Copyright (c) Novell, Inc. 2002-2003 * - * $Id: packet-ndps.c,v 1.17 2003/04/09 08:51:18 guy Exp $ + * $Id: packet-ndps.c,v 1.18 2003/04/09 20:45:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -3330,8 +3330,8 @@ ndps_defrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) spx_info *spx_data; spx_data = pinfo->private_data; - if (!ndps_defragment || spx_data->num != pinfo->fd->num) { - if (spx_data->num != pinfo->fd->num) { + if (!ndps_defragment || spx_data != NULL) { + if (spx_data != NULL) { if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "[Retransmission] Original Packet %d", spx_data->num); |