From 5311e027899011ec9ec3f64db33c752ec5e82eeb Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 9 Apr 2003 22:33:19 +0000 Subject: Make the individual flag bits in the Connection Control field of the SPX header be filterable fields. Don't hand retransmitted SPX frames to subdissectors - just show the payload as a retransmission of the original frame. Instead of handing a retransmission indicator to SPX subdissectors, hand them a structure containing the datastream type (under the assumption that it's data for the protocol running atop SPX, and that the dissector for that protocol might use it) and the state of the end-of-message bit (under the assumption that it's data for the protocol running atop SPX). svn path=/trunk/; revision=7433 --- packet-ndps.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'packet-ndps.c') diff --git a/packet-ndps.c b/packet-ndps.c index 183006beb8..66b5ad03dc 100644 --- a/packet-ndps.c +++ b/packet-ndps.c @@ -3,7 +3,7 @@ * Greg Morris * Copyright (c) Novell, Inc. 2002-2003 * - * $Id: packet-ndps.c,v 1.18 2003/04/09 20:45:04 guy Exp $ + * $Id: packet-ndps.c,v 1.19 2003/04/09 22:33:19 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -3327,17 +3327,8 @@ ndps_defrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int len=0; tvbuff_t *next_tvb = NULL; fragment_data *fd_head; - spx_info *spx_data; - spx_data = pinfo->private_data; - 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); - } - return; - } + if (!ndps_defragment) { dissect_ndps(tvb, pinfo, tree); return; } -- cgit v1.2.3