aboutsummaryrefslogtreecommitdiffstats
path: root/packet-tds.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2003-08-28 02:19:00 +0000
committerGuy Harris <guy@alum.mit.edu>2003-08-28 02:19:00 +0000
commit268b0adf6d67a185c135d9555918b92ce3f0f3bb (patch)
tree5c5c97534bdbf6b0496281f0dca2398adcd158f1 /packet-tds.c
parentada92eb7f4997f28fba71f36677913f59d4cbf9f (diff)
It appears that TDS packets do have a sequence number; use that when
reassembling. svn path=/trunk/; revision=8293
Diffstat (limited to 'packet-tds.c')
-rw-r--r--packet-tds.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/packet-tds.c b/packet-tds.c
index 812b52e91e..4e9dd8a320 100644
--- a/packet-tds.c
+++ b/packet-tds.c
@@ -3,7 +3,7 @@
* Copyright 2000-2002, Brian Bruns <camber@ais.org>
* Copyright 2002, Steve Langasek <vorlon@netexpress.net>
*
- * $Id: packet-tds.c,v 1.17 2003/08/28 02:12:26 guy Exp $
+ * $Id: packet-tds.c,v 1.18 2003/08/28 02:19:00 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -946,6 +946,7 @@ dissect_netlib_buffer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint8 status;
guint16 size;
guint16 channel;
+ guint8 packet_number;
gboolean save_fragmented;
int len;
fragment_data *fd_head;
@@ -977,8 +978,11 @@ dissect_netlib_buffer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tree) {
proto_tree_add_uint(tds_tree, hf_tds_channel, tvb, offset + 4, 2,
channel);
- proto_tree_add_item(tds_tree, hf_tds_packet_number, tvb, offset + 6, 1,
- FALSE);
+ }
+ packet_number = tvb_get_guint8(tvb, offset + 6);
+ if (tree) {
+ proto_tree_add_uint(tds_tree, hf_tds_packet_number, tvb, offset + 6, 1,
+ packet_number);
proto_tree_add_item(tds_tree, hf_tds_window, tvb, offset + 7, 1,
FALSE);
}
@@ -995,9 +999,9 @@ dissect_netlib_buffer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
" (Not last buffer)");
}
len = tvb_reported_length_remaining(tvb, offset);
- fd_head = fragment_add_seq_next(tvb, offset, pinfo, channel,
+ fd_head = fragment_add_seq_check(tvb, offset, pinfo, channel,
tds_fragment_table, tds_reassembled_table,
- len, status == STATUS_NOT_LAST_BUFFER);
+ packet_number - 1, len, status == STATUS_NOT_LAST_BUFFER);
if (fd_head != NULL) {
if (fd_head->next != NULL) {
next_tvb = process_reassembled_data(tvb,