[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/10/27 01:57 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   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
   ------------------------------------------------------------------------
   r39445 | cmaynard | 2011-10-17 07:56:37 -0700 (Mon, 17 Oct 2011) | 6 lines
   Changed paths:
      M /trunk/file.c
 
   From Michael Mann: Add cf_callback_invoke to cf_open to tidy up the currently open file before opening a new one.  Fixes bugs 5987 and 6457.
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5987
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6457
   ------------------------------------------------------------------------
   r39494 | jake | 2011-10-20 10:49:19 -0700 (Thu, 20 Oct 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-gsm_sms.c
 
   Fix for bug 6469:
   Retrieve the fill bits in the correct amount and from the correct place.
   ------------------------------------------------------------------------
   r39506 | jake | 2011-10-21 01:32:10 -0700 (Fri, 21 Oct 2011) | 5 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-rtps2.c
 
   Fix for bug 6449:
   Last RTPS2 submessage could have zero as octets_to_next_header.
 
   From me: coding style unused parameters.
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r39390 | guy | 2011-10-12 10:55:49 -0700 (Wed, 12 Oct 2011) | 9 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ajp13.c
 
   From Iain Arnell:
 
   A missing value_ptr parameter in the handling of ajp13 response headers
   led to them being displayed differently than the request headers.
 
   This patch also simplifies the offset/length calculation for header
   values, and skips the size for consistency with handling of other ajp13
   string values.
   ------------------------------------------------------------------------
   r39392 | wmeier | 2011-10-12 11:04:58 -0700 (Wed, 12 Oct 2011) | 12 lines
   Changed paths:
      M /trunk/wiretap/file_access.c
      M /trunk/wiretap/network_instruments.c
 
   From Robert Bullen: Fix for: Two minor bugs in Wiretap library:
 
   First bug: The Network Instruments Observer file format abbreviation is
   incorrect. It is "niobserverv" instead of "niobserver", which is probably a
   vestige from 1.4 when the abbreviation was "niobserverv9".
 
   Second bug: The packet header magic number field is correctly swapped the first
   time when reading the entire packet header. It is incorrectly swapped yet again
   when reporting an invalid value. Both swaps use GUINT_FROM_LE, which is a no-op
   on little-endian platforms. But the error message that is displayed to users of
   big-endian platforms will contain a byte-reversed value.
   ------------------------------------------------------------------------
   r39485 | guy | 2011-10-19 19:38:40 -0700 (Wed, 19 Oct 2011) | 14 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-netflow.c
 
   As bug 3954 notes, nowhere does RFC 3954 indicate that a system or
   interface scope is always 4 bytes.  For that matter, nowhere does it
   indicate that the scopes have any particular interpretation except as a
   sequence of octets.
 
   Get rid of the checks for a length of 4, and make ScopeSystem an
   FT_BYTES.  If, by *convention*, they're usually IPv4 or IPv6 addresses,
   somebody can throw in code to display them as such if they happen to be
   4 or 16 bytes, respectively.  Leave ScopeInterface as an integer for
   now, in case, by convention, they're interface indices, but still leave
   the length check out.
 
   Fixes bug 3954.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path                Action
  +8 -17     packet-ajp13.c      Modified
  +5 -5      packet-gsm_sms.c    Modified
  +2 -10     packet-netflow.c    Modified
  +16 -14    packet-rtps2.c      Modified
  +1 -1      packet-s1ap.c       Modified

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

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

Directory: /trunk-1.4/
  Changes    Path             Action
  +1 -0      file.c           Modified
  +9 -9      tap-iousers.c    Modified

Directory: /trunk-1.4/wiretap/
  Changes    Path                     Action
  +2 -2      file_access.c            Modified
  +3 -3      network_instruments.c    Modified