Wireshark · Wireshark-commits: [Wireshark-commits] rev 39927: /trunk-1.6/ /trunk-1.6/epan/dissectors/: packet-ieee80211.c packet-sn

[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/11/17 05:36 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r39719 | stig | 2011-11-02 13:06:40 -0700 (Wed, 02 Nov 2011) | 1 line
   Changed paths:
      M /trunk/gtk/dfilter_expr_dlg.c
 
   Revert revision 39665 (for bug 6472) which introduced bug 6537.
   ------------------------------------------------------------------------
   r39744 | stig | 2011-11-06 09:39:13 -0800 (Sun, 06 Nov 2011) | 6 lines
   Changed paths:
      M /trunk/epan/wslua/init_wslua.c
      M /trunk/epan/wslua/wslua.h
      M /trunk/epan/wslua/wslua_dumper.c
      M /trunk/epan/wslua/wslua_proto.c
      M /trunk/epan/wslua/wslua_tvb.c
      M /trunk/epan/wslua/wslua_util.c
 
   From Robert G. Jakabosky via bug 5575:
   Fix memory errors in Lua dissectors.
   - Free Tvb when created from ByteArray.
   - Free TvbRange correctly.
   - Free string from get_persconffile_path and get_datafile_path.
   - Some code cleanup.
   ------------------------------------------------------------------------
   r39748 | stig | 2011-11-06 23:41:03 -0800 (Sun, 06 Nov 2011) | 4 lines
   Changed paths:
      M /trunk/epan/wslua/wslua_proto.c
 
   Do not return from within a TRY/CATCH/ENDTRY because this will make the
   except stack invalid, and will lead to a crash.
 
   In this case it was when calling a dissector from a table in a Lua script.
   ------------------------------------------------------------------------
   r39777 | guy | 2011-11-09 16:53:48 -0800 (Wed, 09 Nov 2011) | 8 lines
   Changed paths:
      M /trunk/epan/prefs.c
 
   prefs_reset() has to reset the dissector preferences to their defaults,
   as we don't save to a preferences file preference values that are equal
   to their defaults, so if you change profiles, a preference that has a
   non-default value in the old profile and a default value in the new
   profile, so that it's *not* in the preference file for the new profile,
   will not be set to the right value unless we reset all protocol
   preferences to their defaults first.
   ------------------------------------------------------------------------
   r39831 | guy | 2011-11-14 10:42:11 -0800 (Mon, 14 Nov 2011) | 3 lines
   Changed paths:
      M /trunk/asn1/snmp/packet-snmp-template.c
      M /trunk/epan/dissectors/packet-snmp.c
 
   Do some more length checking to avoid a dissector bug error.  Should fix
   bug 6564.
   ------------------------------------------------------------------------
   r39834 | cmaynard | 2011-11-14 11:57:45 -0800 (Mon, 14 Nov 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ucp.c
 
   The Originator protocol identifier is not present in the "provisioning actions operation -61", only the "session management operatin -60".  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6570.
   ------------------------------------------------------------------------
 
 
 Copy over by hand:
 
   ------------------------------------------------------------------------
   r39749 | stig | 2011-11-07 08:09:41 -0800 (Mon, 07 Nov 2011) | 4 lines
   Changed paths:
      M /trunk/epan/ftypes/ftype-tvbuff.c
 
   Do not return from within a TRY/CATCH/ENDTRY because this will make the
   except stack invalid, and will lead to a crash.
 
   In this case it was when doing compare functions on a FT_PROTOCOL.
   ------------------------------------------------------------------------
   r39754 | alagoutte | 2011-11-08 06:45:35 -0800 (Tue, 08 Nov 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee80211.c
 
   From Pontus Fuchs via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6548
   80211 QoS Control: Add Raw TID
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                  Action
  +11 -1     packet-ieee80211.c    Modified
  +39 -5     packet-snmp.c         Modified
  +4 -2      packet-ucp.c          Modified

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

Directory: /trunk-1.6/epan/
  Changes    Path          Action
  +99 -2     prefs.c       Modified

Directory: /trunk-1.6/epan/ftypes/
  Changes    Path              Action
  +39 -56    ftype-tvbuff.c    Modified

Directory: /trunk-1.6/gtk/
  Changes    Path                  Action
  +2 -10     dfilter_expr_dlg.c    Modified

Directory: /trunk-1.6/asn1/snmp/
  Changes    Path                      Action
  +36 -2     packet-snmp-template.c    Modified

Directory: /trunk-1.6/
  Changes    Path            Action
  +2 -2      config.nmake    Modified
  +1 -1      configure.in    Modified


(6 files not shown)