[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2010/11/15 01:38 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r34124 | martinm | 2010-09-15 11:16:23 -0500 (Wed, 15 Sep 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-diameter.c
    M /trunk/epan/dissectors/packet-ftp.c
    M /trunk/epan/dissectors/packet-ms-mms.c
    M /trunk/epan/dissectors/packet-rdt.c
    M /trunk/epan/dissectors/packet-sipfrag.c
 
 Remove a few more calls to check_col()
 ------------------------------------------------------------------------
 r34507 | wmeier | 2010-10-13 23:53:07 -0500 (Wed, 13 Oct 2010) | 3 lines
 Changed paths:
    M /trunk/epan/proto.c
 
 Fix crash for 'tshark -G values' when printing "extended value string" value.
 Fixes bug #5296 [ https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5296 ]
 ------------------------------------------------------------------------
 r34523 | morriss | 2010-10-15 12:10:29 -0500 (Fri, 15 Oct 2010) | 10 lines
 Changed paths:
    M /trunk/plugins/profinet/packet-dcerpc-pn-io.c
 
 From ToddS via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5299 :
 
 In profinet plugin, there is a dissection based on whether the read data
 returned is expected to contain a single or multiple blocks. Currently, the
 I&M0FilterData case assumes only a single block is returned. Profinet specifies
 two optional additional blocks.
 
 This change moves I&M0FilterData to expect multiple blocks to correct decode
 the optional information.
 ------------------------------------------------------------------------
 r34524 | morriss | 2010-10-15 12:17:04 -0500 (Fri, 15 Oct 2010) | 9 lines
 Changed paths:
    M /trunk/plugins/profinet/packet-pn-mrp.c
 
 From ToddS via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5300 :
 
 In the profinet plugin, the decoding of the MRP LinkUp and MRP LinkDown
 messages is missing the MRP_SA field which garbles the decode of the rest of
 the packet.
 
 This fix adds the decoding of the MRP_SA field to the MRP LinkUp and MRP
 LinkDown dissectors.
 ------------------------------------------------------------------------
 r34527 | jmayer | 2010-10-15 16:02:30 -0500 (Fri, 15 Oct 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-telnet.c
 
 Make the telnet data lines filterable elements.
 ------------------------------------------------------------------------
 r34557 | morriss | 2010-10-18 10:56:06 -0500 (Mon, 18 Oct 2010) | 1 line
 Changed paths:
    M /trunk/epan/dissectors/packet-diameter.c
 
 Use port range for SCTP too.
 ------------------------------------------------------------------------
 r34563 | morriss | 2010-10-18 15:52:54 -0500 (Mon, 18 Oct 2010) | 12 lines
 Changed paths:
    M /trunk/file.c
 
 Fix progress bar when loading compressed files.
 
 Continue to use the data offset ((uncompressed) bytes read) as our progress
 indicator, at least until we get a progress value greater than 1.0.  Then,
 in addition to checking if the size of the file changed, check our position in
 the file and use that as our progress indicator.
 
 This optimizes uncompressed file accesses (avoiding an lseek()) at the "expense"
 of switching progress measures (from data read to position in the file) while
 loading a file.  Tests have shown that the progress bar never shows the data
 offset number when loading a compressed file, so this should be okay.
 ------------------------------------------------------------------------
 r34564 | morriss | 2010-10-18 16:36:41 -0500 (Mon, 18 Oct 2010) | 1 line
 Changed paths:
    M /trunk/file.c
 
 Fix the win64 build
 ------------------------------------------------------------------------
 r34575 | etxrab | 2010-10-19 14:19:42 -0500 (Tue, 19 Oct 2010) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-zbee-zcl.c
 
 From Fred Fierling:
 Infinite loop in ZCL Discover Attributes dissection
 
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5303
 ------------------------------------------------------------------------
 r34581 | morriss | 2010-10-19 20:49:32 -0500 (Tue, 19 Oct 2010) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ldss.c
 
 Fix SE memory corruption reported in  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5318 :
 
 Ensure the digest is smaller than our buffer before copying it.
 ------------------------------------------------------------------------
 r34595 | etxrab | 2010-10-20 15:50:39 -0500 (Wed, 20 Oct 2010) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-zbee-zcl.c
 
 From Fred Fierling:
 Cleanup of unnecessary tree == NULL checks in ZCL dissector
 
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5321
 ------------------------------------------------------------------------
 r34597 | morriss | 2010-10-20 19:37:40 -0500 (Wed, 20 Oct 2010) | 9 lines
 Changed paths:
    M /trunk/epan/wslua/wslua_dumper.c
 
 From Holger Freyther via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5320 :
 
 Doing a Dumper:close() and then forcing the dumper to be garbage collected will
 cause a segfault.
 
 The code attempts to handle the GC that could follow but fails to do it
 properly. Assigning Dumper dp = NULL will only have an affect within the scope
 of this method... Assumingly this should be a *dp = NULL.
 ------------------------------------------------------------------------
 r34601 | stig | 2010-10-21 02:13:43 -0500 (Thu, 21 Oct 2010) | 2 lines
 Changed paths:
    M /trunk/dumpcap.c
    M /trunk/gtk/main.c
    M /trunk/rawshark.c
    M /trunk/tshark.c
    M /trunk/version_info.c
    M /trunk/version_info.h
 
 Fixed "Compiled with" information in the About box.
 ------------------------------------------------------------------------
 r34657 | jake | 2010-10-27 01:48:39 -0500 (Wed, 27 Oct 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-multipart.c
 
 Supply an entry to use for unknown multipart subtype.
 ------------------------------------------------------------------------
 r34658 | jake | 2010-10-27 01:49:18 -0500 (Wed, 27 Oct 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-http.c
 
 Try to decode the unknown multipart subtype anyway.
 ------------------------------------------------------------------------
 r34659 | jake | 2010-10-27 01:49:39 -0500 (Wed, 27 Oct 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-sip.c
 
 Try to decode the unknown multipart subtype anyway.
 ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
 ------------------------------------------------------------------------
 r34522 | gerald | 2010-10-15 11:05:06 -0500 (Fri, 15 Oct 2010) | 7 lines
 Changed paths:
    M /trunk/doc/rawshark.pod
    M /trunk/rawshark.c
 
 Revision 27919 added the ability to feed a libpcap-formatted file to
 rawshark but broke the ability to feed it live packets with a
 pcap_pkthdr prefix on some 64-bit architectures.
 
 Add a "-p" flag which lets us explicitly handle file-based or
 memory-based packet record headers.
 ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path                  Action
  +35 -24    packet-diameter.c     Modified
  +0 -4      packet-ftp.c          Modified
  +7 -0      packet-http.c         Modified
  +2 -0      packet-ldss.c         Modified
  +0 -21     packet-ms-mms.c       Modified
  +6 -0      packet-multipart.c    Modified
  +0 -15     packet-rdt.c          Modified
  +8 -0      packet-sip.c          Modified
  +1 -3      packet-sipfrag.c      Modified
  +6 -3      packet-telnet.c       Modified
  +32 -97    packet-zbee-zcl.c     Modified


(13 files not shown)