[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/10/24 04:43 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r39158 | guy | 2011-09-26 13:33:35 -0700 (Mon, 26 Sep 2011) | 18 lines
   Changed paths:
      M /trunk/plugins/profinet/packet-pn-rt.c
 
   Use ENC_ values in proto_tree_add_item() calls.
 
   Get rid of the code that attempts to deal with the FCS; if the
   link-layer dissector hasn't removed the FCS, either:
 
   	1) the link-layer dissector is buggy and should be fixed;
 
   or
 
   	2) the link-layer dissector doesn't know whether there's an FCS
   	   and you have to tell it by setting a preference (and if there
   	   is no such preference, one needs to be added).
 
   The code in question was causing errors when the link-layer dissector
   was removing the FCS when it's known to be present, as it should do.
 
   Get rid of 4-space tabs in favor of spaces.
   ------------------------------------------------------------------------
   r39162 | guy | 2011-09-26 14:48:54 -0700 (Mon, 26 Sep 2011) | 6 lines
   Changed paths:
      M /trunk/plugins/profinet/packet-pn-rt.c
 
   More white space cleanup.
 
   We need the PDU length to find stuff at the end; use
   tvb_reported_length(), *not* tvb_length(), to get it, so we're not
   confused by a snapshot length.  Rename it "pdu_len" to make that clear.
   ------------------------------------------------------------------------
   r39188 | wmeier | 2011-09-29 14:47:01 -0700 (Thu, 29 Sep 2011) | 8 lines
   Changed paths:
      M /trunk/AUTHORS
      M /trunk/epan/dissectors/packet-mysql.c
 
   From András Veres-Szentkirályi: Added cursor type decoding to MySQL dissector
 
   "The current MySQL dissector treats the exec_flags field as unused, however
   since MySQL 5.0, this field is used to indicate the type of the cursor as it
   can be read at
   http://forge.mysql.com/wiki/MySQL_Internals_ClientServer_Protocol#Execute_Packet_.28Tentative_Description.29
   ------------------------------------------------------------------------
   r39213 | stig | 2011-10-02 06:39:15 -0700 (Sun, 02 Oct 2011) | 1 line
   Changed paths:
      M /trunk/gtk/about_dlg.c
 
   Always update splash screen when action has changed.
   ------------------------------------------------------------------------
   r39214 | stig | 2011-10-02 06:39:35 -0700 (Sun, 02 Oct 2011) | 2 lines
   Changed paths:
      M /trunk/epan/epan.c
      M /trunk/epan/wslua/init_wslua.c
      M /trunk/epan/wslua/wslua.h
      M /trunk/gtk/about_dlg.c
      M /trunk/register.h
 
   Added register action for loading Lua plugins.
   Removed an unused argument to wslua_init().
   ------------------------------------------------------------------------
   r39221 | stig | 2011-10-02 09:19:55 -0700 (Sun, 02 Oct 2011) | 6 lines
   Changed paths:
      M /trunk/epan/proto.c
      M /trunk/epan/wspython/wspy_register.c
      M /trunk/epan/wspython/wspy_register.h
      M /trunk/gtk/about_dlg.c
      M /trunk/register.h
 
   Removed the protocol registration updates in the splash screen for Python
   dissectors, because it does not work as expected and causes an assert.
 
   Added generic splash updates for python register and handoff instead.
 
   This should fix bug 5431.
   ------------------------------------------------------------------------
   r39234 | etxrab | 2011-10-02 22:13:53 -0700 (Sun, 02 Oct 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ipsec-udp.c
 
   From David Mueller:
   Incorrect identification of UDP-encapsulated NAT-keepalive packets.
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6414
   ------------------------------------------------------------------------
   r39248 | stig | 2011-10-04 03:12:55 -0700 (Tue, 04 Oct 2011) | 3 lines
   Changed paths:
      M /trunk/epan/proto.c
      M /trunk/epan/proto.h
 
   Add proto_unregister_field().
 
   This can be used to unregister fields registered in dissector UAT's.
   ------------------------------------------------------------------------
   r39251 | stig | 2011-10-04 11:40:56 -0700 (Tue, 04 Oct 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-http.c
 
   Unregister and delete allocated header fields when updating the UAT.
   Avoid double loading the UAT.
   Use the post update callback in uat_new for regenerating header_fields_hash.
   ------------------------------------------------------------------------
   r39258 | stig | 2011-10-04 14:06:20 -0700 (Tue, 04 Oct 2011) | 1 line
   Changed paths:
      M /trunk/epan/dissectors/packet-http.c
 
   Free duplicated strings in hf entries.
   ------------------------------------------------------------------------
   r39267 | stig | 2011-10-05 04:44:19 -0700 (Wed, 05 Oct 2011) | 2 lines
   Changed paths:
      M /trunk/epan/proto.c
 
   Use g_tree_steal to remove an entry without calling the destroy function.
   This because we use the destroy function to determine same_name_hfinfo.
   ------------------------------------------------------------------------
   r39268 | stig | 2011-10-05 04:44:29 -0700 (Wed, 05 Oct 2011) | 1 line
   Changed paths:
      M /trunk/epan/dissectors/packet-http.c
 
   Cleanup the unregister loop to avoid freeing wrong data.
   ------------------------------------------------------------------------
   r39266 | etxrab | 2011-10-04 22:53:53 -0700 (Tue, 04 Oct 2011) | 3 lines
   Changed paths:
      M /trunk/gtk/main.c
      M /trunk/gtk/simple_dialog.c
      M /trunk/simple_dialog.h
 
   Michael Mann:
   Removed the Save button if live capture is going on when File->Quit is selected. Solves Assertion failed when doing File->Quit->Save during live capture
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1710
   ------------------------------------------------------------------------
   r39277 | cmaynard | 2011-10-05 13:28:50 -0700 (Wed, 05 Oct 2011) | 2 lines
   Changed paths:
      M /trunk/tap-iousers.c
 
   In iousers_init(), compare "conv,ipv6" before "conv,ip" and be sure to compare all 9 characters of that string instead of only 7.  Also correct the offset when looking for a possible comma followed by an optional filter.
   ------------------------------------------------------------------------
   r39297 | etxrab | 2011-10-06 12:07:26 -0700 (Thu, 06 Oct 2011) | 3 lines
   Changed paths:
      M /trunk/asn1/s1ap/packet-s1ap-template.c
      M /trunk/epan/dissectors/packet-s1ap.c
 
   Typo FT_IPv4 isf FT_IPv6.
   Fixes
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6435
   ------------------------------------------------------------------------
   r39304 | morriss | 2011-10-07 06:53:43 -0700 (Fri, 07 Oct 2011) | 5 lines
   Changed paths:
      M /trunk/epan/libwireshark.def
 
   As suggested/requested in
   http://ask.wireshark.org/questions/6756/linking-error-with-str_to_str :
 
   Add str_to_str to the list of exported functions.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                  Action
  +36 -64    packet-http.c         Modified
  +3 -3      packet-ipsec-udp.c    Modified
  +37 -3     packet-mysql.c        Modified
  +1 -1      packet-s1ap.c         Modified

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

Directory: /trunk-1.6/epan/
  Changes    Path                Action
  +1 -1      epan.c              Modified
  +1 -0      libwireshark.def    Modified
  +34 -2     proto.c             Modified
  +6 -0      proto.h             Modified

Directory: /trunk-1.6/gtk/
  Changes    Path               Action
  +18 -2     about_dlg.c        Modified
  +9 -7      main.c             Modified


(11 files not shown)