[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2012/01/05 03:44 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r39961 | cmaynard | 2011-11-20 07:47:14 -0800 (Sun, 20 Nov 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ip.c
 
   Fix bug 6561: IPv4 UDP/TCP Checksum incorrect if routing header present.
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6561
   ------------------------------------------------------------------------
   r39963 | cmaynard | 2011-11-20 18:01:59 -0800 (Sun, 20 Nov 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ip.c
 
   Fix potential infinite loop introduced with r39961 and find by the buildbot.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6599
   ------------------------------------------------------------------------
   r39986 | cmaynard | 2011-11-22 07:18:20 -0800 (Tue, 22 Nov 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ip.c
 
   For now, display the protocol in hexadecimal again so displaying it in decimal doesn't get backported to the 1.6 and 1.4 trunks at the request of Joerg.
   ------------------------------------------------------------------------
   r40024 | etxrab | 2011-11-28 08:41:59 -0800 (Mon, 28 Nov 2011) | 1 line
   Changed paths:
      M /trunk/epan/dissectors/packet-gsm_a_gm.c
 
   Prevet a crash when dissecting linked TI.
   ------------------------------------------------------------------------
   r40076 | cmaynard | 2011-12-02 20:07:20 -0800 (Fri, 02 Dec 2011) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ipv6.c
 
   If a type 2 Mobile IP routing header is present, only set pinfo->dst if seg_left is non-zero.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6560
   ------------------------------------------------------------------------
   r40133 | alagoutte | 2011-12-09 09:00:28 -0800 (Fri, 09 Dec 2011) | 8 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-zbee-zcl.c
      M /trunk/epan/dissectors/packet-zbee-zcl.h
 
   From report of Arasch Honarbacht via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6649
   ZigBee ZCL Dissector reports invalid status
 
   The status code 0x8d contained in an attriute status record in a configure reporting response frame is incorrectly displayed as "Write only" (where WRITE_ONLY = 0x8f). According to the ZigBee Cluster Library Specification, Document 075123r03ZB, April 26, 2010 a status of 0x8d should display as "INVALID_DATA_TYPE"
 
   From me :
   Fix this issue (Wrong value define) based on Specs available in ZigBee.org
   ------------------------------------------------------------------------
   r40138 | guy | 2011-12-09 13:15:48 -0800 (Fri, 09 Dec 2011) | 7 lines
   Changed paths:
      M /trunk/acinclude.m4
      M /trunk/capture-pcap-util-unix.c
 
   Referring to pcap_version[] doesn't do what you want on at least some
   UN*Xes (Fedora 16 and probably other Linux distributions, probably at
   least some if not all other ELF-based systems, and perhaps also Mac OS
   X), and causes problems if pcap_version[] has a different length in the
   libpcap with which the executable was built and the libpcap with which
   it's run, so we avoid using it for now.
   ------------------------------------------------------------------------
   r40153 | cmaynard | 2011-12-11 15:43:03 -0800 (Sun, 11 Dec 2011) | 2 lines
   Changed paths:
      M /trunk/gtk/export_object.c
 
   If the object to export doesn't have a filename, use a generic "object" name instead.  This fixes the crash reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6250
   ------------------------------------------------------------------------
   r40154 | cmaynard | 2011-12-11 16:27:32 -0800 (Sun, 11 Dec 2011) | 2 lines
   Changed paths:
      M /trunk/gtk/export_object.c
 
   If no filename, include the packet number in the generic name.  TODO: Implement the ct2ext() function.
   ------------------------------------------------------------------------
   r40155 | cmaynard | 2011-12-11 16:35:51 -0800 (Sun, 11 Dec 2011) | 2 lines
   Changed paths:
      M /trunk/gtk/export_object.c
 
   Well, until someone has the time to write ct2ext(), just return the content type, which is better than nothing.
   ------------------------------------------------------------------------
   r40159 | jake | 2011-12-12 00:18:18 -0800 (Mon, 12 Dec 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-icmpv6.c
 
   From Roy Marples:
   ICMPv6 DNSSL option can contain padding, which does not represent a malformed option.
   ------------------------------------------------------------------------
   r40162 | cmaynard | 2011-12-12 11:24:49 -0800 (Mon, 12 Dec 2011) | 2 lines
   Changed paths:
      M /trunk/print.c
 
   Add missing </field> for data tree.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3809
   ------------------------------------------------------------------------
   r40184 | cmaynard | 2011-12-13 12:07:21 -0800 (Tue, 13 Dec 2011) | 2 lines
   Changed paths:
      M /trunk/print.c
 
   Don't close the field tag here; it's now closed with </field>.
   ------------------------------------------------------------------------
 
 
 Copy over by hand:
 
   ------------------------------------------------------------------------
   r40075 | guy | 2011-12-02 19:01:08 -0800 (Fri, 02 Dec 2011) | 6 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-tcp.c
 
   The TCP Packet Mood Option was a cute April 1 RFC, but TCP option 25 is
   officially listed as "Unassigned", and people might use it for their own
   purposes (and, in fact, one bug-submitter was doing so; they probably
   should have used 253 or 254, but...).  Get rid of the code to dissect
   it.
   ------------------------------------------------------------------------
   r40130 | jake | 2011-12-09 08:34:02 -0800 (Fri, 09 Dec 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-bgp.c
 
   From astramax57:
   After r38723, some BGP AS_PATH packets were no longer dissected.
   ------------------------------------------------------------------------
   r40158 | jake | 2011-12-11 23:56:45 -0800 (Sun, 11 Dec 2011) | 3 lines
   Changed paths:
      M /trunk/tools/win-setup.sh
 
   Allow for true error reporing.
   Move the comment to where it's intended.
   ------------------------------------------------------------------------
   r40002 | wmeier | 2011-11-25 09:02:51 -0800 (Fri, 25 Nov 2011) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dcerpc-epm.c
 
   From Wido Kelling: EPM tower UUID must be interpreted always as little endian.
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6368
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                   Action
  +4 -4      packet-bgp.c           Modified
  +2 -1      packet-dcerpc-epm.c    Modified
  +37 -14    packet-gsm_a_gm.c      Modified
  +5 -1      packet-icmpv6.c        Modified
  +125 -25   packet-ip.c            Modified
  +2 -1      packet-ipv6.c          Modified
  +0 -59     packet-tcp.c           Modified
  +2 -3      packet-zbee-zcl.c      Modified
  +15 -16    packet-zbee-zcl.h      Modified

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


(5 files not shown)