osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Revert r53118 as it breaks reassemble_test. 

svn path=/trunk/; revision=53130
This commit is contained in:
Michael Mann 2013-11-07 04:50:53 +00:00
parent b9e36145f4
commit 21ddc7ae4e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
epan/reassemble.c
View File

@ -1630,7 +1630,7 @@ fragment_add_seq_work(fragment_head *fd_head, tvbuff_t *tvb, const int offset,
* sequence number of that fragment (which is NOT
* the length of the packet!)
*/
fd_head->datalen = fd->offset + fd->len;
fd_head->datalen = fd->offset;
fd_head->flags |= FD_DATALEN_SET;
}
}
@ -1753,18 +1753,18 @@ fragment_add_seq_work(fragment_head *fd_head, tvbuff_t *tvb, const int offset,
max = 0;
for(fd_i=fd_head->next;fd_i;fd_i=fd_i->next) {
if ( fd_i->offset==max ){
max += fd_i->len;
max++;
}
}
/* max will now be datalen+1 if all fragments have been seen */
if (max < fd_head->datalen) {
if (max <= fd_head->datalen) {
/* we have not received all packets yet */
return FALSE;
}
if (max > fd_head->datalen) {
if (max > (fd_head->datalen+1)) {
/* oops, too long fragment detected */
fd->flags |= FD_TOOLONGFRAGMENT;
fd_head->flags |= FD_TOOLONGFRAGMENT;
@ -1866,7 +1866,7 @@ fragment_add_seq_common(reassembly_table *table, tvbuff_t *tvb,
*/
for (fd = fd_head; fd != NULL; fd = fd->next) {
if (fd->next == NULL)
frag_number = fd->offset + fd->len;
frag_number = fd->offset + 1;
}
}
}