diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-01-04 20:20:08 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-01-04 20:20:08 +0000 |
| commit | 8ee4e324f5757ecc20061ca875f3e218925dc0da (patch) | |
| tree | 20f36bf9693a03a3bde1d959622080e12ac26b0a /reassemble.c | |
| parent | 5b288fc0da24341f438544e7795b0757c14747b5 (diff) | |
WTP reassembly, from Tom Uijldert.
svn path=/trunk/; revision=4480
Diffstat (limited to 'reassemble.c')
| -rw-r--r-- | reassemble.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/reassemble.c b/reassemble.c index 1a021f79c6..f24311c279 100644 --- a/reassemble.c +++ b/reassemble.c @@ -1,7 +1,7 @@ /* reassemble.c * Routines for {fragment,segment} reassembly * - * $Id: reassemble.c,v 1.6 2001/12/15 05:40:31 guy Exp $ + * $Id: reassemble.c,v 1.7 2002/01/04 20:20:08 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -680,12 +680,13 @@ fragment_add_seq(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 id, size=0; last_fd=NULL; for(fd_i=fd_head->next;fd_i;fd_i=fd_i->next) { - if(last_fd && last_fd->offset!=fd_i->offset){ - size+=fd_i->datalen; + if(!last_fd || last_fd->offset!=fd_i->offset){ + size+=fd_i->len; } last_fd=fd_i; } fd_head->data = g_malloc(size); + fd_head->len = size; /* record size for caller */ /* add all data fragments */ last_fd=NULL; @@ -720,4 +721,3 @@ fragment_add_seq(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 id, return fd_head; } - |