Wireshark-commits: [Wireshark-commits] rev 36030: /trunk-1.4/ /trunk-1.4/epan/dissectors/: packet-b
Date: Wed, 23 Feb 2011 07:24:04 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=36030

User: jake
Date: 2011/02/22 11:24 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r33136 | wmeier | 2010-06-07 18:32:21 +0200 (Mon, 07 Jun 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-bittorrent.c
    M /trunk/epan/dissectors/packet-dtpt.c
    M /trunk/epan/dissectors/packet-quake.c
 
 Use find_or_create_conversation() rather than only conversation_new().
 Fixes bug #2907: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907
 ------------------------------------------------------------------------
 r34618 | stig | 2010-10-22 08:47:00 +0200 (Fri, 22 Oct 2010) | 4 lines
 Changed paths:
    M /trunk/epan/wslua/wslua_pinfo.c
 
 From Regis Cridlig via bug 5326:
 The Lua text string passed to column:set(text) by a dissector will eventually
 be reclaimed. This causes the column to display incorrect characters.
 ------------------------------------------------------------------------
 r35795 | jake | 2011-02-04 00:17:31 +0100 (Fri, 04 Feb 2011) | 5 lines
 Changed paths:
    M /trunk/epan/wslua/wslua_pinfo.c
 
 From David Carne:
 col_set_str simply stores the pointer passed to it, and luaL_checkstring
 returns a temporary pointer. Changing col_set_str to col_add_str in
 Columns_newindex seems to fix the issue.
 ------------------------------------------------------------------------

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path                   Action
  +1 -3      packet-bittorrent.c    Modified
  +2 -5      packet-dtpt.c          Modified
  +3 -5      packet-quake.c         Modified

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

Directory: /trunk-1.4/epan/wslua/
  Changes    Path             Action
  +2 -2      wslua_pinfo.c    Modified