[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/07/11 03:22 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r37756 | stig | 2011-06-22 13:15:34 -0700 (Wed, 22 Jun 2011) | 4 lines
   Changed paths:
      M /trunk/epan/column-utils.c
 
   Don't assert on invalid custom columns, just set as invalid/unknown.
 
   This fixes bug 6028.
   ------------------------------------------------------------------------
   r37760 | stig | 2011-06-23 03:28:53 -0700 (Thu, 23 Jun 2011) | 5 lines
   Changed paths:
      M /trunk/epan/wslua/wslua_tvb.c
 
   Rename Tvb_tvb to TvbRange_tvb, as it's a TvbRange function.
   Documentation is generated from code.
 
   This fixes bug 5006.
   ------------------------------------------------------------------------
   r37761 | stig | 2011-06-23 03:43:49 -0700 (Thu, 23 Jun 2011) | 5 lines
   Changed paths:
      M /trunk/epan/wslua/wslua_tvb.c
 
   Rename Tvb_new_real to ByteArray_tvb, as it's a ByteArray function.
   Documentation is generated from code.
 
   This fixes bug 5199.
   ------------------------------------------------------------------------
   r37763 | stig | 2011-06-23 04:06:34 -0700 (Thu, 23 Jun 2011) | 4 lines
   Changed paths:
      M /trunk/epan/wslua/wslua_tvb.c
 
   From Tony Trinh via bug 5960:
   Fix TvbRange:string() so that it returns a string that contains all bytes
   of the range, including zeroes (instead of being truncated at first zero).
   ------------------------------------------------------------------------
   r37771 | wmeier | 2011-06-23 08:40:34 -0700 (Thu, 23 Jun 2011) | 11 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee802154.h
 
   From Ivan Lawrow: GTS Descriptor count is a 3 bit field;
 
   The IEEE 802.15.4 GTS descriptor count is a 3-bit field (see page 144
   of attached spec).
 
   The mask for this field is incorrectly defined as a 2-bit field in
   epan/dissectors/packet-ieee802154.h line 74:
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6055
   ------------------------------------------------------------------------
   r37779 | cmaynard | 2011-06-23 19:35:46 -0700 (Thu, 23 Jun 2011) | 6 lines
   Changed paths:
      M /trunk/gtk/main.c
 
   Make Wireshark portable to all locales by calling setlocale().  This, along with my previous commits in revisions 36160 and 36166 ought to fix the problem that Bartosz Kiziukiewicz first reported on the wireshark-users mailing list here:
 
       http://www.wireshark.org/lists/wireshark-users/201103/msg00018.html
 
   (I successfully generated Wireshark compare statistics after applying this change and also changing my locale to Polish.)
   ------------------------------------------------------------------------
   r37780 | cmaynard | 2011-06-23 19:45:23 -0700 (Thu, 23 Jun 2011) | 2 lines
   Changed paths:
      M /trunk/tap-comparestat.c
 
   Print the filter string, if one was specified, just like Wireshark does.
   ------------------------------------------------------------------------
   r37783 | stig | 2011-06-25 07:58:06 -0700 (Sat, 25 Jun 2011) | 8 lines
   Changed paths:
      M /trunk/epan/proto.c
 
   Make guy's fix in revision 37236 actually work:
   "You cannot just make the "len" field of a GByteArray larger, if there's
   no data to back that length; you can only make it smaller."
 
   Two equal values are always equal!
 
   This fixes bug 5941.
   ------------------------------------------------------------------------
   r37784 | stig | 2011-06-25 08:21:17 -0700 (Sat, 25 Jun 2011) | 3 lines
   Changed paths:
      M /trunk/epan/range.c
 
   From Tony Trinh via bug 5895:
   Add sanity checks in range.c
   ------------------------------------------------------------------------
   r37785 | stig | 2011-06-25 08:24:55 -0700 (Sat, 25 Jun 2011) | 3 lines
   Changed paths:
      M /trunk/epan/wslua/wslua_proto.c
 
   From Tony Trinh via bug 5894:
   Added argument validation to Pref.range.
   ------------------------------------------------------------------------
   r37786 | stig | 2011-06-25 08:42:41 -0700 (Sat, 25 Jun 2011) | 5 lines
   Changed paths:
      M /trunk/epan/wslua/wslua_proto.c
 
   Remove "range" from Lua's Pref.range(), as this value shall be fetched from
   the "default".
 
   This fixes bug 5896.
   ------------------------------------------------------------------------
   r37787 | stig | 2011-06-25 12:39:16 -0700 (Sat, 25 Jun 2011) | 4 lines
   Changed paths:
      M /trunk/epan/wslua/wslua_proto.c
 
   Added check for invalid chars in abbrev in ProtoField functions.
 
   This fixes bug 5569.
   ------------------------------------------------------------------------
   r37788 | stig | 2011-06-25 13:47:13 -0700 (Sat, 25 Jun 2011) | 6 lines
   Changed paths:
      M /trunk/epan/wslua/wslua_gui.c
 
   From Tony Trinh via bug 6018:
   Add NULL checks and fix typos in Lua error print-outs
 
   From me:
   Use the error message "GUI not available" when using GUI functions in tshark.
   ------------------------------------------------------------------------
   r37238 | rbalint | 2011-05-18 06:08:02 -0700 (Wed, 18 May 2011) | 3 lines
   Changed paths:
      M /trunk/gtk/main_welcome.c
 
   Refer to "Capture Help" as "Capture Help below" when there are no interfaces
   to capture on.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                   Action
  +1 -1      packet-ieee802154.h    Modified

Directory: /trunk-1.6/docbook/
  Changes    Path                 Action
  +57 -21    release-notes.xml    Modified

Directory: /trunk-1.6/epan/
  Changes    Path              Action
  +1 -2      column-utils.c    Modified
  +1 -1      proto.c           Modified
  +13 -2     range.c           Modified

Directory: /trunk-1.6/gtk/
  Changes    Path              Action
  +3 -0      main.c            Modified
  +1 -1      main_welcome.c    Modified

Directory: /trunk-1.6/
  Changes    Path                 Action
  +1 -1      tap-comparestat.c    Modified

Directory: /trunk-1.6/epan/wslua/
  Changes    Path             Action
  +63 -16    wslua_gui.c      Modified
  +24 -5     wslua_proto.c    Modified
  +9 -10     wslua_tvb.c      Modified