[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/01/06 04:49 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r33820 | sfisher | 2010-08-16 14:41:29 -0700 (Mon, 16 Aug 2010) | 1 line
 Changed paths:
    M /trunk/epan/dissectors/packet-dhcpv6.c
 
 Fix display of Client's FQDN and clear up the confusion with the S, O and N bits from the RFC descriptions.
 ------------------------------------------------------------------------
 r34764 | wmeier | 2010-11-03 11:37:29 -0700 (Wed, 03 Nov 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-sip.c
 
 (Trivial): Fix up a comment.
 ------------------------------------------------------------------------
 r35004 | etxrab | 2010-11-22 07:02:06 -0800 (Mon, 22 Nov 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-sip.c
 
 Remove faulty return, probably forgotten during test.
 Fixing dissection on Via header.
 ------------------------------------------------------------------------
 r35010 | gerald | 2010-11-22 12:43:22 -0800 (Mon, 22 Nov 2010) | 3 lines
 Changed paths:
    M /trunk/wsutil/file_util.c
 
 Make sure we pass a directory path and not a file path to
 SetCurrentDirectory.  Should fix bug 5420.
 ------------------------------------------------------------------------
 r35015 | etxrab | 2010-11-23 09:33:57 -0800 (Tue, 23 Nov 2010) | 2 lines
 Changed paths:
    M /trunk/epan/tvbuff.c
 
 From Vincent Helfre:
 Bug in tvb_get_bits32(), The last bitshift is too large, which causes the least significant bits to be 0 all the time.
 ------------------------------------------------------------------------
 r35021 | etxrab | 2010-11-24 08:21:04 -0800 (Wed, 24 Nov 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-per.c
 
 From Johannes Lange:
 Bug 5393 - Wrong length calculation in new_octet_aligned_subset_bits() (PER dissector) .
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5393
 ------------------------------------------------------------------------
 r35023 | etxrab | 2010-11-24 08:35:23 -0800 (Wed, 24 Nov 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-per.c
 
 From Johannes Lange:
 Function dissect_per_bit_string_display might read more bytes than available (PER dissector).
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5394
 ------------------------------------------------------------------------
 r35030 | rbalint | 2010-11-25 15:00:16 -0800 (Thu, 25 Nov 2010) | 4 lines
 Changed paths:
    M /trunk/wsutil/Makefile.am
 
 Add libtool version info to libwsutil.
 From Eloy Paris <peloy@xxxxxxxxxx>
 http://svn.debian.org/wsvn/collab-maint/ext-maint/wireshark/branches/wireshark-1.4.x%2Blibseparation/debian/patches/25_libwsutil-version.patch
 ------------------------------------------------------------------------
 r35055 | etxrab | 2010-11-28 13:03:43 -0800 (Sun, 28 Nov 2010) | 3 lines
 Changed paths:
    M /trunk/plugins/asn1/packet-asn1.c
 
 From Robert Groenenberg:
 Assert when using ASN.1 dissector with loading a 'type table'
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5447
 ------------------------------------------------------------------------
 r35056 | etxrab | 2010-11-28 13:08:03 -0800 (Sun, 28 Nov 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-infiniband.c
 
 From Slava:
 Bug with RWH parsing in Infiniband dissector.
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5444
 ------------------------------------------------------------------------
 r35074 | sake | 2010-11-29 14:50:21 -0800 (Mon, 29 Nov 2010) | 3 lines
 Changed paths:
    M /trunk/gtk/main.c
 
 Fix "colorize with filter" functionality that got broken with the new_packet_list.
 ------------------------------------------------------------------------
 r35086 | wmeier | 2010-11-30 17:31:49 -0800 (Tue, 30 Nov 2010) | 13 lines
 Changed paths:
    M /trunk/epan/to_str.c
 
 On Windows: convert _tzname[] strings from the system charset to UTF8 before use.
 
  In the Windows C Runtime the strings in the global array _tzname[]
    are encoded using the "system default ansi code page".
    They must be converted to UTF8 before use by Wireshark/GTK.
    (See comment in the code for details).
 
    Fixes Bug #5421 (I hope).
    https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5421
 
 Also: Fix bug: when the timezone name is not available from the system
       ?ST was used when ?DT should have been used (and vice-versa).
 ------------------------------------------------------------------------
 r35090 | sfisher | 2010-12-01 08:39:28 -0800 (Wed, 01 Dec 2010) | 1 line
 Changed paths:
    M /trunk/version_info.c
 
 Fix bug #5453 "Help->About Wireshark mis-reports OS" (again) without the help of MSDN code fragments.
 ------------------------------------------------------------------------
 
 
 Copy over by hand:
 ------------------------------------------------------------------------
 r35016 | etxrab | 2010-11-23 11:42:11 -0800 (Tue, 23 Nov 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ieee80211.c
 
 Remove Supported Channels lenght check fixes
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5430
 ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.4/plugins/asn1/
  Changes    Path             Action
  +32 -3     packet-asn1.c    Modified

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path                   Action
  +10 -12    packet-dhcpv6.c        Modified
  +5 -8      packet-ieee80211.c     Modified
  +5 -8      packet-infiniband.c    Modified
  +29 -11    packet-per.c           Modified
  +4 -5      packet-sip.c           Modified

Directory: /trunk-1.4/docbook/
  Changes    Path                 Action
  +39 -79    release-notes.xml    Modified

Directory: /trunk-1.4/epan/
  Changes    Path          Action
  +49 -18    to_str.c      Modified
  +1 -1      tvbuff.c      Modified

Directory: /trunk-1.4/gtk/
  Changes    Path          Action
  +4 -0      main.c        Modified


(3 files not shown)