http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=45204
User: gerald
Date: 2012/09/28 04:54 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r44338 | etxrab | 2012-08-08 07:06:29 -0700 (Wed, 08 Aug 2012) | 1 line
Changed paths:
M /trunk/file.c
M /trunk/merge.h
Make it possible to merge libpcap files with different encapsulation types by making the output file a pcapng file and construkting SHB and IDB
------------------------------------------------------------------------
r44500 | tuexen | 2012-08-14 13:31:49 -0700 (Tue, 14 Aug 2012) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-sctp.c
M /trunk/epan/sctpppids.h
Update SCTP PPIDs.
This also fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7635
------------------------------------------------------------------------
r44501 | morriss | 2012-08-14 13:44:58 -0700 (Tue, 14 Aug 2012) | 1 line
Changed paths:
M /trunk/epan/dissectors/packet-diameter.c
Register for Diameter's SCTP PPID.
------------------------------------------------------------------------
r44502 | tuexen | 2012-08-14 13:53:39 -0700 (Tue, 14 Aug 2012) | 2 lines
Changed paths:
M /trunk/epan/dissectors/packet-dtls.c
Register DIAMETER/DTLS/SCTP.
------------------------------------------------------------------------
r45174 | cmaynard | 2012-09-27 07:02:37 -0700 (Thu, 27 Sep 2012) | 4 lines
Changed paths:
M /trunk/epan/dissectors/packet-image-jfif.c
Allow dissection of partial jpegs by a modification of the heuristics.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6230
#BACKPORT(1.8, 1.6)
------------------------------------------------------------------------
Copy over with manual intervention:
------------------------------------------------------------------------
r44589 | eapache | 2012-08-19 14:24:02 -0700 (Sun, 19 Aug 2012) | 6 lines
Changed paths:
M /trunk/ui/gtk/capture_file_dlg.c
Split test_file_close out of do_file_close and use it in file_open_cmd_cb.
Means we don't end up closing the current file if the user decides not
to open a new file after all.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7649
------------------------------------------------------------------------
r45025 | etxrab | 2012-09-20 06:16:27 -0700 (Thu, 20 Sep 2012) | 1 line
Changed paths:
M /trunk/ui/gtk/file_import_dlg.c
M /trunk/ui/text_import.c
Have File->import write pcapng files.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.8/epan/dissectors/
Changes Path Action
+3 -0 packet-diameter.c Modified
+3 -2 packet-dtls.c Modified
+2 -2 packet-image-jfif.c Modified
Directory: /trunk-1.8/docbook/
Changes Path Action
+14 -0 release-notes.xml Modified
Directory: /trunk-1.8/ui/gtk/
Changes Path Action
+29 -14 capture_file_dlg.c Modified
+58 -1 file_import_dlg.c Modified
+6 -0 text_import.c Modified
Directory: /trunk-1.8/
Changes Path Action
+112 -11 file.c Modified
+4 -2 merge.h Modified