[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/10/24 01:47 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r38301 | jmayer | 2011-08-01 07:48:19 -0700 (Mon, 01 Aug 2011) | 2 lines
   Changed paths:
      M /trunk/epan/libwireshark.def
 
   Add tvb_get_bits
   ------------------------------------------------------------------------
   r38948 | cmaynard | 2011-09-08 19:11:53 -0700 (Thu, 08 Sep 2011) | 3 lines
   Changed paths:
      M /trunk/gtk/conversations_table.c
 
   Fix locale problem with "Rel Start" time, both with display and copy to CSV, by replacing rel_time_to_secs_str() with nstime_to_sec().  Problem reported on ask by packethunter.
   Ref: http://ask.wireshark.org/questions/6207/decimal-point-vs-decimal-comma
   ------------------------------------------------------------------------
   r38949 | etxrab | 2011-09-08 22:16:39 -0700 (Thu, 08 Sep 2011) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-stun.c
 
   From Ken Cox:
   The change causes dissect_stun_message() to pass control to subdissectors when 'tree' is NULL.
   Part of the patch from
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6322
   ------------------------------------------------------------------------
   r38950 | etxrab | 2011-09-08 22:23:43 -0700 (Thu, 08 Sep 2011) | 11 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-rtp.c
 
   	/* Get the fields in the second octet */
   	octet2 = tvb_get_guint8( tvb, offset + 1 );
   	payload_type = RTP_PAYLOAD_TYPE( octet2 );
 
   	/* Check for a sensible payload type
   	   (recognised static and preferred dynamic ranges) */
   	if ((payload_type <= PT_H263) ||
   		/* Alex Lindberg - Modified range to use RTP Type Names */
   	    (payload_type >= PT_UNDF_96 && payload_type <= PT_UNDF_127)) {
 
   evaluates to allways trye as far as I can tell.
   ------------------------------------------------------------------------
   r38953 | wmeier | 2011-09-09 13:37:49 -0700 (Fri, 09 Sep 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-rtp.c
 
   Don't do heuristic check for 'dstport being even' if checking for rtp over stun.
   See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6322
   ------------------------------------------------------------------------
   r38956 | wmeier | 2011-09-09 14:23:27 -0700 (Fri, 09 Sep 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-rtp.c
 
   Fix compile error: remove forward declaration.
   ------------------------------------------------------------------------
   r38951 | stig | 2011-09-09 10:29:20 -0700 (Fri, 09 Sep 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-csn1.c
 
   From Sylvain Munaut via bug 6328:
   Fix bug in CSN_CHOICE implentation preventing subtree processing
   ------------------------------------------------------------------------
   r38967 | etxrab | 2011-09-11 12:54:11 -0700 (Sun, 11 Sep 2011) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dtn.c
 
   From Michael Mann:
   Extend 64-bit SDNV decoding to Administrative Records.
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4109
   ------------------------------------------------------------------------
   r38977 | wmeier | 2011-09-12 08:44:45 -0700 (Mon, 12 Sep 2011) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-bacapp.c
 
   From Danny Breton: Property name time-synchronization-interval(204) is incorrectly shown as time-synchronization-recipents.
 
   See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6336
   ------------------------------------------------------------------------
   r38990 | guy | 2011-09-13 14:17:45 -0700 (Tue, 13 Sep 2011) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-eth.c
 
   Always pass the FCS length to dissect_802_3() and ethertype(), so it
   will process the FCS if it's known to be present and will attempt to
   guess whether it's present if it's not known not to be present.
   ------------------------------------------------------------------------
   r39017 | etxrab | 2011-09-15 13:02:19 -0700 (Thu, 15 Sep 2011) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-per.c
 
   From Pascal Quantin:
   Incorrect decoding of BIT STRING type
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6347
   ------------------------------------------------------------------------
   r39024 | etxrab | 2011-09-15 22:16:18 -0700 (Thu, 15 Sep 2011) | 16 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee80211.c
 
   From Jouni Malinen:
   If the GAS Query Request/Response Length field is incorrect, the
   dissector function may return a value that is larger than the remaining
   packet buffer. This results in a Tagged parameters item being added with
   -1 byte length since tvb_reported_length_remaining() reports -1 once the
   offset goes beyond the end of the packet. Clicking on that item results
   in Wireshark dying on Gtk-ERROR. Note: this does not show up in tshark
   and as such, cannot apparently be triggered with fuzz-test.sh.
 
   Fix this by refusing to dissect GAS frames that have too large length
   field value. In addition, verify that tvb_reported_length_remaining() is
   returning a value larger than 0 instead of non-zero (which could be -1)
   to make the IEEE 802.11 dissector more robust against this type of
   issues.
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6345
   ------------------------------------------------------------------------
 
 
 Copy over by hand:
 
   ------------------------------------------------------------------------
   r38933 | morriss | 2011-09-07 18:53:41 -0700 (Wed, 07 Sep 2011) | 22 lines
   Changed paths:
      M /trunk/Makefile.am
      M /trunk/make-version.pl
 
   Revert rev 38340 (which was itself a reversion of 34807): if we can't find the
   SVN version, indicate that the SVN version is unknown.  This puts back the fix
   for bug 1413.
 
   Add a new version.conf option for make-version which tell is "this is a build
   from a release tarball."  When that option is present do not try to use SVN
   to determine the SVN version, just use whatever SVN information shipped in the
   tarball.
 
   If version.conf is present in the source tree (as it is only in the release
   branches), deliver it in the source tarball but only after setting the "this
   is a release tarball" option.
 
 
   All of this means that that builds from release-branch tarballs will report
   the SVN version of the release tarball rather than "unknown."  This addresses
   the issue reported in
   http://ask.wireshark.org/questions/5376/wireshark-161-title-shows-svn-rev-unknown-from-unknown
 
   Builds from trunk (including the source tarballs) will continue to report that
   the SVN version is unknown.  (Maybe that, too, should be changed?)
   ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                  Action
  +1 -1      packet-bacapp.c       Modified
  +1 -1      packet-csn1.c         Modified
  +39 -8     packet-dtn.c          Modified
  +2 -2      packet-eth.c          Modified
  +19 -4     packet-ieee80211.c    Modified
  +4 -16     packet-per.c          Modified
  +18 -22    packet-rtp.c          Modified
  +13 -11    packet-stun.c         Modified

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

Directory: /trunk-1.6/epan/
  Changes    Path                Action
  +1 -0      libwireshark.def    Modified


(3 files not shown)