http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=32332
User: gerald
Date: 2010/03/30 04:47 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r31438 | stig | 2010-01-04 03:59:27 -0800 (Mon, 04 Jan 2010) | 2 lines
Changed paths:
M /trunk/gtk/capture_dlg.c
Check for valid linktype_history in capture_get_linktype().
------------------------------------------------------------------------
Copy over with manual intervention:
------------------------------------------------------------------------
r32304 | morriss | 2010-03-26 17:54:11 -0700 (Fri, 26 Mar 2010) | 7 lines
Changed paths:
M /trunk/gtk/rtp_player.c
Fix (or at least work around the crash in)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4119 :
Never insert more than 1000 silence frames (e.g., if the sequence number jumps
massively). There may be a better way, but at least now we won't crash.
Leave a comment in the code indicating this.
------------------------------------------------------------------------
r32321 | guy | 2010-03-28 12:35:14 -0700 (Sun, 28 Mar 2010) | 4 lines
Changed paths:
M /trunk/AUTHORS
M /trunk/wiretap/wtap.c
From Robert Bullen: give the Bluetooth-H4-with-Linux-pseudo-header
encapsulation a name different from the no-pseudo-header H4
encapsulation.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.2/docbook/
Changes Path Action
+22 -2 release-notes.xml Modified
Directory: /trunk-1.2/gtk/
Changes Path Action
+5 -0 capture_dlg.c Modified
+15 -2 rtp_player.c Modified
Directory: /trunk-1.2/
Changes Path Action
+1 -0 AUTHORS Modified
Directory: /trunk-1.2/wiretap/
Changes Path Action
+3 -3 wtap.c Modified