[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/07/13 05:17 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r37663 | jake | 2011-06-13 13:29:51 -0700 (Mon, 13 Jun 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-q931.c
 
   Fix for bug 6009:
   Information transfer rate is a 7 bit field.
   ------------------------------------------------------------------------
   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
   ------------------------------------------------------------------------
 
 
 Copy over by hand:
 
   ------------------------------------------------------------------------
   r34840 | etxrab | 2010-11-10 23:34:07 -0800 (Wed, 10 Nov 2010) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-sflow.c
 
   From Andrew Feren:
   sflow decode error for some extended formats.
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5379
   ------------------------------------------------------------------------
   r37668 | alagoutte | 2011-06-15 02:01:04 -0700 (Wed, 15 Jun 2011) | 7 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee80211.c
 
   From Ali Bahar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6022
   802.11 Disassociation Packet's "Reason Code" field is imprecisely decoded/described
 
   From me :
   * Display Reason code in decimal (not Hexa)
   * Update list from last standard (802.11-2007 & 802.11n-2009)
   ------------------------------------------------------------------------
   r37681 | tuexen | 2011-06-16 00:33:24 -0700 (Thu, 16 Jun 2011) | 4 lines
   Changed paths:
      M /trunk/capture_opts.c
 
   Really print the rpcap username when logging, not
   the rpcap password.
   This only affects remote capturing.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path                   Action
  +41 -49    packet-ieee80211.c     Modified
  +1 -1      packet-ieee802154.h    Modified
  +1 -1      packet-q931.c          Modified
  +123 -138  packet-sflow.c         Modified

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

Directory: /trunk-1.4/epan/
  Changes    Path              Action
  +1 -2      column-utils.c    Modified

Directory: /trunk-1.4/
  Changes    Path              Action
  +1 -1      capture_opts.c    Modified

Directory: /trunk-1.4/epan/wslua/
  Changes    Path           Action
  +9 -10     wslua_tvb.c    Modified