Fix to TCP reassembly code for retransmitted data, from Edgar Iglesias.

svn path=/trunk/; revision=3447

3 files changed, 7 insertions, 1 deletions

diff --git a/AUTHORS b/AUTHORS
index 9e693b94b2..e163420d0e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -649,6 +649,10 @@ Randy McEoin <rmceoin@pe.net> {
 	Appletalk Data Stream Interface (used by AFP-over-TCP) support
 }
 
+Edgar Iglesias <edgar.iglesias@axis.com> {
+	Fix to TCP reassembly code for retransmitted data
+}
+
 Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.
 
diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index f015b9d73d..72698d0bc8 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -1107,6 +1107,7 @@ B<http://www.ethereal.com>.
   Eran Mann                <emann@opticalaccess.com>
   Andy Hood                <ahood@westpac.com.au>
   Randy McEoin             <rmceoin@pe.net>
+  Edgar Iglesias           <edgar.iglesias@axis.com>
 
 Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.
diff --git a/follow.c b/follow.c
index 5b688e44b1..3ecb36f613 100644
--- a/follow.c
+++ b/follow.c
@@ -1,6 +1,6 @@
 /* follow.c
  *
- * $Id: follow.c,v 1.26 2000/08/24 21:05:16 deniel Exp $
+ * $Id: follow.c,v 1.27 2001/05/24 23:07:40 guy Exp $
  *
  * Copyright 1998 Mike Hall <mlh@io.com>
  *
@@ -223,6 +223,7 @@ reassemble_tcp( u_long sequence, u_long length, const char* data,
 	data += new_len;
 	data_length -= new_len;
       }
+      sc.dlen = data_length;
       sequence = seq[src_index];
       length = newseq - seq[src_index];