[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2012/01/06 12:57 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r40172 | cmaynard | 2011-12-12 19:17:49 -0800 (Mon, 12 Dec 2011) | 2 lines
   Changed paths:
      M /trunk/tshark.c
 
   Add the -H and -W options to the "tshark -h" output.  Ref: http://www.wireshark.org/lists/wireshark-users/201112/msg00044.html
   ------------------------------------------------------------------------
   r40200 | sake | 2011-12-14 10:24:41 -0800 (Wed, 14 Dec 2011) | 5 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dtls.c
      M /trunk/epan/dissectors/packet-ssl.c
 
   Fix for bug 6032:
 
   After changing the ssl_keys UAT, reparse the list and reload the keys.
   ------------------------------------------------------------------------
   r40245 | cmaynard | 2011-12-19 09:59:34 -0800 (Mon, 19 Dec 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-tftp.c
 
   Tighten up conversation port matching once the 2nd port is known.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5727
   ------------------------------------------------------------------------
   r40274 | guy | 2011-12-22 01:22:35 -0800 (Thu, 22 Dec 2011) | 5 lines
   Changed paths:
      M /trunk/wiretap/5views.c
      M /trunk/wiretap/netmon.c
      M /trunk/wiretap/ngsniffer.c
      M /trunk/wiretap/snoop.c
 
   The encapsulation following WTAP_ENCAP_ARCNET is
   WTAP_ENCAP_ARCNET_LINUX; update various tables mapping Wiretap
   encapsulations to file-type encapsulations.  Get rid of some trailing
   "sorry, that's not supported" entries while we're at it.
   ------------------------------------------------------------------------
   r40281 | cmaynard | 2011-12-22 11:41:13 -0800 (Thu, 22 Dec 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-tcp.c
 
   Appease the buildbots.
   ------------------------------------------------------------------------
   r40304 | cmaynard | 2011-12-27 10:16:12 -0800 (Tue, 27 Dec 2011) | 2 lines
   Changed paths:
      M /trunk/file.c
 
   From Jim Young via bug 5580: Only update the time elapsed between the previous displayed packet and this packet if the packet is actually displayed.  Ref: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5580
   ------------------------------------------------------------------------
   r40316 | gerald | 2011-12-28 12:29:13 -0800 (Wed, 28 Dec 2011) | 3 lines
   Changed paths:
      M /trunk/Makefile.nmake
      M /trunk/docbook/wsdg_src/WSDG_chapter_quick_setup.xml
 
   Add "peflags" to the list of required executables. Use it to make sure
   the DLLs we use have DEP and ASLR enabled.
   ------------------------------------------------------------------------
   r40353 | stig | 2012-01-01 02:02:11 -0800 (Sun, 01 Jan 2012) | 1 line
   Changed paths:
      M /trunk/packaging/macosx/Info.plist.in
      M /trunk/version_info.c
 
   Happy New Year!
   ------------------------------------------------------------------------
   r40365 | gerald | 2012-01-03 16:37:14 -0800 (Tue, 03 Jan 2012) | 6 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ssl-utils.c
 
   Make sure each value in a GHashTable is unique. This avoids a
   double-free bug triggered by using the "any" address wildcard.
 
   Use g_malloc0 instead of zeroing elements by hand. Check for SSL_FAST
   the same way everywhere.
   ------------------------------------------------------------------------
   r40387 | cmaynard | 2012-01-05 09:29:27 -0800 (Thu, 05 Jan 2012) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-udp.c
 
   Use length field from UDP header as the pseudo-header's UDP length field instead of using the reported_len.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6711
   ------------------------------------------------------------------------
 
 
 Copy over by hand:
 
   ------------------------------------------------------------------------
   r40280 | cmaynard | 2011-12-22 11:22:43 -0800 (Thu, 22 Dec 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-tcp.c
 
   Revert some of the changes made as part of the patch from bug 6194 committed in r38326.  Also, change the 3 separate reserved bit fields to a single 3-bit reserved field to more closely match the spec.  Lastly, in accordance with NOTE 2 of Table 3-1 of the spec, display the connection id, whatever it is, rather than assuming it's zero just because the Com bit isn't set.
   ------------------------------------------------------------------------
   r40317 | gerald | 2011-12-28 14:37:38 -0800 (Wed, 28 Dec 2011) | 4 lines
   Changed paths:
      M /trunk/Makefile.nmake
      M /trunk/packaging/nsis/wireshark.nsi
 
   Simplify wireshark.nsi a bit by copying DLLs from the wireshark-gtk2
   directory.  This picks up any DEP/ASLR-related changes. Run peflags on
   more DLLs.
   ------------------------------------------------------------------------
   r40384 | etxrab | 2012-01-04 23:17:38 -0800 (Wed, 04 Jan 2012) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-csn1.c
 
   From Mike Morrin:
   Wrong tvb_get_bits function call in packet-csn1.c.
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6708
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                  Action
  +1 -3      packet-csn1.c         Modified
  +1 -1      packet-dtls.c         Modified
  +19 -24    packet-ssl-utils.c    Modified
  +1 -1      packet-ssl.c          Modified
  +78 -80    packet-tcp.c          Modified
  +9 -4      packet-tftp.c         Modified
  +2 -2      packet-udp.c          Modified

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

Directory: /trunk-1.6/packaging/macosx/
  Changes    Path             Action
  +2 -2      Info.plist.in    Modified

Directory: /trunk-1.6/packaging/nsis/
  Changes    Path             Action
  +43 -52    wireshark.nsi    Modified


(9 files not shown)