[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2012/03/23 01:44 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r39873 | guy | 2011-11-15 17:56:58 -0800 (Tue, 15 Nov 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-mysql.c
 
   Thou shalt not use proto_tree_add_string() with an FT_BYTES field.
   ------------------------------------------------------------------------
   r40616 | cmaynard | 2012-01-20 14:03:52 -0800 (Fri, 20 Jan 2012) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-packetbb.c
 
   Avoid a potential infinite loop by stopping dissection when a message has no tlvblock.  Patch from Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6687
   ------------------------------------------------------------------------
   r40644 | cmaynard | 2012-01-21 17:59:00 -0800 (Sat, 21 Jan 2012) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-pgm.c
 
   Patch from DXDragon [AT] yandex.ru (using e-mail address instead of name because I don't know how to enter Cyrillic letters) to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5687 - Some PGM options are not parsed correctly.
   ------------------------------------------------------------------------
   r40911 | cmaynard | 2012-02-06 19:20:33 -0800 (Mon, 06 Feb 2012) | 5 lines
   Changed paths:
      M /trunk/doc/tshark.pod
 
   Update the documentation to match the sort order.  This documentation error was pointed out by Markus Amend on -users.
   Reference: http://article.gmane.org/gmane.network.wireshark.user/14477
 
   (BTW, I quickly scanned through tap-iousers.c:iousers_draw() and the sorting seems to be very inefficient.)
   ------------------------------------------------------------------------
   r40944 | morriss | 2012-02-09 11:17:28 -0800 (Thu, 09 Feb 2012) | 5 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-iax2.c
 
   From Sean Bright via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6815 :
 
   Don't use tvb_get_ptr() to retrieve a string being sent into
   proto_tree_add_string_format(): use tvb_get_ephemeral_string() instead.
   ------------------------------------------------------------------------
   r37856 | cmaynard | 2011-07-01 12:40:35 -0700 (Fri, 01 Jul 2011) | 7 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-tcp.c
 
   Since the TCP Flags tree encompasses 12 bits including the 3 reserved bits and
   the nonce bit, we should display 3 nibbles on the Flags summary line in order
   to represent all flag bits.  While arguably we need not worry about reserved
   bits, the nonce bit is not currently represented, so that bit alone pushes us
   into the next nibble.
   ------------------------------------------------------------------------
   r40949 | cmaynard | 2012-02-09 19:37:28 -0800 (Thu, 09 Feb 2012) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-tcp.c
      M /trunk/epan/dissectors/packet-tcp.h
 
   Since the nonce and reserved bits were added in r34084, tcp.flags is now 12 bits, so its type needs to be changed from an FT_UINT8 to an FT_UINT16.  This should avoid the crash experienced by Lanell Allen as reported on -dev: http://article.gmane.org/gmane.network.wireshark.devel/24846 (although in my testing on Windows XP SP3 (32-bit), Wireshark did not crash).
   ------------------------------------------------------------------------
 
 
 Copy over by hand:
 
   ------------------------------------------------------------------------
   r40508 | guy | 2012-01-14 12:58:41 -0800 (Sat, 14 Jan 2012) | 6 lines
   Changed paths:
      M /trunk/wiretap/k12text.l
 
   wth->phdr.pkt_encap isn't set on a seek-and-read; pass the encapsulation
   directly to k12text_set_pseudo_header(), so that it's passed the right
   encapsulation for seek-and-read as well as for read.  Fixes the
   "malformed frames when reading some K12 text files" problem for which
   we're using bug 6735.
   ------------------------------------------------------------------------
   r40727 | guy | 2012-01-25 15:03:33 -0800 (Wed, 25 Jan 2012) | 4 lines
   Changed paths:
      M /trunk/epan/uat.h
      M /trunk/epan/wslua/wslua_proto.c
 
   Fix usage of g_ascii_strdown() and g_ascii_strup() - they do *not*
   modify the string in place, they return a g_mallocated modified version
   of the string passed into them.
   ------------------------------------------------------------------------
   r40769 | stig | 2012-01-30 05:05:27 -0800 (Mon, 30 Jan 2012) | 2 lines
   Changed paths:
      M /trunk/ui/gtk/main_menubar.c
      M /trunk/ui/gtk/main_toolbar.c
      M /trunk/ui/gtk/main_toolbar.h
 
   Disable the save-as button in the toolbar if we cannot save-as,
   because this will assert.
   ------------------------------------------------------------------------
   r40927 | stig | 2012-02-08 03:16:30 -0800 (Wed, 08 Feb 2012) | 2 lines
   Changed paths:
      M /trunk/ui/gtk/main_menubar.c
 
   Disable the File->Merge... menu item if we cannot save-as,
   because this will assert.
   ------------------------------------------------------------------------
   r40950 | cmaynard | 2012-02-09 21:05:17 -0800 (Thu, 09 Feb 2012) | 2 lines
   Changed paths:
      M /trunk/ui/gtk/tcp_graph.c
 
   Delete the TH_* defines and use those from epan/dissectors/packet-tcp.h.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path                 Action
  +1 -1      packet-iax2.c        Modified
  +3 -2      packet-mysql.c       Modified
  +4 -0      packet-packetbb.c    Modified
  +4 -0      packet-pgm.c         Modified
  +8 -2      packet-tcp.c         Modified
  +11 -10    packet-tcp.h         Modified

Directory: /trunk-1.4/doc/
  Changes    Path          Action
  +1 -1      tshark.pod    Modified

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

Directory: /trunk-1.4/epan/
  Changes    Path          Action
  +4 -1      uat.h         Modified

Directory: /trunk-1.4/gtk/
  Changes    Path              Action
  +3 -3      main_toolbar.c    Modified
  +2 -1      main_toolbar.h    Modified


(3 files not shown)