[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2009/09/04 02:26 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r25183 | stig | 2008-04-27 03:54:25 -0700 (Sun, 27 Apr 2008) | 3 lines
 Changed paths:
    M /trunk/Makefile.am
 
 Add adns_dll.dep and adns_dll.rc to the tarball, as requested by Sake
 and indicated by Anders.
 ------------------------------------------------------------------------
 r25871 | morriss | 2008-07-30 06:34:23 -0700 (Wed, 30 Jul 2008) | 1 line
 Changed paths:
    M /trunk/epan/dissectors/packet-ftp.c
 
 Register the FTP and ftp-data dissectors by name
 ------------------------------------------------------------------------
 r28471 | sake | 2009-05-25 12:59:17 -0700 (Mon, 25 May 2009) | 9 lines
 Changed paths:
    M /trunk/wiretap/netscreen.c
 
 Fix for bug 3469:
 
 In Juniper NetScreen snoop output files, the encapsulation type of
 traffic on ADSL interfaces can be ethernet or PPP. Check whether the
 first 6 bytes of the data are the same as the destination mac-address
 in the packet header. If they are, assume ethernet. If not, assume PPP.
 ------------------------------------------------------------------------
 r28550 | stig | 2009-05-31 12:46:31 -0700 (Sun, 31 May 2009) | 4 lines
 Changed paths:
    M /trunk/epan/dfilter/semcheck.c
 
 From yami (bug 3361):
 Try to resolve a crash issue when having a function on the RHS
 of a filter test which does not return the same type as the LHS.
 ------------------------------------------------------------------------
 r28555 | stig | 2009-06-01 07:51:09 -0700 (Mon, 01 Jun 2009) | 5 lines
 Changed paths:
    M /trunk/file.c
 
 From Kovarththanan Rajaratnam via bug 3429:
 This patch downgrades the g_assert() to a proper if statement. This is needed
 because we can end up with a match but _without_ any valid row attached to it.
 This is the case when the user has aborted while dissecting.
 ------------------------------------------------------------------------
 r28556 | stig | 2009-06-01 08:26:15 -0700 (Mon, 01 Jun 2009) | 3 lines
 Changed paths:
    M /trunk/file.c
 
 Popup a dialog in case we match a row outside the loaded frame area.
 This adds some information for bug 3429.
 ------------------------------------------------------------------------
 r28620 | stig | 2009-06-03 03:38:07 -0700 (Wed, 03 Jun 2009) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ieee80211.c
 
 Fixed bit position for wlan_mgt.fixed.delba.param.initiator.
 
 This fixes bug 3505.
 ------------------------------------------------------------------------
 r28633 | stig | 2009-06-04 01:21:51 -0700 (Thu, 04 Jun 2009) | 4 lines
 Changed paths:
    M /trunk/epan/wslua/wslua_proto.c
 
 From Sam Roberts:
 The value_string_from_table()'s use of the lua stack is not balanced,
 if a table is iterated, it pops one more time than it should.
 ------------------------------------------------------------------------
 r28640 | jake | 2009-06-04 10:37:48 -0700 (Thu, 04 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-edonkey.c
 
 From Jakub Zawadzki:
 Fix edonkey dissector a little, by using gint type for tvb_length_remaining() result.
 ------------------------------------------------------------------------
 r28696 | tuexen | 2009-06-11 04:24:29 -0700 (Thu, 11 Jun 2009) | 3 lines
 Changed paths:
    M /trunk/wiretap/pcapng.c
 
 When writing pcapng files use correct interface index
 of 0 instead of 1.
 ------------------------------------------------------------------------
 r28917 | stig | 2009-07-01 23:51:27 -0700 (Wed, 01 Jul 2009) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-mip6.c
    M /trunk/epan/dissectors/packet-mip6.h
 
 From Albert Chin:
 Small patch to make it compile on AIX.
 ------------------------------------------------------------------------
 r29051 | stig | 2009-07-10 02:12:13 -0700 (Fri, 10 Jul 2009) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ff.c
 
 Use correct length for "Version OD Calling".
 This fixes bug 3694.
 ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 ------------------------------------------------------------------------
 r28482 | stig | 2009-05-26 06:52:03 -0700 (Tue, 26 May 2009) | 3 lines
 Changed paths:
    M /trunk/gtk/capture_if_dlg.c
 
 From Carlos G Mendioroz:
 Use the user defined comment in the Capture Interfaces dialog box.
 ------------------------------------------------------------------------
 r28503 | stig | 2009-05-27 07:13:55 -0700 (Wed, 27 May 2009) | 3 lines
 Changed paths:
    M /trunk/gtk/about_dlg.c
    M /trunk/gtk/main.c
 
 From Siddhes (bug 3483):
 Throttle splash screen updates when running remote.
 ------------------------------------------------------------------------
 r28538 | jake | 2009-05-31 04:31:40 -0700 (Sun, 31 May 2009) | 2 lines
 Changed paths:
    M /trunk/file.c
 
 Fix bug 3489:
 Array overrun at copy of filter expression on GTK1 build.
 ------------------------------------------------------------------------
 r28549 | rbalint | 2009-05-31 11:38:28 -0700 (Sun, 31 May 2009) | 3 lines
 Changed paths:
    M /trunk/dumpcap.c
 
 Set SIGPIPE handler every time the program starts.
 This hopefully fixes bug 1740.
 ------------------------------------------------------------------------
 r28592 | stig | 2009-06-02 03:40:58 -0700 (Tue, 02 Jun 2009) | 3 lines
 Changed paths:
    M /trunk/gtk/expert_comp_dlg.c
    M /trunk/gtk/expert_comp_table.h
 
 From Jim Young (bug 2504):
 Quick fix to sync expert_tapdata_s.
 ------------------------------------------------------------------------
 r28670 | sake | 2009-06-08 23:23:37 -0700 (Mon, 08 Jun 2009) | 14 lines
 Changed paths:
    M /trunk/docbook/wsug_src/WSUG_chapter_use.xml
    M /trunk/gtk/main_menu.c
 
 Reverted part of SVN 27411. The "home" and "end" key bindings overruled
 the use of these keys while editing a filter in the filter toolbar.
 The keys "ctrl-home" and "ctrl-end" already provide the functionality to 
 go to the first or last packet in the packet-list. I added these as
 accelerator keys and updated the users guide accordingly.
 
 Of course we can also make "home" and "end" work, without breaking 
 functionality in the filter toolbar, but that takes a little more
 work (at least for me... maybe not after going to Steve's session
 at Sharkfest :-)).
 
 (will add this to inclusion list for 1.0.9 and 1.2.0)
 ------------------------------------------------------------------------
 r28684 | gerald | 2009-06-09 18:30:49 -0700 (Tue, 09 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/Makefile.nmake
    M /trunk/config.nmake
    M /trunk/packaging/nsis/wireshark.nsi
 
 Upgrade to KFW 3.2.2.
 ------------------------------------------------------------------------
 r28749 | gerald | 2009-06-15 15:25:05 -0700 (Mon, 15 Jun 2009) | 7 lines
 Changed paths:
    M /trunk/wiretap/ascend.y
 
 From Ben Winslow via bug 3535:
 
 Because Lucent/Ascend equipment will sometimes omit the hex dump for a packet
 or send two headers followed by two hex dumps, Wireshark needs to be very
 lenient when parsing a Lucent/Ascend trace.  On a busy access server, a packet
 like this is pretty likely to appear within a few minutes.
 ------------------------------------------------------------------------
 r28815 | gerald | 2009-06-22 15:38:29 -0700 (Mon, 22 Jun 2009) | 5 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-afs.c
 
 Instead of tvb_get_ptr + ep_alloc + proto_tree_add_string to fetch a string and
 add it to the tree, just call proto_tree_add_item. Fixes bug 3564.
 
 Replace another tvb_get_ptr call with tvb_format_text.
 ------------------------------------------------------------------------
 r28839 | stig | 2009-06-24 18:50:56 -0700 (Wed, 24 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-infiniband.c
 
 Remove a tvb_free() call.
 ------------------------------------------------------------------------
 r28931 | wmeier | 2009-07-02 18:11:23 -0700 (Thu, 02 Jul 2009) | 12 lines
 Changed paths:
    M /trunk/epan/dfilter/semcheck.c
    M /trunk/gtk/dfilter_expr_dlg.c
 
 From  Kovarththanan Rajaratnam: Fixes for bug #3536
 (plus some additional changes by me).
 
 Handle BASE_RANGE_STRING display types properly
 
 We always treat header field info strings as value_string's undiscriminated.
 However, if the header field info display is marked as BASE_RANGE_STRING, we
 need to treat them as range_string's. This wasn't properly handled in the
 filter expression dialog and in the filter toolbar which would cause a crash
 upon referencing any fields marked as BASE_RANGE_STRING.
 ------------------------------------------------------------------------
 
 
 Copy over services from /trunk. Update the release notes. Use the latest
 wireshark-win32-libs tag.

Directory: /trunk-1.0/epan/dfilter/
  Changes    Path          Action
  +163 -35   semcheck.c    Modified

Directory: /trunk-1.0/epan/dissectors/
  Changes    Path                  Action
  +5 -11     packet-afs.c          Modified
  +1 -1      packet-edonkey.c      Modified
  +1 -1      packet-ff.c           Modified
  +6 -4      packet-ftp.c          Modified
  +1 -1      packet-ieee80211.c    Modified
  +1 -1      packet-mip6.c         Modified
  +1 -1      packet-mip6.h         Modified

Directory: /trunk-1.0/docbook/
  Changes    Path                 Action
  +102 -13   release-notes.xml    Modified

Directory: /trunk-1.0/gtk/
  Changes    Path                     Action
  +7 -4      about_dlg.c              Modified
  +11 -4     capture_if_dlg.c         Modified


(20 files not shown)