Rename the "frag_offset" argument of "fragment_add_seq()" to

"frag_number", to make it clearer that it's not a byte offset but a
sequence number.

svn path=/trunk/; revision=5175

diff --git a/reassemble.c b/reassemble.c
index 9d8175dbc29a441997e90e61c0d5bdc6c60a6c7a..8122fadb9ef878b3e8bee388bf3ef3560295491e 100644 (file)
--- a/reassemble.c
+++ b/reassemble.c
@@ -1,7 +1,7 @@
 /* reassemble.c
  * Routines for {fragment,segment} reassembly
  *
- * $Id: reassemble.c,v 1.10 2002/03/31 21:05:47 guy Exp $
+ * $Id: reassemble.c,v 1.11 2002/04/17 04:54:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -567,12 +567,12 @@ fragment_add(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 id,
  * Returns a pointer to the head of the fragment data list if we have all the
  * fragments, NULL otherwise.
  *
- * This function assumes frag_offset being a block sequence number.
- * the bsn for the first block is 0.
+ * This function assumes frag_number being a block sequence number.
+ * The bsn for the first block is 0.
  */
 fragment_data *
 fragment_add_seq(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 id,
-            GHashTable *fragment_table, guint32 frag_offset,
+            GHashTable *fragment_table, guint32 frag_number,
             guint32 frag_data_len, gboolean more_frags)
 {
        fragment_key key, *new_key;
@@ -632,7 +632,7 @@ fragment_add_seq(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 id,
        fd->next = NULL;
        fd->flags = 0;
        fd->frame = pinfo->fd->num;
-       fd->offset = frag_offset;
+       fd->offset = frag_number;
        fd->len  = frag_data_len;
        fd->data = NULL;
 

diff --git a/reassemble.h b/reassemble.h
index 15f95195e974fb5681312748f0fc14b3f7735e70..522fc0abef8efbe7f809eeb45aeb918955934b86 100644 (file)
--- a/reassemble.h
+++ b/reassemble.h
@@ -1,7 +1,7 @@
 /* reassemble.h
  * Declarations of outines for {fragment,segment} reassembly
  *
- * $Id: reassemble.h,v 1.4 2002/02/03 23:28:38 guy Exp $
+ * $Id: reassemble.h,v 1.5 2002/04/17 04:54:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -86,10 +86,10 @@ fragment_data *fragment_add(tvbuff_t *tvb, int offset, packet_info *pinfo,
     guint32 id, GHashTable *fragment_table, guint32 frag_offset,
     guint32 frag_data_len, gboolean more_frags);
 
-/* same as fragment_add() but this one assumes frag_offset is a block
-   sequence number. note that frag_offset is 0 for the first fragment. */
+/* same as fragment_add() but this one assumes frag_number is a block
+   sequence number. note that frag_number is 0 for the first fragment. */
 fragment_data *fragment_add_seq(tvbuff_t *tvb, int offset, packet_info *pinfo,
-    guint32 id, GHashTable *fragment_table, guint32 frag_offset,
+    guint32 id, GHashTable *fragment_table, guint32 frag_number,
     guint32 frag_data_len, gboolean more_frags);
 
 /* to specify how much to reassemble, for fragmentation where last fragment can not be