[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2009/10/23 09:27 AM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r30468 | guy | 2009-10-10 02:38:37 -0700 (Sat, 10 Oct 2009) | 3 lines
 Changed paths:
    M /trunk/epan/libwireshark.def
 
 Add req_resp_hdrs_do_reassembly to the list of functions that are
 exported by libwireshark, so it's usable by plugins.
 ------------------------------------------------------------------------
 r30595 | morriss | 2009-10-18 07:46:39 -0700 (Sun, 18 Oct 2009) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-smb.c
 
 Fix an off-by-one error (<= instead of <) that caused the dissector to
 reference uninitialized memory, possibly leading to a crash (found by turning
 memory scrubbing on).
 ------------------------------------------------------------------------
 r30640 | gerald | 2009-10-20 09:22:14 -0700 (Tue, 20 Oct 2009) | 4 lines
 Changed paths:
    M /trunk/packaging/nsis/Makefile.am
    M /trunk/packaging/nsis/WinPcapPage.ini
    A /trunk/packaging/nsis/WinPcap_4_1.exe
    D /trunk/packaging/nsis/WinPcap_4_1_beta5.exe
    M /trunk/packaging/nsis/wireshark.nsi
 
 Update the WinPcap installer to 4.1. The WinPcap installer now enables
 NPF at startp, so remove the checkbox and associated code from the
 Wireshark installer.
 ------------------------------------------------------------------------
 r29885 | morriss | 2009-09-13 16:10:11 -0700 (Sun, 13 Sep 2009) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-tcp.c
 
 From Didier Gautheron via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3417
 
 Don't scale the window if the SYN flag is set.
 ------------------------------------------------------------------------
 r29957 | morriss | 2009-09-16 19:37:57 -0700 (Wed, 16 Sep 2009) | 24 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-edonkey.c
 
 From zeemon via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3848 :
 
 epan\dissectors\packet-edonkey.c
 In the fuction dissect_emule_sourceOBFU(): the line
 
 ti = proto_tree_add_item(tree, hf_emule_sourceOBFU, tvb, offset, 7 + ((settings & 0x08) ? 16 : 0), FALSE);
 
 should be
 
 ti = proto_tree_add_item(tree, hf_emule_sourceOBFU, tvb, offset, 7 + ((settings & 0x80) ? 16 : 0), FALSE);
 
 and, the line:
 
 if (settings & 0x08)
 
 should be:
 
 if (settings & 0x80)
 
 That is, 0x08 should be revised to 0x80.
 
 reference: the eMule0.49c source code, file PartFile.cpp, line 2730, in the
 function CPartFile::AddSources().
 
 ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
 ------------------------------------------------------------------------
 r30401 | morriss | 2009-10-08 07:28:23 -0700 (Thu, 08 Oct 2009) | 1 line
 Changed paths:
    M /trunk/epan/crc32.c
    M /trunk/epan/libwireshark.def
 
 As requested by Gregory Seidman on -dev: add CRC32 functions to libwireshark.def.  Use consistent indentation in crc32.c.
 ------------------------------------------------------------------------
 r30577 | jake | 2009-10-16 14:26:51 -0700 (Fri, 16 Oct 2009) | 7 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-fip.c
 
 From Joe Eykholt:
 The FIP dissector shows the VFID descriptor as a 2-byte string instead of the
 correct UINT16 type.   Also, the name should be changed to just "VFID".
 
 The "Fabric Name" field of the Fabric descriptor was incorrectly labeled.
 
 Also, some lines grew to longer than 80 columns due to other patches.
 ------------------------------------------------------------------------
 r30652 | gerald | 2009-10-20 20:13:42 -0700 (Tue, 20 Oct 2009) | 2 lines
 Changed paths:
    M /trunk/config.nmake
    M /trunk/packaging/nsis/Makefile.am
    M /trunk/packaging/nsis/Makefile.nmake
    D /trunk/packaging/nsis/WinPcap_4_1.exe
    A /trunk/packaging/nsis/WinPcap_4_1_1.exe
    M /trunk/packaging/nsis/wireshark.nsi
    M /trunk/tools/win32-setup.sh
    M /trunk/tools/win64-setup.sh
 
 Update WinPcap and the developer's pack to 4.1.1.
 ------------------------------------------------------------------------
 r30665 | gerald | 2009-10-22 10:00:26 -0700 (Thu, 22 Oct 2009) | 2 lines
 Changed paths:
    M /trunk/config.nmake
 
 Fix the WpdPack version on Win64.
 ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.2/epan/dissectors/
  Changes    Path                Action
  +2 -2      packet-edonkey.c    Modified
  +8 -5      packet-fip.c        Modified
  +16 -11    packet-rsl.c        Modified
  +1 -1      packet-smb.c        Modified
  +4 -7      packet-tcp.c        Modified
  +12 -12    packet-wps.c        Modified

Directory: /trunk-1.2/docbook/
  Changes    Path                 Action
  +40 -3     release-notes.xml    Modified

Directory: /trunk-1.2/epan/
  Changes    Path                Action
  +9 -0      libwireshark.def    Modified

Directory: /trunk-1.2/packaging/nsis/
  Changes    Path                     Action
  +1 -1      Makefile.am              Modified
  +0 -27     WinPcapPage.ini          Modified
  +0 -0      WinPcap_4_1_1.exe        Added


(5 files not shown)