[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2010/08/28 09:11 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r33198 | wmeier | 2010-06-09 11:12:17 -0700 (Wed, 09 Jun 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-dcm.c
    M /trunk/epan/dissectors/packet-diameter.c
    M /trunk/epan/dissectors/packet-dtn.c
    M /trunk/epan/dissectors/packet-frame.c
    M /trunk/epan/dissectors/packet-gsm_a_gm.c
    M /trunk/epan/dissectors/packet-mikey.c
    M /trunk/epan/dissectors/packet-nasdaq-itch.c
    M /trunk/epan/dissectors/packet-ncp-sss.c
    M /trunk/epan/dissectors/packet-ntlmssp.c
    M /trunk/epan/dissectors/packet-ntp.c
    M /trunk/epan/dissectors/packet-ntp.h
    M /trunk/epan/dissectors/packet-ppp.c
    M /trunk/epan/dissectors/packet-ptp.c
    M /trunk/epan/dissectors/packet-pvfs2.c
    M /trunk/epan/dissectors/packet-rmi.c
 
 Do some constifying [or other] based upon gcc -Wwrite-strings warnings.
 ------------------------------------------------------------------------
 r33534 | guy | 2010-07-14 20:31:51 -0700 (Wed, 14 Jul 2010) | 6 lines
 Changed paths:
    M /trunk/Makefile.nmake
    M /trunk/epan/Makefile.nmake
 
 There shouldn't be any need to build stuff in the top-level directory
 with the Lua or libgnutls flags, as nothing in the top-level directory
 should use them directly.
 
 However, libwireshark *does* require the Lua flags, so use them.
 ------------------------------------------------------------------------
 r33551 | martinm | 2010-07-16 04:17:32 -0700 (Fri, 16 Jul 2010) | 3 lines
 Changed paths:
    M /trunk/epan/expert.c
 
 Make frames containing Malformed expert items match with "malformed" display filter.
 ------------------------------------------------------------------------
 r33692 | wmeier | 2010-08-02 06:09:01 -0700 (Mon, 02 Aug 2010) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-gprs-llc.c
    M /trunk/epan/dissectors/packet-gsm_a_gm.c
    M /trunk/epan/dissectors/packet-gsm_a_rr.c
    M /trunk/epan/dissectors/packet-iec104.c
    M /trunk/epan/dissectors/packet-ieee80211.c
    M /trunk/epan/dissectors/packet-ospf.c
    M /trunk/epan/dissectors/packet-sctp.c
 
 Fix cases where the type of a for loop variable is smaller than the type of the "end" variable.
 In some cases the usage may have been benign since it can be seen by code inspection that the maximum value of the end variable can't exceed the maximum value of the loop variable.
 However, on general principles, all the usages have been fixed.
 ------------------------------------------------------------------------
 r33707 | stig | 2010-08-04 06:32:09 -0700 (Wed, 04 Aug 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-udp.c
 
 Avoid a possible dereference of null pointer.
 ------------------------------------------------------------------------
 r33906 | etxrab | 2010-08-23 23:15:40 -0700 (Mon, 23 Aug 2010) | 3 lines
 Changed paths:
    M /trunk/capture.c
 
 From Gregor Beck:
 ERROR:capture.c:141:capture_start: assertion failed: (capture_opts->state == CAPTURE_STOPPED)
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5126
 ------------------------------------------------------------------------
 r33920 | kukosa | 2010-08-25 07:10:58 -0700 (Wed, 25 Aug 2010) | 1 line
 Changed paths:
    M /trunk/epan/dissectors/packet-sip.c
 
 Fix wrong length of CSeq Method parameter 
 ------------------------------------------------------------------------
 r33941 | stig | 2010-08-26 13:22:28 -0700 (Thu, 26 Aug 2010) | 4 lines
 Changed paths:
    M /trunk/print.c
 
 Check input string in ps_clean_string().
 
 This fixes bug 5148.
 ------------------------------------------------------------------------
 r33947 | jake | 2010-08-26 23:07:32 -0700 (Thu, 26 Aug 2010) | 2 lines
 Changed paths:
    M /trunk/debian/control
 
 Make wireshark-dev depend on the right automake.
 ------------------------------------------------------------------------
 r33565 | stig | 2010-07-18 08:06:13 -0700 (Sun, 18 Jul 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ipv6.c
 
 Use correct length for the IPv6 item.
 ------------------------------------------------------------------------
 r33870 | gerald | 2010-08-20 17:19:32 -0700 (Fri, 20 Aug 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ipv6.c
 
 If we have something that looks like a stateless autoconfiguration
 address, add the corresponding MAC address to the tree.
 ------------------------------------------------------------------------
 r33900 | gerald | 2010-08-23 17:24:44 -0700 (Mon, 23 Aug 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ipv6.c
 
 Display ISATAP encapsulated IPv4 addresses.
 ------------------------------------------------------------------------
 r33959 | gerald | 2010-08-27 12:52:17 -0700 (Fri, 27 Aug 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ipv6.c
 
 Display Teredo encapsulated IPv4 server and client addresses.
 ------------------------------------------------------------------------
 r33982 | gerald | 2010-08-28 12:46:20 -0700 (Sat, 28 Aug 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ipv6.c
 
 De-obfuscate the Teredo client address and add a de-obfuscated port.
 ------------------------------------------------------------------------
 r33984 | gerald | 2010-08-28 13:55:32 -0700 (Sat, 28 Aug 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ipv6.c
 
 Display 6to4 gateway IPv4 addresses and SLA IDs.
 ------------------------------------------------------------------------

Directory: /trunk-1.4/debian/
  Changes    Path          Action
  +1 -1      control       Modified

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path                    Action
  +1 -1      packet-dcm.c            Modified
  +1 -1      packet-diameter.c       Modified
  +8 -8      packet-dtn.c            Modified
  +1 -1      packet-frame.c          Modified
  +2 -2      packet-gprs-llc.c       Modified
  +4 -3      packet-gsm_a_gm.c       Modified
  +2 -2      packet-gsm_a_rr.c       Modified
  +3 -3      packet-iec104.c         Modified
  +1 -1      packet-ieee80211.c      Modified
  +258 -8    packet-ipv6.c           Modified


(19 files not shown)