[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/01/10 06:00 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r34265 | sfisher | 2010-09-27 13:02:54 -0700 (Mon, 27 Sep 2010) | 1 line
 Changed paths:
    M /trunk/gtk/gui_utils.c
 
 Fix bug #553 by ensuring that the upper-left corner of Wireshark is within the viewable area of the monitor.
 ------------------------------------------------------------------------
 r35154 | etxrab | 2010-12-08 00:26:40 -0800 (Wed, 08 Dec 2010) | 1 line
 Changed paths:
    M /trunk/epan/reassemble.c
 
 fragment_free_key to be used only if Glib >= 2.10
 ------------------------------------------------------------------------
 r35156 | etxrab | 2010-12-08 03:25:22 -0800 (Wed, 08 Dec 2010) | 2 lines
 Changed paths:
    M /trunk/epan/reassemble.c
 
 Mark parameter as unused.
 reassemble.c:220: warning: unused parameter 'key_arg'
 ------------------------------------------------------------------------
 r35175 | wmeier | 2010-12-10 19:22:09 -0800 (Fri, 10 Dec 2010) | 4 lines
 Changed paths:
    M /trunk/epan/reassemble.c
 
 Fix bug #5477: fuzz-test failure found by using G_SLICE=debug-blocks.
 Essentially: doing g_slice_free with the wrong 'type' for the data to be freed.
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5477
 ------------------------------------------------------------------------
 r35228 | martinm | 2010-12-20 03:26:50 -0800 (Mon, 20 Dec 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-catapult-dct2000.c
 
 From Papan Kumar Singh (bug 5504 & 5505):
 Add missing break so that PDCP-LTE direction is set properly.
 ------------------------------------------------------------------------
 r35313 | guy | 2010-12-30 16:02:54 -0800 (Thu, 30 Dec 2010) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-tcp.c
 
 It's not a good idea to use tcph->th_seglen if you haven't set it.
 
 Fixes bug 4211.
 ------------------------------------------------------------------------
 r35322 | stig | 2011-01-01 04:23:21 -0800 (Sat, 01 Jan 2011) | 2 lines
 Changed paths:
    M /trunk/packaging/macosx/Info.plist.in
    M /trunk/version_info.c
 
 New Year.
 ------------------------------------------------------------------------
 r35328 | guy | 2011-01-02 11:39:24 -0800 (Sun, 02 Jan 2011) | 2 lines
 Changed paths:
    M /trunk/plugins/unistim/packet-unistim.c
 
 Fix some cut-and-pasteos and other typoes.
 ------------------------------------------------------------------------
 
 
 Copy over by hand:
 
 ------------------------------------------------------------------------
 r35153 | etxrab | 2010-12-07 22:32:04 -0800 (Tue, 07 Dec 2010) | 2 lines
 Changed paths:
    M /trunk/epan/reassemble.c
 
 Reassemble.c leaks memory for GLIB > 2.8
 Free fragment data and fragment keys in fragment_table when neccessary. reassembled_table remains to be fixed.
 ------------------------------------------------------------------------
 r35155 | etxrab | 2010-12-08 01:12:03 -0800 (Wed, 08 Dec 2010) | 2 lines
 Changed paths:
    M /trunk/epan/reassemble.c
 
 reassemble.c: In function 'free_all_fragments':
 reassemble.c:222: warning: unused variable 'key'
 ------------------------------------------------------------------------
 r35176 | wmeier | 2010-12-10 20:11:31 -0800 (Fri, 10 Dec 2010) | 2 lines
 Changed paths:
    M /trunk/epan/reassemble.c
 
 Rework some comments.
 ------------------------------------------------------------------------
 r35304 | guy | 2010-12-29 18:56:51 -0800 (Wed, 29 Dec 2010) | 9 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-dcerpc-samr.c
    M /trunk/epan/dissectors/pidl/samr.cnf
    M /trunk/epan/dissectors/pidl/samr.idl
 
 The rids argument to samr_GetGroupsForUser() is *not* a single RID, it's
 an array of samr_RidWithAttributeArray structures.  Don't equate it to
 hf_samr_rid; that causes hf_samr_rid to be added as an item with a
 length of -1, but, as hf_samr_rid is an FT_UINT32 field, that causes a
 dissector bug error.
 
 The version of Yapp I was using, at least, didn't like C++-style
 comments in the IDL file; replace them with C-style comments.
 ------------------------------------------------------------------------
 r35330 | guy | 2011-01-02 13:27:57 -0800 (Sun, 02 Jan 2011) | 12 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ber.c
 
 For those cases where we interpret the contents of an OCTET STRING,
 which could be of arbitrary length - even if it's not supposed to be! -
 as a value of some other type, by adding them as a registered field,
 first check to make sure the length of the field is appropriate for the
 type and, if not, show a dissection error, rather than showing a
 dissector-bug assertion when we call proto_tree_add_item().
 
 This fixes a bunch of dissector-bug assertions that show up with
 malformed BER-encoded packets.
 
 Also, fix a typo, and expand a comment.
 ------------------------------------------------------------------------
 r35357 | guy | 2011-01-04 00:04:27 -0800 (Tue, 04 Jan 2011) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-amqp.c
 
 Don't use DISSECTOR_ASSERT() to catch malformed packets.  Fixes bug
 4048.
 ------------------------------------------------------------------------
 r35369 | guy | 2011-01-04 22:11:10 -0800 (Tue, 04 Jan 2011) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-amqp.c
 
 Put end-of-field-table checks back into dissect_amqp_field_table().
 ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.2/epan/dissectors/
  Changes    Path                         Action
  +684 -582  packet-amqp.c                Modified
  +111 -3    packet-ber.c                 Modified
  +1 -0      packet-catapult-dct2000.c    Modified
  +5 -2      packet-dcerpc-samr.c         Modified
  +144 -7    packet-diameter.c            Modified
  +1 -1      packet-tcp.c                 Modified

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

Directory: /trunk-1.2/epan/
  Changes    Path            Action
  +97 -19    reassemble.c    Modified

Directory: /trunk-1.2/epan/ftypes/
  Changes    Path          Action
  +9 -2      ftypes.h      Modified

Directory: /trunk-1.2/gtk/
  Changes    Path           Action
  +22 -0     gui_utils.c    Modified


(6 files not shown)