[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/09/01 04:27 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r38268 | etxrab | 2011-07-30 02:33:10 -0700 (Sat, 30 Jul 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-gtpv2.c
 
   CCRSI is not included in 3GPP 29.274 R8.
   Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6183
   ------------------------------------------------------------------------
   r38269 | stig | 2011-07-30 02:52:40 -0700 (Sat, 30 Jul 2011) | 1 line
   Changed paths:
      M /trunk/epan/dissectors/packet-gtpv2.c
 
   Fix a typo.
   ------------------------------------------------------------------------
   r38286 | etxrab | 2011-07-31 06:25:13 -0700 (Sun, 31 Jul 2011) | 2 lines
   Changed paths:
      M /trunk/tap-rtp-common.c
 
   Use pinfo->iphdrlen rather than a fixed vaue of 20 to make
   the calculation correct for IPv6 too.
   ------------------------------------------------------------------------
   r38299 | stig | 2011-08-01 05:38:58 -0700 (Mon, 01 Aug 2011) | 4 lines
   Changed paths:
      M /trunk/config.h.win32
      M /trunk/epan/except.c
      M /trunk/gtk/main.c
 
   Another fix for building with MSVC2005.
 
   The previous fixes in r37728 and r37730 did build a wireshark which was
   unable to use the native windows file dialog (GetOpenFileName).
   ------------------------------------------------------------------------
   r38303 | cmaynard | 2011-08-01 18:54:03 -0700 (Mon, 01 Aug 2011) | 4 lines
   Changed paths:
      M /trunk/AUTHORS
      M /trunk/asn1/snmp/packet-snmp-template.c
 
   From Paul Stath via bug 5731:  The check for engineID length should only occur if the engineID has a non-zero length.
 
   Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5731
   ------------------------------------------------------------------------
   r38304 | etxrab | 2011-08-01 21:17:45 -0700 (Mon, 01 Aug 2011) | 1 line
   Changed paths:
      M /trunk/epan/dissectors/packet-snmp.c
 
   Gnenerate the dissector for previous commit.
   ------------------------------------------------------------------------
   r38326 | gerald | 2011-08-03 12:11:07 -0700 (Wed, 03 Aug 2011) | 15 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-tcp.c
 
   From Dirk Jagdmann via bug 6194:
 
   The attachted patch fixes and enhances the SCPS TCP option dissection. Changes
   are:
 
   - fix order of reserved Bit 1,2,3
   - fix minimum TCP option length
   - fix proto items
   - add proto item for Connection ID
   - removed the verify_scps() function. It's logic was broken, because it did
   reset the scps_capable flag on both flows if one of them did not have it.
   However sometimes that flag is only enabled in one flow direction and that flow
   direction could see TCP options later on, which would get dissected as invalid.
   See the attachted capture file for an example.
   ------------------------------------------------------------------------
   r38331 | stig | 2011-08-04 03:02:37 -0700 (Thu, 04 Aug 2011) | 1 line
   Changed paths:
      M /trunk/epan/dissectors/packet-tcp.c
 
   Removed a debug printf.
   ------------------------------------------------------------------------
   r38340 | cmaynard | 2011-08-04 13:20:51 -0700 (Thu, 04 Aug 2011) | 2 lines
   Changed paths:
      M /trunk/make-version.pl
 
   Don't report svn version if not building from svn.  Change prompted by http://ask.wireshark.org/questions/5376/wireshark-161-title-shows-svn-rev-unknown-from-unknown.
   ------------------------------------------------------------------------
   r38397 | etxrab | 2011-08-07 13:08:08 -0700 (Sun, 07 Aug 2011) | 1 line
   Changed paths:
      M /trunk/epan/gcp.c
 
   g_ascii_strdown Returns a newly-allocated string.
   ------------------------------------------------------------------------
   r38399 | cmaynard | 2011-08-07 13:50:31 -0700 (Sun, 07 Aug 2011) | 3 lines
   Changed paths:
      M /trunk/asn1/h225/h225.cnf
      M /trunk/epan/dissectors/packet-h225.c
 
   Fix bug 5848, "https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5848";, which was apparently introduced with r27287 (http://anonsvn.wireshark.org/viewvc/trunk/epan/dissectors/packet-h225.c?r1=26698&r2=27287).  Regenerate the packet-h225.c dissector.  Patch from ericn1234@xxxxxxxxx.
   Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5848
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path              Action
  +7 -2      packet-gtpv2.c    Modified
  +57 -53    packet-h225.c     Modified
  +1 -1      packet-snmp.c     Modified
  +53 -68    packet-tcp.c      Modified

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

Directory: /trunk-1.6/epan/
  Changes    Path          Action
  +4 -0      except.c      Modified
  +3 -2      gcp.c         Modified

Directory: /trunk-1.6/gtk/
  Changes    Path          Action
  +4 -0      main.c        Modified

Directory: /trunk-1.6/asn1/h225/
  Changes    Path          Action
  +4 -0      h225.cnf      Modified

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


(4 files not shown)