http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=37221
User: gerald
Date: 2011/05/17 04:23 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r36723 | sfisher | 2011-04-19 12:52:50 -0700 (Tue, 19 Apr 2011) | 5 lines
Changed paths:
M /trunk/gtk/mtp3_stat.c
From Cecco via bug #5605: bug on gtk wireshark telephony->mtp3->msus
[doesn't show contents of window]
------------------------------------------------------------------------
r36304 | morriss | 2011-03-23 19:10:04 -0700 (Wed, 23 Mar 2011) | 16 lines
Changed paths:
M /trunk/epan/dissectors/packet-ssl.c
M /trunk/epan/dissectors/packet-tcp.c
If we've already seen a segment which starts a multi-segment pdu (i.e., it's
a retransmission), don't add it to the list (tree) of multi-segment pdus.
Otherwise, if we'd already seen the rest of the pdu and the other segments
were not retransmitted, the retransmission would break dissection of the pdu
because lookups for the segment would find the retransmission (to which the
other segments were not attached).
Since we know this segment is a retransmission, don't bother handing it off
to the subdissector either.
Use PINFO_FD_VISITED().
Add some white space in the desegmentation routine to improve readability.
Apply the same changes to the SSL dissector.
------------------------------------------------------------------------
Copy over with manual intervention:
------------------------------------------------------------------------
r36691 | tuexen | 2011-04-17 12:37:46 -0700 (Sun, 17 Apr 2011) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-m3ua.c
Decode the SI value in DATA messages correclty.
This fixes bug 5834.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.4/epan/dissectors/
Changes Path Action
+1 -1 packet-m3ua.c Modified
+85 -67 packet-ssl.c Modified
+88 -66 packet-tcp.c Modified
Directory: /trunk-1.4/docbook/
Changes Path Action
+105 -7 release-notes.xml Modified
Directory: /trunk-1.4/epan/
Changes Path Action
+2 -4 diam_dict.l Modified
Directory: /trunk-1.4/gtk/
Changes Path Action
+3 -0 mtp3_stat.c Modified
