http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=52970
User: gerald
Date: 2013/10/29 09:58 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r52330 | pascal | 2013-10-02 08:33:00 -0700 (Wed, 02 Oct 2013) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-rtp.c
From Pavel via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9204 :
Fix parsing of padding in RTP header extension
------------------------------------------------------------------------
r52338 | pascal | 2013-10-02 12:59:35 -0700 (Wed, 02 Oct 2013) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-dvb-s2-bb.c
From Audric Schiltknecht via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9218 :
Fix typo in MODCOD list of DVB-S2 dissector
------------------------------------------------------------------------
r50272 | morriss | 2013-06-30 16:25:37 -0700 (Sun, 30 Jun 2013) | 17 lines
Changed paths:
M /trunk/epan/dissectors/packet-xmpp.c
From David Richards via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8871 :
TLS decryption fails when trying to decrypt XMPP sessions using start_tls as
the port in the key list of the SSL preferences.
Looking at the code, the XMPP dissector has 2 issues:
1) The crude XML element detection for XMPP segmentation is run before
checking if the SSL dissector should be called. As a result, the SSL dissector
is not called at the appropriate times.
2) The SSL dissector is called withoug resetting the desegment flags are not
manipulated as the SMTP dissector does so segmented SSL packets are not properly
reconstructed. Generally this causes the server hello not to be detected.
A proposed patch to fix these issues is attached.
------------------------------------------------------------------------
r52209 | mmann | 2013-09-24 14:06:05 -0700 (Tue, 24 Sep 2013) | 3 lines
Changed paths:
M /trunk/plugins/wimax/packet-wmx.c
Prevent crashing as a result of tree removal in r52208. Tree removal + this patch should be the "quick" fix to bug 5349 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5349). I knew the tree check was preventing some dissection/column data/etc, but from the comments in bug 5349, the tree check was also protecting this (and maybe other) crashes (due to missed NULL checking).
I want to follow up with some massive cleanup (remove PITEM_FINFO calls), but this with r52208 should be good enough to backport to 1.8 and 1.10 to fix bug 5349. Cleanup shouldn't need to be backported.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.10/epan/dissectors/
Changes Path Action
+1 -1 packet-dvb-s2-bb.c Modified
+1 -1 packet-rtp.c Modified
+18 -4 packet-xmpp.c Modified
Directory: /trunk-1.10/docbook/
Changes Path Action
+13 -2 release-notes.asciidoc Modified
Directory: /trunk-1.10/plugins/wimax/
Changes Path Action
+2 -2 packet-wmx.c Modified