[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2009/12/08 04:15 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r30989 | krj | 2009-11-17 07:53:38 -0800 (Tue, 17 Nov 2009) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-tte-pcf.c
    M /trunk/epan/dissectors/packet-tte.h
 
 From Benjamin Roch via. bug 4247:
 
 Fix type-field of protocol control frame
 ------------------------------------------------------------------------
 r31050 | stig | 2009-11-22 14:13:11 -0800 (Sun, 22 Nov 2009) | 2 lines
 Changed paths:
    M /trunk/epan/wslua/wslua.h
    M /trunk/epan/wslua/wslua_proto.c
 
 Give a warning for illegal preference name.
 ------------------------------------------------------------------------
 r31051 | stig | 2009-11-23 00:47:25 -0800 (Mon, 23 Nov 2009) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-rpcap.c
 
 From Barry Miller via bug 4258:
 Include sys/types.h to make it compile on OpenBSD 4.5.
 ------------------------------------------------------------------------
 r31071 | jake | 2009-11-24 22:39:29 -0800 (Tue, 24 Nov 2009) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-edonkey.c
 
 From Andrew Jean:
 When dissecting an eDonkey "Request Parts" message, Wireshark incorrectly reads
 3 offset start/end pairs when the actual number can be 1-3 pairs.
 ------------------------------------------------------------------------
 r31096 | stig | 2009-11-27 06:58:43 -0800 (Fri, 27 Nov 2009) | 2 lines
 Changed paths:
    M /trunk/asn1/x509sat/packet-x509sat-template.c
    M /trunk/epan/dissectors/packet-x509sat.c
 
 Corrected OID for organizationalUnit.
 ------------------------------------------------------------------------
 r31115 | jake | 2009-11-29 05:55:34 -0800 (Sun, 29 Nov 2009) | 1 line
 Changed paths:
    M /trunk/epan/dissectors/packet-eap.c
 
 Fix EAP method type 25, 26 interpretation.
 ------------------------------------------------------------------------
 r31128 | stig | 2009-11-30 04:54:47 -0800 (Mon, 30 Nov 2009) | 3 lines
 Changed paths:
    M /trunk/asn1/dap/dap.asn
    M /trunk/epan/dissectors/packet-dap.c
 
 SearchArgumentData filter and EntryInformationSelection attributes are
 OPTIONAL as they are defined with a DEFAULT.
 ------------------------------------------------------------------------
 r31173 | wmeier | 2009-12-04 08:56:34 -0800 (Fri, 04 Dec 2009) | 2 lines
 Changed paths:
    M /trunk/wiretap/daintree-sna.c
 
 Revise #31172 slightly to clarify #define dependencies
 ------------------------------------------------------------------------
 r31187 | stig | 2009-12-07 07:07:38 -0800 (Mon, 07 Dec 2009) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-smb.c
    M /trunk/epan/dissectors/packet-smb2.c
 
 A fix for bug 4301:
 Check sip->extra_info for SMB_EI_NTI before usage.
 ------------------------------------------------------------------------
 r31188 | gerald | 2009-12-07 10:21:58 -0800 (Mon, 07 Dec 2009) | 4 lines
 Changed paths:
    M /trunk/capture-wpcap.c
 
 If WinPcap isn't loaded, return NULL from pcap_lookupdev() instead
 of asserting. Returning an empty interface list is more graceful than
 crashing.
 ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
 ------------------------------------------------------------------------
 r29816 | etxrab | 2009-09-09 00:29:41 -0700 (Wed, 09 Sep 2009) | 5 lines
 Changed paths:
    M /trunk/asn1/ranap/ranap.cnf
    M /trunk/epan/dissectors/packet-gtp.c
    M /trunk/epan/dissectors/packet-ranap.c
    M /trunk/epan/dissectors/packet-ranap.h
 
 Target Identification shall be coded as TLV IE where value is
 coded as TargetRNC-ID.
 Proposed fix to
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3974
 (The enclosed trace dioes not decode properly but may be wrongly encoded).
 ------------------------------------------------------------------------
 r30990 | gerald | 2009-11-17 09:07:06 -0800 (Tue, 17 Nov 2009) | 2 lines
 Changed paths:
    M /trunk/image/wiresharkdoc.ico
    M /trunk/packaging/macosx/Resources/wsicondoc.icns
 
 Update the document icons.
 ------------------------------------------------------------------------
 r31160 | stig | 2009-12-03 07:40:15 -0800 (Thu, 03 Dec 2009) | 3 lines
 Changed paths:
    M /trunk/wiretap/wtap.c
 
 Added missing WTAP_ENCAP_DPNSS and WTAP_ENCAP_PACKETLOGGER to encap_table_base[]
 Fixed some comments.
 ------------------------------------------------------------------------
 r31172 | wmeier | 2009-12-04 08:42:14 -0800 (Fri, 04 Dec 2009) | 10 lines
 Changed paths:
    M /trunk/wiretap/daintree-sna.c
 
 From: babi
 
 [Fix] potential memory problem (crash?) in daintree-sna.
 
 See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4294
 
 (A parameterized version of the patch supplied in the above)
 ------------------------------------------------------------------------
 r31175 | jake | 2009-12-04 10:20:15 -0800 (Fri, 04 Dec 2009) | 2 lines
 Changed paths:
    M /trunk/asn1/Makefile.nmake
 
 With revision 27279 the make part of revision 26467 has to be reverted too.
 ------------------------------------------------------------------------
 r31181 | jake | 2009-12-06 00:45:52 -0800 (Sun, 06 Dec 2009) | 2 lines
 Changed paths:
    M /trunk/epan/addr_resolv.c
 
 Let c-ares actually resolve IPv6 addresses.
 ------------------------------------------------------------------------
 r31186 | stig | 2009-12-07 04:17:13 -0800 (Mon, 07 Dec 2009) | 3 lines
 Changed paths:
    M /trunk/asn1/x411/x411.cnf
    M /trunk/epan/dissectors/packet-x411.c
 
 Build correct oraddress for several Teletex values.
 Corrected label format for GenerationQualifier: GQ -> Q.
 ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.2/packaging/macosx/Resources/
  Changes    Path              Action
  +0 -0      wsicondoc.icns    Modified

Directory: /trunk-1.2/asn1/
  Changes    Path              Action
  +0 -5      Makefile.nmake    Modified

Directory: /trunk-1.2/asn1/dap/
  Changes    Path          Action
  +2 -2      dap.asn       Modified

Directory: /trunk-1.2/epan/dissectors/
  Changes    Path                Action
  +2 -2      packet-dap.c        Modified
  +2 -2      packet-eap.c        Modified
  +11 -4     packet-edonkey.c    Modified
  +53 -53    packet-gtp.c        Modified
  +3 -3      packet-ranap.c      Modified
  +1 -2      packet-ranap.h      Modified
  +4 -0      packet-rpcap.c      Modified
  +4 -3      packet-smb.c        Modified


(16 files not shown)