[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2010/06/06 03:13 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r30940 | kukosa | 2009-11-12 06:44:40 -0800 (Thu, 12 Nov 2009) | 1 line
 Changed paths:
    M /trunk/epan/libwireshark.def
 
 Export more BER functions
 ------------------------------------------------------------------------
 r32068 | stig | 2010-03-01 14:11:20 -0800 (Mon, 01 Mar 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-xml.c
 
 From LEGO via bug 4405:
 Add the dot ('.') to the characters that can compose a name.
 ------------------------------------------------------------------------
 r32715 | gerald | 2010-05-07 12:45:47 -0700 (Fri, 07 May 2010) | 5 lines
 Changed paths:
    M /trunk/wiretap/wtap.c
 
 EOF in zlib 1.2.5 seems to be sticky. When we're tailing a file and we
 reach EOF, zlib's file handle seems to stay at EOF even when more data
 is appended to the file. Add a check for 1.2.5 which calls gzseek in
 order to unset EOF. Fixes bugs 4708 and 4748.
 ------------------------------------------------------------------------
 r32716 | gerald | 2010-05-07 14:15:24 -0700 (Fri, 07 May 2010) | 3 lines
 Changed paths:
    M /trunk/file.c
    M /trunk/wiretap/wtap.c
    M /trunk/wiretap/wtap.h
 
 Zlib has an officially-sanctioned way of clearing EOF when we're tailing
 a file.  Use it.
 ------------------------------------------------------------------------
 r32733 | stig | 2010-05-10 03:48:45 -0700 (Mon, 10 May 2010) | 2 lines
 Changed paths:
    M /trunk/gtk/io_stat.c
 
 Bring back "1 min" and "10 min" in IO Graph Tick interval.
 ------------------------------------------------------------------------
 r32756 | jake | 2010-05-11 11:04:03 -0700 (Tue, 11 May 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-igmp.c
 
 Show version as generated field.
 ------------------------------------------------------------------------
 r32765 | jake | 2010-05-11 14:46:17 -0700 (Tue, 11 May 2010) | 2 lines
 Changed paths:
    M /trunk/epan/ftypes/ftype-bytes.c
    M /trunk/epan/ftypes/ftype-guid.c
 
 Straighten out field type names.
 ------------------------------------------------------------------------
 r32766 | jake | 2010-05-11 14:49:30 -0700 (Tue, 11 May 2010) | 2 lines
 Changed paths:
    M /trunk/doc/dfilter2pod.pl
    M /trunk/docbook/dfilter2xml.pl
 
 Update display filter scripts with new field types.
 ------------------------------------------------------------------------
 r32774 | guy | 2010-05-12 12:44:23 -0700 (Wed, 12 May 2010) | 4 lines
 Changed paths:
    M /trunk/gtk/capture_file_dlg.c
 
 Don't set the sensitivity of the Open button based on whether we can
 open the currently-selected file; that button is also used to select the
 file or directory typed in the location bar.  This should fix bug 1791.
 ------------------------------------------------------------------------
 r32848 | morriss | 2010-05-17 14:49:09 -0700 (Mon, 17 May 2010) | 1 line
 Changed paths:
    M /trunk/epan/dissectors/packet-smb-pipe.c
 
 Don't pass a NULL pointer to what is supposed to be (according to the format) a string: some implementations of vsnprintf() will core on that.  (Unfortunately it seems that g_vsnprintf() doesn't protect us from this...)
 ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 ------------------------------------------------------------------------
 r32680 | etxrab | 2010-05-05 12:22:28 -0700 (Wed, 05 May 2010) | 1 line
 Changed paths:
    M /trunk/asn1/sabp/packet-sabp-template.c
    M /trunk/epan/dissectors/packet-sabp.c
 
 Calculate correct PDU lenght if the per_length_determinant is one byte long.
 ------------------------------------------------------------------------
 r32723 | sake | 2010-05-08 00:55:12 -0700 (Sat, 08 May 2010) | 3 lines
 Changed paths:
    M /trunk/epan/packet.c
    M /trunk/gtk/decode_as_dlg.c
 
 Enable "Decode As..." for ethertype 0x0000 (fix for bug 4721)
 ------------------------------------------------------------------------
 r32752 | wmeier | 2010-05-11 07:34:16 -0700 (Tue, 11 May 2010) | 10 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-kerberos.c
 
 Fix handling of pa-data-type KRB5_PA_PAC_REQUEST (& KRB5_PA_S4U2SELF).
 
 -Define pa-data-type KRB5_PA_PAC_REQUEST properly so that it is recognized.
   Fixes bug #4752 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4752)
 -Also revert definition of  KRB5_PA_S4U2SELF (to be a positive number).
 (All of the above reverts part of SVN #31400).
 
 -Display pa-data-type as FT_INT32.
 -Display the value for pa-data-type KRB5_PA_PAC_REQUEST as Boolean (not Int).
 ------------------------------------------------------------------------
 r32772 | morriss | 2010-05-12 06:24:42 -0700 (Wed, 12 May 2010) | 13 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-http.c
 
 From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4758 :
 
 The HTTP dissector uses strtoll() to convert the Content-Length string into a
 64bit variable. But that string can contain a number larger (or less) than
 64bit, which lets the strtoll() return INT_MAX (or INT_MIN). strtoll() then
 indicates this with errno==ERANGE.
 
 The attachted patch checks if errno is set this way and then treats that HTTP
 Content-Length as unspecified, since we don't know the real size.
 
 I haven't checked other occurences of strtoll() in the HTTP dissector if they
 could benefit from the errno check, or if other dissectors could use it.
 ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.2/epan/dissectors/
  Changes    Path                 Action
  +5 -1      packet-http.c        Modified
  +6 -2      packet-igmp.c        Modified
  +11 -7     packet-kerberos.c    Modified
  +17 -14    packet-sabp.c        Modified
  +2 -2      packet-xml.c         Modified

Directory: /trunk-1.2/doc/
  Changes    Path              Action
  +9 -3      dfilter2pod.pl    Modified

Directory: /trunk-1.2/docbook/
  Changes    Path                 Action
  +12 -3     dfilter2xml.pl       Modified
  +53 -44    release-notes.xml    Modified

Directory: /trunk-1.2/epan/
  Changes    Path                Action
  +2 -0      libwireshark.def    Modified
  +4 -1      packet.c            Modified


(9 files not shown)