[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2012/03/14 11:55 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r37752 | etxrab | 2011-06-22 07:49:26 -0700 (Wed, 22 Jun 2011) | 1 line
   Changed paths:
      M /trunk/epan/dissectors/packet-gsm_a_gm.c
 
   Protect the columns from beeing overwritten.
   ------------------------------------------------------------------------
   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.
   ------------------------------------------------------------------------
   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.
   ------------------------------------------------------------------------
   r40547 | wmeier | 2012-01-16 11:05:32 -0800 (Mon, 16 Jan 2012) | 2 lines
   Changed paths:
      M /trunk/plugins/mate/mate.h
      M /trunk/plugins/mate/mate_runtime.c
      M /trunk/plugins/mate/mate_util.c
      M /trunk/plugins/mate/mate_util.h
 
   Use GSlice API instead of GMemChunk API for some memory allocation.
   ------------------------------------------------------------------------
   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.
   ------------------------------------------------------------------------
   r40702 | etxrab | 2012-01-24 11:23:05 -0800 (Tue, 24 Jan 2012) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-gtp.c
 
   max_ul_ext isn't printed/decoded to the packet details log in GTP protocol packet.(Wrong length check)
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6761
   ------------------------------------------------------------------------
   r40873 | etxrab | 2012-02-05 10:25:01 -0800 (Sun, 05 Feb 2012) | 5 lines
   Changed paths:
      M /trunk/asn1/goose/packet-goose-template.c
      M /trunk/epan/dissectors/packet-goose.c
 
   GOOSE Messages don't use the length field to perform the dissection.
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6734
 
    #BACKPORT:YES
   ------------------------------------------------------------------------
   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:
 
   ------------------------------------------------------------------------
   r40615 | cmaynard | 2012-01-20 13:20:53 -0800 (Fri, 20 Jan 2012) | 2 lines
   Changed paths:
      M /trunk/ui/gtk/drag_and_drop.c
 
   Convert forward slashes in URI to backslashes if WIN32.  Patch from Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5237
   ------------------------------------------------------------------------
   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.
   ------------------------------------------------------------------------
   r40730 | cmaynard | 2012-01-26 07:51:05 -0800 (Thu, 26 Jan 2012) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-wsp.c
 
   Fix memory leaks involving tvb_get_stringz() by replacing it with tvb_get_ephemeral_stringz().
   ------------------------------------------------------------------------
   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.
   ------------------------------------------------------------------------
   r40937 | etxrab | 2012-02-08 11:56:48 -0800 (Wed, 08 Feb 2012) | 8 lines
   Changed paths:
      M /trunk/ui/gtk/main_menubar.c
 
   From a.piesk:
   no menu item Fle->Export->SSL Session Keys in GTK
   Ported to 1.7 by me.
 
   #BACKPORT
   Use the patch in the bug report.
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6813
   ------------------------------------------------------------------------
   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.
   ------------------------------------------------------------------------
   r40952 | morriss | 2012-02-10 15:08:46 -0800 (Fri, 10 Feb 2012) | 13 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dtls.c
      M /trunk/epan/dissectors/packet-ssl.c
 
   Fix via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6817 :
 
   r40200 made ssl_parse()/dtls_parse() post-update-callbacks for those
   dissector's UATs so that the dissector would be updated when the user changed
   the UAT.  (This allows SSL/DTLS keys to be taken into account without requiring
   Wireshark to be restarted.)
 
   But, those functions also update the UAT themselves if the old-style keys_list
   preference is used, creating an infinite recursion.
 
   Fix this by splitting the *_parse() functions into two: one for the UAT and one
   for the old-style keys list.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                 Action
  +36 -23    packet-dtls.c        Modified
  +27 -33    packet-goose.c       Modified
  +3 -0      packet-gsm_a_gm.c    Modified
  +4 -3      packet-gtp.c         Modified
  +1 -1      packet-iax2.c        Modified
  +3 -2      packet-mysql.c       Modified
  +4 -0      packet-packetbb.c    Modified
  +4 -0      packet-pgm.c         Modified
  +23 -15    packet-ssl.c         Modified
  +8 -2      packet-tcp.c         Modified
  +11 -10    packet-tcp.h         Modified


(15 files not shown)