[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2010/01/15 05:03 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r29401 | kukosa | 2009-08-13 03:36:53 -0700 (Thu, 13 Aug 2009) | 1 line
 Changed paths:
    M /trunk/epan/dissectors/packet-ssl-utils.c
 
 use G_GSIZE_MODIFIER instead of %zd which is not supported by MSVC
 ------------------------------------------------------------------------
 r30695 | gerald | 2009-10-25 10:05:08 -0700 (Sun, 25 Oct 2009) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-bootp.c
 
 Option 2 (Time Offset) is signed.
 ------------------------------------------------------------------------
 r31294 | wmeier | 2009-12-17 08:22:50 -0800 (Thu, 17 Dec 2009) | 4 lines
 Changed paths:
    M /trunk/plugins/opcua/opcua.c
 
 From  Martin Lutz: Patch tvb_memeql return check;
   ... tvb_memeql returns 0 for truth.
 See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3986#c7
 ------------------------------------------------------------------------
 r31297 | jake | 2009-12-17 09:59:46 -0800 (Thu, 17 Dec 2009) | 1 line
 Changed paths:
    M /trunk/gtk/rtp_player.c
 
 Squelch a GTK warning on the RTP player spinner control.
 ------------------------------------------------------------------------
 r31298 | jake | 2009-12-17 11:58:57 -0800 (Thu, 17 Dec 2009) | 1 line
 Changed paths:
    M /trunk/gtk/rtp_player.c
 
 Squelch GTK warnings on the RTP player progress bar when resizeing the window.
 ------------------------------------------------------------------------
 r31315 | gerald | 2009-12-18 11:44:10 -0800 (Fri, 18 Dec 2009) | 2 lines
 Changed paths:
    M /trunk/airpcap_loader.c
 
 Don't try to free a static pointer.
 ------------------------------------------------------------------------
 r31316 | gerald | 2009-12-18 12:36:36 -0800 (Fri, 18 Dec 2009) | 3 lines
 Changed paths:
    M /trunk/Makefile.nmake
    M /trunk/capture-wpcap.c
    M /trunk/config.h.win32
    M /trunk/config.nmake
 
 Use the WinPcap version of pcap_datalink_val_to_description if it's
 present.  Add an entry for DLT_PPI in case it's not.
 ------------------------------------------------------------------------
 r31317 | jake | 2009-12-18 15:14:26 -0800 (Fri, 18 Dec 2009) | 1 line
 Changed paths:
    M /trunk/docbook/user-guide.xml
    M /trunk/docbook/wsug_graphics/ws-menu.png
    M /trunk/docbook/wsug_graphics/ws-statistics-menu.png
    A /trunk/docbook/wsug_graphics/ws-telephony-menu.png
    M /trunk/docbook/wsug_src/WSUG_chapter_use.xml
 
 Update the User Guide to show the current menu.
 ------------------------------------------------------------------------
 r31318 | jake | 2009-12-18 15:26:12 -0800 (Fri, 18 Dec 2009) | 3 lines
 Changed paths:
    M /trunk/gtk/rtp_player.c
 
 PortAudio doesn't make sure that a default device is even available on the default Host API (go figure).
 Therefore opening the default stream may fail in the precense of usable devices, on other Host API's.
 If the default stream fails to open iterate among the Host API's to find one with a default device.
 ------------------------------------------------------------------------
 r31331 | jake | 2009-12-20 15:22:21 -0800 (Sun, 20 Dec 2009) | 3 lines
 Changed paths:
    M /trunk/tap-rtp-common.c
 
 Fix for bug 4340:
 Reset statistics variable when restart statistics gathering.
 ------------------------------------------------------------------------
 r31334 | sake | 2009-12-20 22:47:32 -0800 (Sun, 20 Dec 2009) | 4 lines
 Changed paths:
    M /trunk/epan/follow.c
 
 Fix some [-XX bytes missing in capture file] messages when doing 
 follow TCP stream.
 ------------------------------------------------------------------------
 r31364 | jake | 2009-12-27 05:26:00 -0800 (Sun, 27 Dec 2009) | 2 lines
 Changed paths:
    M /trunk/gtk/uat_gui.c
 
 Fix for bug 4354:
 Set Edit and Delete button sensitivity when deleting a row.
 ------------------------------------------------------------------------
 r31393 | stig | 2009-12-30 11:21:21 -0800 (Wed, 30 Dec 2009) | 2 lines
 Changed paths:
    M /trunk/gtk/capture_dlg.c
    M /trunk/gtk/capture_dlg.h
    M /trunk/gtk/main_welcome.c
 
 Set correct linktype when starting capture from the welcome page.
 ------------------------------------------------------------------------
 r31395 | sfisher | 2009-12-31 11:08:59 -0800 (Thu, 31 Dec 2009) | 10 lines
 Changed paths:
    M /trunk/print.c
 
 Fix bug #1564: PSML - structure context node missing [when not displaying
 packet #1 from the capture file]
 
 This change keeps track of whether the <structure></structure> elements
 and information in between have been shown yet, and if not, it shows them
 once.  The previous behavior would only show it if packet #1 from the
 capture file was being shown.
 ------------------------------------------------------------------------
 r31401 | stig | 2010-01-01 10:49:38 -0800 (Fri, 01 Jan 2010) | 2 lines
 Changed paths:
    M /trunk/epan/wslua/wslua_tree.c
 
 Use correct length for FT_STRINGZ when adding the item to the tree.
 ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
 ------------------------------------------------------------------------
 r29213 | sahlberg | 2009-07-28 06:01:41 -0700 (Tue, 28 Jul 2009) | 15 lines
 Changed paths:
    M /trunk/asn1/spnego/packet-spnego-template.c
    M /trunk/epan/dissectors/packet-kerberos.c
    M /trunk/epan/dissectors/packet-kerberos.h
    M /trunk/epan/dissectors/packet-kink.c
    M /trunk/epan/dissectors/packet-spnego.c
 
 When we passed the crytobuffer to krb5_c_decrypt() we never actually 
 verified that we did have enough data in the buffer/tvb, which could 
 lead to a SEGV.
 (for example if we enable KRB5 decryption but we do NOT use TCP 
 reassembly, and the encrypted data goes beyong the end of the current 
 segment)
 
 
 Change the signature to decrypt_krb5_data() to take a TVB instead of a 
 buffer+length.
 Actually check that we do have the entire encrypted PDU before calling 
 out to the kerberos libraries.
 ------------------------------------------------------------------------
 r31326 | jake | 2009-12-20 06:49:49 -0800 (Sun, 20 Dec 2009) | 2 lines
 Changed paths:
    M /trunk/docbook/README.txt
    M /trunk/docbook/developer-guide.xml
    M /trunk/docbook/wsdg_src/WSDG_chapter_quick_setup.xml
    M /trunk/docbook/wsdg_src/WSDG_chapter_sources.xml
    M /trunk/docbook/wsdg_src/WSDG_chapter_tools.xml
 
 Clean up the docbook source code, apply proper tags, update references.
 Update readme information, add some editing information for authors.
 ------------------------------------------------------------------------
 r31369 | jake | 2009-12-27 14:20:03 -0800 (Sun, 27 Dec 2009) | 1 line
 Changed paths:
    M /trunk/docbook/Makefile.common
    M /trunk/docbook/user-guide.xml
    A /trunk/docbook/wsug_graphics/ws-tel-rtpstream-analysis.png
    M /trunk/docbook/wsug_src/WSUG_chapter_statistics.xml
    A /trunk/docbook/wsug_src/WSUG_chapter_telephony.xml
    M /trunk/docbook/wsug_src/WSUG_chapter_use.xml
 
 Start Telephony statistics chapter.
 ------------------------------------------------------------------------
 r31398 | stig | 2010-01-01 07:57:14 -0800 (Fri, 01 Jan 2010) | 3 lines
 Changed paths:
    M /trunk/epan/wslua/wslua_tvb.c
 
 Add missing stringz tvbrange method.
 This fixes bug 2244.
 ------------------------------------------------------------------------

Directory: /trunk-1.2/epan/dissectors/
  Changes    Path                  Action
  +26 -13    packet-bootp.c        Modified
  +60 -18    packet-kerberos.c     Modified
  +1 -2      packet-kerberos.h     Modified
  +7 -9      packet-kink.c         Modified
  +8 -4      packet-spnego.c       Modified
  +3 -3      packet-ssl-utils.c    Modified

Directory: /trunk-1.2/docbook/
  Changes    Path                   Action
  +1 -0      Makefile.common        Modified
  +50 -17    README.txt             Modified
  +3 -2      developer-guide.xml    Modified
  +29 -78    release-notes.xml      Modified
  +7 -0      user-guide.xml         Modified


(113 files not shown)