[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/10/29 10:55 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r52662 | mmann | 2013-10-17 13:54:42 -0700 (Thu, 17 Oct 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dns.c
 
   Bugfix an apparent typo in edns0 "Higher bits in extended RCODE".  Bug 9199 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9199).
 
   #BACKPORT(1.10)
   ------------------------------------------------------------------------
   r52679 | mmann | 2013-10-18 14:17:01 -0700 (Fri, 18 Oct 2013) | 5 lines
   Changed paths:
      M /trunk/epan/stats_tree.c
      M /trunk/plugins/stats_tree/pinfo_stats_tree.c
 
   Don't allow invalid ranges to be specified for the stats tree. Bug 9130 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9130)
 
   Not sure which memory allocation should be used here (using wmem caused crash), but this revision can at least be easily backported to 1.10 where the bug was reported.
 
   Also allow a single number to be used in the stats range since it's considered a valid "range" by the UAT.
   ------------------------------------------------------------------------
   r52357 | martink | 2013-10-04 05:52:36 -0700 (Fri, 04 Oct 2013) | 5 lines
   Changed paths:
      M /trunk/ui/gtk/uat_gui.c
 
   in a uat dialogue, allow only one popup for confirming a deletion of an
   element
 
   this should at least partially fix bug 9129
   ------------------------------------------------------------------------
   r52683 | mmann | 2013-10-18 19:45:01 -0700 (Fri, 18 Oct 2013) | 3 lines
   Changed paths:
      M /trunk/ui/gtk/uat_gui.c
 
   Only allow one popup dialog in UAT dialog.  Editing/copying/deleting can modify the uat list and other open dialogs will not be aware of it and lead to unexpected behavior (including crashes).  Fixes bug 9129 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9129)
 
   #BACKPORT(1.10)
   ------------------------------------------------------------------------
   r52733 | mmann | 2013-10-21 08:46:13 -0700 (Mon, 21 Oct 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dcerpc-ndr.c
 
   Fix padding bytes overlapping due to NDR alignment.  Bug 9300 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9300)
 
   From Matthieu Patou
   ------------------------------------------------------------------------
   r52734 | mmann | 2013-10-21 08:50:23 -0700 (Mon, 21 Oct 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dcerpc-nt.c
 
   Datablob size is NDR64/32 dependant.  Bug 9301 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9301).
 
   From Matthieu Patou
   ------------------------------------------------------------------------
   r52735 | mmann | 2013-10-21 08:58:52 -0700 (Mon, 21 Oct 2013) | 1 line
   Changed paths:
      M /trunk/epan/dissectors/packet-dcerpc-nt.c
 
   Fix compile errors introduced in r52734.
   ------------------------------------------------------------------------
   r52736 | mmann | 2013-10-21 09:00:37 -0700 (Mon, 21 Oct 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dcerpc.c
 
   dce-rpc: properly dissect multiple PDU in the same packet. Bug 9302 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9302).
 
   From Matthieu Patou
   ------------------------------------------------------------------------
   r52738 | cmaynard | 2013-10-21 10:31:22 -0700 (Mon, 21 Oct 2013) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-eth.c
      M /trunk/epan/dissectors/packet-ethertype.c
 
   Remove if (fh_tree) checks as add_ethernet_trailer() calls such functions as dissector_try_heuristic(),  expert_add_info(), and col_append_str(), which all need to be called whether fh_tree is NULL or not.
 
   #BACKPORT(1.10,1.8)
   ------------------------------------------------------------------------
   r52838 | cmaynard | 2013-10-25 05:51:16 -0700 (Fri, 25 Oct 2013) | 4 lines
   Changed paths:
      M /trunk/tshark.c
 
   Display the frame number on the packet summary line if it's one of the configured columns.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9317
 
   #BACKPORT(1.10,1.8)
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.10/epan/dissectors/
  Changes    Path                   Action
  +1 -1      packet-dcerpc-ndr.c    Modified
  +4 -4      packet-dcerpc-nt.c     Modified
  +15 -13    packet-dcerpc.c        Modified
  +1 -1      packet-dns.c           Modified
  +1 -1      packet-eth.c           Modified
  +0 -3      packet-ethertype.c     Modified

Directory: /trunk-1.10/docbook/
  Changes    Path                      Action
  +18 -0     release-notes.asciidoc    Modified

Directory: /trunk-1.10/epan/
  Changes    Path            Action
  +18 -19    stats_tree.c    Modified

Directory: /trunk-1.10/ui/gtk/
  Changes    Path          Action
  +36 -1     uat_gui.c     Modified

Directory: /trunk-1.10/plugins/stats_tree/
  Changes    Path                  Action
  +13 -1     pinfo_stats_tree.c    Modified


(1 file not shown)