[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2012/03/26 11:47 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r41037 | guy | 2012-02-15 22:39:44 -0800 (Wed, 15 Feb 2012) | 10 lines
   Changed paths:
      M /trunk-1.6/wiretap/pcapng.c
 
   Support Section Header Block options of arbitrary size - change
   backported from the trunk.
 
   Should fix the immediate problem in bug 6846; we also need to make sure
   (in all branches) that, as long as the file begins with an SHB with a
   valid byte order field, we recognize the file as a pcap-NG file (so that
   if there really *is* a problem with the SHB, the error reported to the
   user is an error in a pcap-NG file's SHB, *not* an "unknown file type"
   error).
   ------------------------------------------------------------------------
 
 
 Copy over by hand:
 
   ------------------------------------------------------------------------
   r41025 | guy | 2012-02-13 22:00:14 -0800 (Mon, 13 Feb 2012) | 49 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-http.c
 
   To quote section "7.2.1 Type" of RFC 2068, "Hypertext Transfer Protocol
   -- HTTP/1.1":
 
      Any HTTP/1.1 message containing an entity-body SHOULD include a
      Content-Type header field defining the media type of that body. If
      and only if the media type is not given by a Content-Type field, the
      recipient MAY attempt to guess the media type via inspection of its
      content and/or the name extension(s) of the URL used to identify the
      resource. If the media type remains unknown, the recipient SHOULD
      treat it as type "application/octet-stream".
 
   To quote section "4. Encoding of Transport Layer" of RFC 2565, "Internet
   Printing Protocol/1.0: Encoding and Transport":
 
      HTTP/1.1 [RFC2068] is the transport layer for this protocol.
 
   	...
 
      Note: even though port 631 is the IPP default, port 80 remains the
      default for an HTTP URI.  Thus a URI for a printer using port 631
      MUST contain an explicit port, e.g. "http://forest:631/pinetree";.  An
      HTTP URI for IPP with no explicit port implicitly reference port 80,
      which is consistent with the rules for HTTP/1.1. Each HTTP operation
      MUST use the POST method where the request-URI is the object target
      of the operation, and where the "Content-Type" of the message-body in
      each request and response MUST be "application/ipp". The message-body
      MUST contain the operation layer and MUST have the syntax described
      in section 3.2 "Syntax of Encoding". A client implementation MUST
      adhere to the rules for a client described for HTTP1.1 [RFC2068]. A
      printer (server) implementation MUST adhere the rules for an origin
      server described for HTTP1.1 [RFC2068].
 
   So, when choosing a subdissector for HTTP request bodies, search based
   on the media type first, and only if we *don't* find a dissector for the
   media type, do other stuff such as heuristics or choosing a subdissector
   based on the port number.
 
   This fixes a number of problems; in particular, it fixes bug 6765
   "non-IPP packets to or from port 631 are dissected as IPP" without
   requiring the IPP dissector to attempt to determine whether an entity
   body looks like IPP.  It also ensures that the default dissector for
   HTTP entity bodies, the "media" dissector, will get the media type
   passed to it in pinfo->match_string.
 
   Don't use "!str*cmp()" while we're at it - it's valid C, but the "!" can
   make it look as if it's checking for something not being the case when,
   in fact, you're checking for equality rather than inequality.  (The
   str*cmp() routines don't return Boolean results.)
   ------------------------------------------------------------------------
   r41030 | guy | 2012-02-14 14:31:33 -0800 (Tue, 14 Feb 2012) | 3 lines
   Changed paths:
      M /trunk/wiretap/erf.c
 
   TYPE_PAD records can have zero bytes of payload; don't treat them as
   errors.
   ------------------------------------------------------------------------
   r41097 | etxrab | 2012-02-20 22:44:50 -0800 (Mon, 20 Feb 2012) | 1 line
   Changed paths:
      M /trunk-1.6/wiretap/pcapng.c
 
   Support options of arbitrary size - changes backported from the trunk.
   ------------------------------------------------------------------------
   r41098 | etxrab | 2012-02-20 22:54:57 -0800 (Mon, 20 Feb 2012) | 1 line
   Changed paths:
      M /trunk-1.6/wiretap/pcapng.c
 
   Free the buffer
   ------------------------------------------------------------------------
   r41100 | etxrab | 2012-02-20 23:24:53 -0800 (Mon, 20 Feb 2012) | 1 line
   Changed paths:
      M /trunk-1.6/wiretap/pcapng.c
 
   Declare opt_cont_buf_len
   ------------------------------------------------------------------------
   r41130 | guy | 2012-02-21 14:25:13 -0800 (Tue, 21 Feb 2012) | 3 lines
   Changed paths:
      M /trunk-1.6/wiretap/pcapng.c
 
   WTAP_ERR_BAD_RECORD was renamed WTAP_ERR_BAD_FILE in the 1.7 branch; we
   still have to use WTAP_ERR_BAD_RECORD in 1.6 and before.
   ------------------------------------------------------------------------
   r41036 | etxrab | 2012-02-15 21:21:09 -0800 (Wed, 15 Feb 2012) | 4 lines
   Changed paths:
      M /trunk/AUTHORS
      M /trunk/epan/dissectors/packet-dtls.c
      M /trunk/epan/dissectors/packet-ssl-utils.c
 
   From Naoyoshi Ueda:
   Patch to fix DTLS decryption.
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6847
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path                  Action
  +56 -49    packet-dtls.c         Modified
  +18 -6     packet-http.c         Modified
  +20 -10    packet-ssl-utils.c    Modified

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

Directory: /trunk-1.4/
  Changes    Path          Action
  +1 -0      AUTHORS       Modified

Directory: /trunk-1.4/wiretap/
  Changes    Path          Action
  +3 -1      erf.c         Modified
  +85 -52    pcapng.c      Modified