[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/07/14 12:23 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r37816 | stig | 2011-06-28 08:18:21 -0700 (Tue, 28 Jun 2011) | 4 lines
   Changed paths:
      M /trunk/capinfos.c
 
   From Jose Pedro Oliveira via bug 5803:
   #ifdef HAVE_LIBGCRYPT block includes a line too many.
   "Fixes 2nd instance of the problem"
   ------------------------------------------------------------------------
   r37828 | stig | 2011-06-29 00:02:04 -0700 (Wed, 29 Jun 2011) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-rpcap.c
 
   Strengthen heuristics for Packets.
 
   This fixes bug 6073.
   ------------------------------------------------------------------------
   r37854 | cmaynard | 2011-07-01 12:17:02 -0700 (Fri, 01 Jul 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-tcp.c
 
   I decode_tcp_ports(), don't abort processing zero window probe packets, even if the payload is only a single byte.  Also, for the keep-alives, display any payload that might be present.
   ------------------------------------------------------------------------
   r37895 | stig | 2011-07-04 14:14:43 -0700 (Mon, 04 Jul 2011) | 1 line
   Changed paths:
      M /trunk/make-version.pl
 
   Fetch svn revision also when checked out with git-svn.
   ------------------------------------------------------------------------
   r37923 | cmaynard | 2011-07-06 09:03:43 -0700 (Wed, 06 Jul 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-wsp.c
 
   Fix memory leak, using ep_alloc() instead of g_malloc().
   ------------------------------------------------------------------------
   r37955 | etxrab | 2011-07-10 15:13:03 -0700 (Sun, 10 Jul 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-msrp.c
 
   From Jaap:
   Limit the search to the line.
   ------------------------------------------------------------------------
   r37957 | cmaynard | 2011-07-10 17:17:08 -0700 (Sun, 10 Jul 2011) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-giop.c
 
   As noted by Jaap Keuter on -dev, be sure to use message_size instead of
   header->message_size for a correct host endianness comparison.
   ------------------------------------------------------------------------
 
 
 Copy over by hand:
 
   ------------------------------------------------------------------------
   r37842 | stig | 2011-06-30 02:31:11 -0700 (Thu, 30 Jun 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-rpcap.c
 
   Avoid absurdly large values used in for-loops.
   ------------------------------------------------------------------------
   r37853 | cmaynard | 2011-07-01 12:00:14 -0700 (Fri, 01 Jul 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-tcp.c
 
   Initialize the TCP windows to the maximum value instead of 0 to avoid false zero window conditions, especially at the beginning of a capture or if only one side of a conversation is captured.  This resolves bug 4716: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4716.
   ------------------------------------------------------------------------
   r37893 | etxrab | 2011-07-04 13:43:29 -0700 (Mon, 04 Jul 2011) | 14 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-isup.c
 
   From Christopher Maynard:
   From doc/README.tapping:
 
   IF the tap is going to return private data using the last parameter to
   tap_queue_packet() and IF the protocol can appear multiple times inside the
   same packet, you will have to make sure that each instance of
   tap_queue_packet() is using its own instance of private struct variable
   so they don't overwrite each other.
 
   This was the case here, so I changed the static allocation of tap_rec to be
   ep_alloc'd.  I also tried to clean up the Info column a bit.  With this patch
   applied, the graph now shows the APM and ANM correctly instead of 2 ANM's.
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5966
   ------------------------------------------------------------------------
   r37927 | alagoutte | 2011-07-07 03:19:02 -0700 (Thu, 07 Jul 2011) | 8 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee80211.c
 
   From Ali Bahar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6093
   802.11 Association Response Packet's "Status Code" field is imprecisely decoded/described.
 
   From me :
   * Display Reason code in decimal (not Hexa)
   * Check list from last standard (802.11-2007, 802.11r-2008, 802.11n-2009, 802.11w-2009 & 802.11z-2011)
   * Add link to 802.11z-2010 documentation
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path                  Action
  +1 -1      packet-giop.c         Modified
  +73 -75    packet-ieee80211.c    Modified
  +2 -2      packet-msrp.c         Modified
  +46 -31    packet-rpcap.c        Modified
  +15 -12    packet-tcp.c          Modified
  +1 -1      packet-wsp.c          Modified

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

Directory: /trunk-1.4/
  Changes    Path               Action
  +1 -1      capinfos.c         Modified
  +8 -1      make-version.pl    Modified