http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=32655
User: gerald
Date: 2010/05/03 05:20 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r28809 | tuexen | 2009-06-22 05:13:12 -0700 (Mon, 22 Jun 2009) | 2 lines
Changed paths:
M /trunk/wiretap/packetlogger.c
Improve heuristic for packetlogger file format detection.
------------------------------------------------------------------------
r31512 | stig | 2010-01-13 02:21:25 -0800 (Wed, 13 Jan 2010) | 2 lines
Changed paths:
M /trunk/gtk/main.c
Display the capture filter in the main window title when capturing.
------------------------------------------------------------------------
r32390 | gerald | 2010-04-05 14:13:00 -0700 (Mon, 05 Apr 2010) | 2 lines
Changed paths:
M /trunk/capture_ui_utils.c
Note that -X stdin_descr stretches the original intent of the -X option.
------------------------------------------------------------------------
Copy over with manual intervention:
------------------------------------------------------------------------
r32393 | guy | 2010-04-05 15:20:21 -0700 (Mon, 05 Apr 2010) | 11 lines
Changed paths:
M /trunk/wiretap/pcapng.c
Treat the first block we read, when opening, specially:
1) if it's not an SHB, just say "this is not a pcap-ng file",
don't try to process it (we can't process it, as we haven't
finished setting up all the state information yet);
2) if it has the right SHB type code, but isn't a valid SHB,
just say "this is not a pcap-ng file".
For all other SHB's, treat anything that renders it invalid as an error.
------------------------------------------------------------------------
r30363 | krj | 2009-10-06 06:51:56 -0700 (Tue, 06 Oct 2009) | 1 line
Changed paths:
M /trunk/gtk/main.c
Guard icon_list_create()
------------------------------------------------------------------------
r32357 | gerald | 2010-04-01 14:55:01 -0700 (Thu, 01 Apr 2010) | 4 lines
Changed paths:
M /trunk/capture.c
M /trunk/capture_ui_utils.c
M /trunk/cfile.c
M /trunk/cfile.h
M /trunk/file.c
M /trunk/file.h
M /trunk/gtk/main.c
Keep a copy of the interface description and capture filter around so that
we can use it in the main window title during and after capture. Add a
"-X" option for providing a description for stdin.
------------------------------------------------------------------------
r32362 | rbalint | 2010-04-02 13:40:20 -0700 (Fri, 02 Apr 2010) | 3 lines
Changed paths:
M /trunk/gtk/packet_win.c
Fix crash when double clicking in packet list area before capturing any packet.
The crash does not happen when using the new packet list.
------------------------------------------------------------------------
r32396 | guy | 2010-04-05 19:49:18 -0700 (Mon, 05 Apr 2010) | 4 lines
Changed paths:
M /trunk/plugins/docsis/packet-bpkmrsp.c
The third argument to val_to_str() is a format string that gets passed
the value that couldn't be mapped to a string - it's an integer and
needs to be printed with an integer format. Fixes bug 4644.
------------------------------------------------------------------------
r32400 | morriss | 2010-04-06 08:45:11 -0700 (Tue, 06 Apr 2010) | 1 line
Changed paths:
M /trunk/plugins/docsis/packet-bpkmreq.c
M /trunk/plugins/docsis/packet-dsaack.c
M /trunk/plugins/docsis/packet-dsarsp.c
M /trunk/plugins/docsis/packet-dscack.c
M /trunk/plugins/docsis/packet-dscrsp.c
M /trunk/plugins/docsis/packet-dsdrsp.c
M /trunk/plugins/docsis/packet-map.c
M /trunk/plugins/docsis/packet-regack.c
Don't use %s as the format string in val_to_str().
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.2/docbook/
Changes Path Action
+36 -103 release-notes.xml Modified
Directory: /trunk-1.2/plugins/docsis/
Changes Path Action
+1 -1 packet-bpkmreq.c Modified
+1 -1 packet-bpkmrsp.c Modified
+1 -1 packet-dsaack.c Modified
+1 -1 packet-dsarsp.c Modified
+1 -1 packet-dscack.c Modified
+1 -1 packet-dscrsp.c Modified
+1 -1 packet-dsdrsp.c Modified
+2 -2 packet-map.c Modified
+1 -1 packet-regack.c Modified
+1 -1 packet-regrsp.c Modified
(10 files not shown)
