[gerald@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=29101

User: gerald
Date: 2009/07/15 11:39 AM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r28863 | tuexen | 2009-06-27 09:08:18 -0700 (Sat, 27 Jun 2009) | 3 lines
 Changed paths:
    M /trunk/wiretap/libpcap.c
    M /trunk/wiretap/pcap-common.c
    M /trunk/wiretap/pcap-common.h
    M /trunk/wiretap/pcapng.c
 
 Cleanup. Should be included in Wireshark 1.2.1 and higher to keep
 merging future bug fixes simple.
 ------------------------------------------------------------------------
 r28864 | tuexen | 2009-06-27 10:33:23 -0700 (Sat, 27 Jun 2009) | 3 lines
 Changed paths:
    M /trunk/wiretap/pcapng.c
 
 Another cleanup. We are now back to Ulf's original
 model of data handling.
 ------------------------------------------------------------------------
 r28865 | tuexen | 2009-06-27 11:10:10 -0700 (Sat, 27 Jun 2009) | 3 lines
 Changed paths:
    M /trunk/wiretap/libpcap.c
 
 Fix copy/paste error introduced in rev. 28863.
 Thanks to Guy for finding and reporting it. 
 ------------------------------------------------------------------------
 r28866 | tuexen | 2009-06-27 11:50:13 -0700 (Sat, 27 Jun 2009) | 6 lines
 Changed paths:
    M /trunk/wiretap/pcapng.c
 
 Accept file snaplen larger than WTAP_MAX_PACKET_SIZE,
 text2pcap uses 102400.
 This fixes bug 3620. Thanks to Tyson Key for reporting the bug
 and providing capture files.
 This fix should be included in Wireshark 1.2.1 and higher.
 ------------------------------------------------------------------------
 r28868 | tuexen | 2009-06-28 04:09:24 -0700 (Sun, 28 Jun 2009) | 7 lines
 Changed paths:
    M /trunk/wiretap/pcapng.c
 
 Stop loading a pcapng file with multiple section header blocks.
 This fixes a bug reported by Tyson Key as a follow up of Bug 3560.
 Also some cleanups and debug output improvements.
 
 Thanks to Tyson Key for reporting the bug and providing a tracefile.
 This fix will be included in Wireshark 1.2.1 and higher.
 ------------------------------------------------------------------------
 r28873 | etxrab | 2009-06-28 08:22:43 -0700 (Sun, 28 Jun 2009) | 3 lines
 Changed paths:
    M /trunk/gtk/tcp_graph.c
 
 From   Sean Walberg:
 The title in the TCP sequence graphs is too short.
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3556
 ------------------------------------------------------------------------
 r28874 | rbalint | 2009-06-28 09:31:27 -0700 (Sun, 28 Jun 2009) | 4 lines
 Changed paths:
    D /trunk/aclocal-fallback/libgnutls.m4
    M /trunk/configure.in
 
 Detect gnutls via pkg-config instead of the deprecated libgnutls-config.
 Based on patch from Andreas Metzler.
 This fixes bug 3627.
 ------------------------------------------------------------------------
 r28876 | guy | 2009-06-28 10:23:07 -0700 (Sun, 28 Jun 2009) | 3 lines
 Changed paths:
    M /trunk/aclocal-flags
 
 We only support GLib 2.x/GTK+ 2.x, which uses pkg-config, not
 gtk-config; use it instead.
 ------------------------------------------------------------------------
 r28717 | gal | 2009-06-13 01:20:46 -0700 (Sat, 13 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/packaging/portableapps/win32/WiresharkPortable.ini
    M /trunk/packaging/portableapps/win32/WiresharkPortable.nsi
    M /trunk/packaging/portableapps/win32/readme.txt
 
 Update for the latest WinPcap and also installation of the VC redistributable.
 ------------------------------------------------------------------------
 r28884 | wmeier | 2009-06-29 13:59:26 -0700 (Mon, 29 Jun 2009) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-btl2cap.c
 
 From  Kovarththanan Rajaratnam: Fix for Bug #3572 
 [http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3572]
 ------------------------------------------------------------------------
 r28886 | gerald | 2009-06-29 16:08:05 -0700 (Mon, 29 Jun 2009) | 3 lines
 Changed paths:
    M /trunk/gtk/airpcap_dlg.c
    M /trunk/gtk/airpcap_dlg.h
    M /trunk/gtk/airpcap_gui_utils.c
    M /trunk/gtk/airpcap_gui_utils.h
    M /trunk/gtk/keys.h
    M /trunk/gtk/main_airpcap_toolbar.c
 
 Fix a couple of AirPcap channel/offset bugs. Remove an unused
 routine. Fixup whitespace in a couple of places.
 ------------------------------------------------------------------------
 r28891 | wmeier | 2009-06-30 06:57:26 -0700 (Tue, 30 Jun 2009) | 6 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-radius.c
 
 packet-radius: Fix exception CLEANUP handling when malformed attribute list/pair seen;
 Fixes crash reported in Bug #3578. [https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3578]
 Essentially: CLEANUP_CALL_AND_POP wasn't being executed for certain error exits from
  dissect_attribute_pairs() thus leaving a CLEANUP entry on the exception stack.
 Also: vsa_buffer_table wasn't being destroyed if an exception occurred in dissect_attribute_pairs.
 ------------------------------------------------------------------------
 r28897 | gerald | 2009-06-30 13:59:51 -0700 (Tue, 30 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-sflow.c
 
 Add some length checks. Fixes bug 3567.
 ------------------------------------------------------------------------
 r28908 | gerald | 2009-07-01 08:56:12 -0700 (Wed, 01 Jul 2009) | 3 lines
 Changed paths:
    M /trunk/gtk/airpcap_dlg.c
    M /trunk/gtk/airpcap_gui_utils.c
    M /trunk/gtk/airpcap_gui_utils.h
    M /trunk/gtk/main_airpcap_toolbar.c
 
 Fix a key entry bug in the decryption key dialog. Remove some unused /
 unnecessary functions. Clean up code in a couple of places.
 ------------------------------------------------------------------------
 r28917 | stig | 2009-07-01 23:51:27 -0700 (Wed, 01 Jul 2009) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-mip6.c
    M /trunk/epan/dissectors/packet-mip6.h
 
 From Albert Chin:
 Small patch to make it compile on AIX.
 ------------------------------------------------------------------------
 r28918 | stig | 2009-07-02 02:08:11 -0700 (Thu, 02 Jul 2009) | 5 lines
 Changed paths:
    M /trunk/gtk/main.c
 
 Move updating menus with new recent values to a point after we have created
 the new packet list, because we relay on the columns for time values.
 
 This fixes bug 3640.
 ------------------------------------------------------------------------
 r28728 | gerald | 2009-06-14 15:19:08 -0700 (Sun, 14 Jun 2009) | 3 lines
 Changed paths:
    M /trunk/gtk/hostlist_table.c
    M /trunk/ipmap.html
 
 Use a unique data file name for our OpenStreetMap data. Print an error
 if we don't have data for any hosts. Fixes bug 3530.
 ------------------------------------------------------------------------
 r28915 | gerald | 2009-07-01 16:36:51 -0700 (Wed, 01 Jul 2009) | 5 lines
 Changed paths:
    M /trunk/dumpcap.c
    M /trunk/file.c
    M /trunk/gtk/follow_stream.c
    M /trunk/gtk/follow_stream.h
    M /trunk/gtk/follow_tcp.c
    M /trunk/gtk/hostlist_table.c
    M /trunk/gtk/iax2_analysis.c
    M /trunk/gtk/print_dlg.c
    M /trunk/gtk/rtp_analysis.c
    M /trunk/tempfile.c
    M /trunk/tempfile.h
 
 Updates to create_tempfile:
 
   - Use g_get_tmp_dir, just like get_tempfile_path.
   - Don't make the caller worry about the path buffer length.
 ------------------------------------------------------------------------
 r28920 | gerald | 2009-07-02 10:20:27 -0700 (Thu, 02 Jul 2009) | 8 lines
 Changed paths:
    M /trunk/Makefile.am
    M /trunk/Makefile.common
    M /trunk/Makefile.nmake
    M /trunk/config.h.win32
    M /trunk/configure.in
    M /trunk/gtk/hostlist_table.c
    D /trunk/mkstemp.c
    D /trunk/mkstemp.h
    M /trunk/tempfile.c
    M /trunk/tempfile.h
 
 Pull mkstemp() into tempfile.c. That's the only place we use it now, and
 it's arguably the only place we _should_ use it. Add create_tempdir() to
 tempfile.c and use it to create a temp directory for IP maps. This
 should fix bug 3530.
 
 (This still doesn't work on IE 8 / Vista here. IE gives an access denied
 error in OpenLayers.js, but this is a separate issue).
 ------------------------------------------------------------------------
 r28924 | tuexen | 2009-07-02 12:52:47 -0700 (Thu, 02 Jul 2009) | 4 lines
 Changed paths:
    M /trunk/wiretap/btsnoop.c
 
 Patch from Alex Badea for Bug 3645.
 
 This fix will be included in Wireshark 1.2.1.
 ------------------------------------------------------------------------
 r28925 | guy | 2009-07-02 13:10:05 -0700 (Thu, 02 Jul 2009) | 7 lines
 Changed paths:
    M /trunk/wiretap/btsnoop.c
 
 Don't dump out the raw link-layer type when noting that
 KHciLoggerDatalinkTypeBCSP and KHciLoggerDatalinkTypeH5 aren't supported
 - just explicitly say "BSCP" or "H5".
 
 For unknown link-layer types, say "unknown or unsupported", as other
 Wiretap modules do.
 ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
 ------------------------------------------------------------------------
 r28862 | tuexen | 2009-06-27 08:20:44 -0700 (Sat, 27 Jun 2009) | 9 lines
 Changed paths:
    M /trunk/wiretap/pcapng.c
    M /trunk/wiretap/wtap-int.h
 
 Add support for writing pcapng files with multiple
 encapsulations.
 This fixes a bug reported by Sake during the
 Sharkfest 09. Thanks for providing a
 Netscreen tracefile with multiple link layer
 types.
 This patch will be included in Wireshark 1.2.1
 and higher.
 ------------------------------------------------------------------------
 r28880 | gal | 2009-06-29 06:01:54 -0700 (Mon, 29 Jun 2009) | 9 lines
 Changed paths:
    D /trunk/packaging/portableapps/win32/WiresharkPortable.ini
    M /trunk/packaging/portableapps/win32/WiresharkPortable.nsi
    A /trunk/packaging/portableapps/win32/WiresharkPortable.tmpl
    M /trunk/packaging/portableapps/win32/makefile.nmake
 
 Changes to address bug 3547:
 
 1) Make sure WiresharkPortable.nsi uses correct WinPcap version (from config.nmake), and also vcredist.
 2) Automatically generate WiresharkPortable.ini with correct default values
 3) Include readme.txt in the distribution so that users know how to use WiresharkPortable.ini
 
 Thanks to Kovarththanan Rajaratnam for basic patch.
 ------------------------------------------------------------------------
 r28963 | gerald | 2009-07-06 13:23:32 -0700 (Mon, 06 Jul 2009) | 17 lines
 Changed paths:
    M /trunk/epan/dissectors/Makefile.common
    M /trunk/epan/dissectors/packet-miop.c
    D /trunk/epan/dissectors/packet-miop.h
 
 From Kovarththanan Rajaratnam via bug 3652:
 
 This patch protects against malformed Unique ID lengths (>= 252 bytes) and
 defer all tvb_xxx related calls to when we actually need them. This allows us
 to dissects as much as possible before bailing out (in case of a malformed
 length).
 
 From me:
 
 Add a link to the protocol specification.  Remove packet-miop.h along
 with some struct definitions. (Don't tvb_memcpy over structs!) Remove
 some more tvbuffs.  Don't call proto_item_add_subtree if we're not going
 to use the trees.  Call proto_tree_add_item instead of
 proto_tree_add_text Remove a bunch of unused ett_ variables.  Add an
 expert item for the protocol version.  Register the field array with the
 correct length.
 ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.2/aclocal-fallback/
  Changes    Path            Action
  +0 -160    libgnutls.m4    Modified

Directory: /trunk-1.2/epan/dissectors/
  Changes    Path                Action
  +0 -1      Makefile.common     Modified
  +11 -1     packet-btl2cap.c    Modified
  +91 -108   packet-miop.c       Modified
  +0 -55     packet-miop.h       Removed
  +1 -1      packet-mip6.c       Modified
  +1 -1      packet-mip6.h       Modified
  +15 -12    packet-radius.c     Modified
  +22 -4     packet-sflow.c      Modified

Directory: /trunk-1.2/docbook/
  Changes    Path                 Action
  +95 -3     release-notes.xml    Modified


(39 files not shown)