diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-12-22 02:04:18 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-12-22 02:04:18 +0000 |
| commit | 926b99b0319a856dbbf59c06664c2aa580567c70 (patch) | |
| tree | 5316463444ebe3359d3caf3aa25188fa77d86a67 /packet-ncp.c | |
| parent | a3fd229f8cfa1d4d1e1506a55c6436930e713625 (diff) | |
Don't call "nds_defrag()" for positive ACK packets.
Put in some comments noting problems with NDS reassembly.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9403 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-ncp.c')
| -rw-r--r-- | packet-ncp.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/packet-ncp.c b/packet-ncp.c index 7dbe568644..74e7129e2c 100644 --- a/packet-ncp.c +++ b/packet-ncp.c @@ -9,7 +9,7 @@ * Portions Copyright (c) by James Coe 2000-2002 * Portions Copyright (c) Novell, Inc. 2000-2003 * - * $Id: packet-ncp.c,v 1.75 2003/10/23 07:52:56 guy Exp $ + * $Id: packet-ncp.c,v 1.76 2003/12/22 02:04:18 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -504,10 +504,20 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, break; case NCP_SERVICE_REPLY: /* Server NCP Reply */ + next_tvb = tvb_new_subset(tvb, hdr_offset, -1, -1); + nds_defrag(next_tvb, pinfo, nw_connection, header.sequence, + header.type, ncp_tree); + break; + case NCP_POSITIVE_ACK: /* Positive Acknowledgement */ + /* + * XXX - this used to call "nds_defrag()", which would + * clear out "frags". Was that the right thing to + * do? + */ next_tvb = tvb_new_subset(tvb, hdr_offset, -1, -1); - nds_defrag(next_tvb, pinfo, nw_connection, header.sequence, - header.type, ncp_tree); + dissect_ncp_reply(next_tvb, pinfo, nw_connection, + header.sequence, header.type, ncp_tree); break; case NCP_WATCHDOG: /* Watchdog Packet */ |