aboutsummaryrefslogtreecommitdiffstats
path: root/reassemble.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2003-08-28 04:19:29 +0000
committerGuy Harris <guy@alum.mit.edu>2003-08-28 04:19:29 +0000
commita2246980423a0f99fdfd45fccf229eb5fc3263b3 (patch)
tree7de7a1b7c6732a147c2d02b7f228baf1b5131637 /reassemble.h
parentf3d64a2c3834a26a87ec266a4397f43b21b62a70 (diff)
Make "process_reassembled_data()" do the check for fragmentation not
being complete and for fragmentation being trivial (i.e., the packet in question is both the first and last fragment). Have its callers *not* do that check - this lets "process_reassembled_data()" put in the "Reassembled in" item for fragments other than the last fragment. Add a "Reassembled in" field to TDS. svn path=/trunk/; revision=8295
Diffstat (limited to 'reassemble.h')
-rw-r--r--reassemble.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/reassemble.h b/reassemble.h
index 397ce241a8..76900524aa 100644
--- a/reassemble.h
+++ b/reassemble.h
@@ -1,7 +1,7 @@
/* reassemble.h
* Declarations of outines for {fragment,segment} reassembly
*
- * $Id: reassemble.h,v 1.19 2003/06/04 05:41:37 guy Exp $
+ * $Id: reassemble.h,v 1.20 2003/08/28 04:19:29 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -212,8 +212,8 @@ typedef struct _fragment_items {
} fragment_items;
extern tvbuff_t *
-process_reassembled_data(tvbuff_t *tvb, packet_info *pinfo, char *name,
- fragment_data *fd_head, const fragment_items *fit,
+process_reassembled_data(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ char *name, fragment_data *fd_head, const fragment_items *fit,
gboolean *update_col_infop, proto_tree *tree);
extern gboolean