osmocom/wireshark
14
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix for bug 1542:

Browse source 
When a SYN/ACK is missing in the capture, the base_seq used in 
relative sequence numbers was not set correctly. I made the
setting of fwd->base_seq and rev->base_seq a little more solid.


svn path=/trunk/; revision=23213
This commit is contained in:
Sake Blok 2007-10-17 07:14:56 +00:00
parent 74825dbc9b
commit 7b5113c2a4
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
epan/dissectors/packet-tcp.c
View file

@ -537,18 +537,24 @@ printf("REV list lastflags:0x%04x base_seq:0x%08x:\n",tcpd->rev->lastsegmentflag
/* if this is the first segment for this list we need to store the
* base_seq
*
* Start relative seq and ack numbers at 1 if this
* is not a SYN packet. This makes the relative
* seq/ack numbers to be displayed correctly in the
* event that the SYN or SYN/ACK packet is not seen
* (this solves bug 1542)
*/
if(tcpd->fwd->base_seq==0){
tcpd->fwd->base_seq=seq;
/* Only store reverse sequence if this isn't a handshake.
* There's no guarantee that the ACK field of a SYN
* contains zeros; get the ISN from the SYNACK instead.
*/
if(tcpd->rev->base_seq==0){
if (!flags & TH_SYN){
tcpd->rev->base_seq=ack;
}
}
tcpd->fwd->base_seq = (flags & TH_SYN) ? seq : seq-1;
}
/* Only store reverse sequence if this isn't the SYN
* There's no guarantee that the ACK field of a SYN
* contains zeros; get the ISN from the first segment
* with the ACK bit set instead (usually the SYN/ACK).
*/
if( (tcpd->rev->base_seq==0) && (flags & TH_ACK) ){
tcpd->rev->base_seq = (flags & TH_SYN) ? ack : ack-1;
}