[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2009/06/08 08:38 AM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r28502 | rbalint | 2009-05-26 21:42:43 -0500 (Tue, 26 May 2009) | 4 lines
 Changed paths:
    M /trunk/gtk/dlg_utils.c
    M /trunk/gtk/main.c
    M /trunk/gtk/simple_dialog.c
    M /trunk/gtk/stock_icons.c
    M /trunk/gtk/stock_icons.h
    M /trunk/simple_dialog.h
 
 Change button label to "Quit without Saving" from "Continue without Saving" 
 when exiting Wireshark and having an open, not yet saved capture file.
 This fixes bug 1427.
 ------------------------------------------------------------------------
 r28503 | stig | 2009-05-27 09:13:55 -0500 (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.
 ------------------------------------------------------------------------
 r28509 | etxrab | 2009-05-27 13:22:39 -0500 (Wed, 27 May 2009) | 1 line
 Changed paths:
    M /trunk/asn1/h245/h245.cnf
    M /trunk/asn1/h245/packet-h245-template.c
    M /trunk/epan/dissectors/packet-h245.c
 
 Detect if the setup channel is video or not.
 ------------------------------------------------------------------------
 r28513 | stig | 2009-05-28 03:38:49 -0500 (Thu, 28 May 2009) | 9 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-zbee-security.c
 
 From Tobias Witek (bug 3496):
 The patch puts the function declarations for zbee_sec_ccm_decrypt() and
 zbee_sec_key_hash() into a #ifdef HAVE_LIBGCRYPT guardian to avoid gcc from
 complaining about functions that are declared as 'static' but never defined.
 
 It additionally puts the function zbee_sec_make_nonce() (and its declaration)
 into a #ifdef HAVE_LIBGCRYPT guardian to avoid gcc from complaining about a
 defined but unused function, if libgcrypt is not used.
 ------------------------------------------------------------------------
 r28514 | jake | 2009-05-28 13:42:40 -0500 (Thu, 28 May 2009) | 1 line
 Changed paths:
    M /trunk/packaging/nsis/Makefile.nmake
 
 Include profinet plugin in PLUGINS symbol.
 ------------------------------------------------------------------------
 r28525 | gerald | 2009-05-29 12:12:20 -0500 (Fri, 29 May 2009) | 2 lines
 Changed paths:
    M /trunk/docbook/developer-guide.xml
    M /trunk/docbook/user-guide.xml
 
 Update version numbers.
 ------------------------------------------------------------------------
 r28527 | gerald | 2009-05-29 13:45:24 -0500 (Fri, 29 May 2009) | 2 lines
 Changed paths:
    M /trunk/Makefile.nmake
    M /trunk/tools/win32-setup.sh
    M /trunk/tools/win64-setup.sh
 
 Update the Windows library tags and documentation filename.
 ------------------------------------------------------------------------
 r28534 | wmeier | 2009-05-30 13:07:35 -0500 (Sat, 30 May 2009) | 11 lines
 Changed paths:
    M /trunk/gtk/iax2_analysis.c
 
 Fix the save_as functions so they work (including work-around 
 when save-as raises an alert box). 
 Also:
 - save_as_csv: don't skip over first line of output;
 - save_as_csv: Fix some (probably significant) memory leaks
   associated with the use of gtk_tree_view;
 - Prevent tendency for IAX2 stream window and graph window 
   to get lost behind other windows;
 - Minor save_as dialog window reformatting;
 - Misc source code cleanup & reformatting.
 ------------------------------------------------------------------------
 r28536 | guy | 2009-05-30 15:02:38 -0500 (Sat, 30 May 2009) | 3 lines
 Changed paths:
    M /trunk/gtk/iax2_analysis.c
 
 gtk_file_chooser_set_do_overwrite_confirmation() is only available in
 2.8 and later.
 ------------------------------------------------------------------------
 r28552 | wmeier | 2009-06-01 06:35:52 -0500 (Mon, 01 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/gtk/iax2_analysis.c
 
 Fix minor memory leaks; Minor reformatting
 ------------------------------------------------------------------------
 r28535 | tuexen | 2009-05-30 14:52:41 -0500 (Sat, 30 May 2009) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ssl-utils.c
 
 Add cipher suites defined in RFC 4279.
 ------------------------------------------------------------------------
 r28542 | tuexen | 2009-05-31 10:25:38 -0500 (Sun, 31 May 2009) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ssl-utils.c
 
 Bring cipher suites in sync.
 ------------------------------------------------------------------------
 r28546 | etxrab | 2009-05-31 12:06:04 -0500 (Sun, 31 May 2009) | 1 line
 Changed paths:
    M /trunk/gtk/rtp_analysis.c
    M /trunk/tap-rtp-common.c
    M /trunk/tap-rtp.c
 
 Calculate jitter and delta in ms.
 ------------------------------------------------------------------------
 r28551 | etxrab | 2009-05-31 14:55:30 -0500 (Sun, 31 May 2009) | 18 lines
 Changed paths:
    M /trunk/gtk/rtp_analysis.c
 
 Copy the changes from:
 http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=28534
 
 User: wmeier
 Date: 2009/05/30 11:07 AM
 
 Log:
  Fix the save_as functions so they work (including work-around  when save-as raises an alert box). 
  Also:
  - save_as_csv: don't skip over first line of output;
  - save_as_csv: Fix some (probably significant) memory leaks
    associated with the use of gtk_tree_view;
  - Prevent tendency for IAX2 stream window and graph window 
    to get lost behind other windows;
  - Minor save_as dialog window reformatting;
  - Misc source code cleanup & reformatting.
 
 To RTP Analysis.
 ------------------------------------------------------------------------
 r28553 | wmeier | 2009-06-01 07:32:02 -0500 (Mon, 01 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/gtk/rtp_analysis.c
 
 Fix a few more memory leaks & do a few other minor changes
 ------------------------------------------------------------------------
 r28550 | stig | 2009-05-31 14:46:31 -0500 (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.
 ------------------------------------------------------------------------
 r28554 | wmeier | 2009-06-01 09:00:09 -0500 (Mon, 01 Jun 2009) | 6 lines
 Changed paths:
    M /trunk/gtk/graph_analysis.c
 
 flow_graph & etc: rework graph "save as" slightly:
  - Pop up an alert box if unable to open file for write;
  - Prevent "dead" save-as window if unable to open file for write
     or if a directory is entered as the filename;
  - Fix a memory leak.
 ------------------------------------------------------------------------
 r28555 | stig | 2009-06-01 09:51:09 -0500 (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 10:26:15 -0500 (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.
 ------------------------------------------------------------------------
 r28560 | etxrab | 2009-06-01 11:44:05 -0500 (Mon, 01 Jun 2009) | 1 line
 Changed paths:
    M /trunk/gtk/rtp_analysis.c
    M /trunk/tap-rtp-common.c
 
 Show max and mean Jitter.
 ------------------------------------------------------------------------
 r28569 | stig | 2009-06-01 12:52:14 -0500 (Mon, 01 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/gtk/rtp_analysis.c
 
 Fix a printf to make the label correct.
 ------------------------------------------------------------------------
 r28574 | wmeier | 2009-06-01 14:43:58 -0500 (Mon, 01 Jun 2009) | 9 lines
 Changed paths:
    M /trunk/gtk/follow_stream.c
    M /trunk/gtk/follow_stream.h
 
 follow_stream: rework "save as" slightly:
   - Prevent "dead" save-as window if unable to open file for write
      or if a directory is entered as the filename;
      Work-around is to always kill save-as window whether success
       or an error causing alert-box popup;
   - Fix a memory leak.
   - Define certain functions used only in follow_stream.c as static;
     (Remove declarations for them from follow_stream.h)
 ------------------------------------------------------------------------
 r28600 | wmeier | 2009-06-02 10:39:20 -0500 (Tue, 02 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/gtk/follow_stream.c
 
 follow_stream: Enable "check for file overwrite" (if GTK 2.8 or greater);
 ------------------------------------------------------------------------
 r28577 | wmeier | 2009-06-01 15:52:53 -0500 (Mon, 01 Jun 2009) | 8 lines
 Changed paths:
    M /trunk/gtk/main_proto_draw.c
 
 proto_main_draw:  rework packet bytes "save as" slightly:
    - Prevent "dead" save-as window if error opening/writing file
       or if a directory is entered as the filename;
       Work-around is to always kill save-as window whether success
        or an error causing alert-box popup;
    - Enable "check for file overwrite" (if GTK 2.8 or greater);
    - Fix some memory leaks.
 ------------------------------------------------------------------------
 r28584 | guy | 2009-06-02 02:18:18 -0500 (Tue, 02 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/wiretap/netmon.c
    M /trunk/wiretap/pcap-common.c
    M /trunk/wiretap/snoop.c
 
 No newlines in the additional-error-information string, please.
 ------------------------------------------------------------------------
 r28592 | stig | 2009-06-02 05:40:58 -0500 (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.
 ------------------------------------------------------------------------
 r28597 | wmeier | 2009-06-02 10:17:35 -0500 (Tue, 02 Jun 2009) | 8 lines
 Changed paths:
    M /trunk/gtk/rtp_stream_dlg.c
 
 rtp_stream_dlg: rework dtp_stream "save as" slightly:
     - Prevent "dead" save-as window if error opening/writing file
        or if a directory is entered as the filename;
        Work-around is to always kill save-as window whether success
         or an error causing alert-box popup;
     - Enable "check for file overwrite" (if GTK 2.8 or greater);
     - Fix some memory leaks.
 ------------------------------------------------------------------------
 r28605 | stig | 2009-06-02 13:47:36 -0500 (Tue, 02 Jun 2009) | 3 lines
 Changed paths:
    M /trunk/gtk/main.c
 
 From Graham Bloice via bug 3504:
 Fix concurrent name resolution for c-ares.
 ------------------------------------------------------------------------
 r28606 | etxrab | 2009-06-02 14:05:20 -0500 (Tue, 02 Jun 2009) | 1 line
 Changed paths:
    M /trunk/gtk/rtp_analysis.c
    M /trunk/gtk/rtp_analysis.h
    M /trunk/tap-rtp-common.c
 
 Calculate skew and clock drift, make it possible to copy the label.
 ------------------------------------------------------------------------
 r28611 | etxrab | 2009-06-02 15:01:01 -0500 (Tue, 02 Jun 2009) | 1 line
 Changed paths:
    M /trunk/tap-rtp-common.c
 
 Fix "tap-rtp-common.c:440: warning: ?\195?\162?\226?\130?\172?\203?\156current_diff?\195?\162?\226?\130?\172?\226?\132?\162 may be used uninitialized in this function"
 ------------------------------------------------------------------------
 r28607 | guy | 2009-06-02 14:06:05 -0500 (Tue, 02 Jun 2009) | 5 lines
 Changed paths:
    M /trunk/wiretap/libpcap.c
    M /trunk/wiretap/pcap-common.c
    M /trunk/wiretap/pcap-common.h
 
 When doing a seek-and-read, don't check the packet size, as we don't
 have it (we have the size with the pseudo-header length already
 removed); we've already read the packet, and thus have already checked
 it.  Fixes bug 3501.
 ------------------------------------------------------------------------
 r28608 | wmeier | 2009-06-02 14:16:08 -0500 (Tue, 02 Jun 2009) | 8 lines
 Changed paths:
    M /trunk/gtk/firewall_dlg.c
    M /trunk/gtk/pixmap_save.c
 
 io_stat save & filewall rule save: rework "save dialog" slightly:
      - Prevent "dead" save-as window if error opening/writing file
         or if a directory is entered as the filename;
         Work-around is to always kill save-as window whether success
          or an error causing alert-box popup;
      - Enable "check for file overwrite" (if GTK 2.8 or greater);
      - Fix some memory leaks.
 ------------------------------------------------------------------------
 r28609 | stig | 2009-06-02 14:35:45 -0500 (Tue, 02 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-memcache.c
 
 Fixed the type for key_len in dissect_key().
 ------------------------------------------------------------------------
 r28618 | rbalint | 2009-06-03 01:38:21 -0500 (Wed, 03 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/doc/idl2wrs.pod
    M /trunk/doc/wireshark.pod
 
 Fix pod errors in man pods.
 ------------------------------------------------------------------------
 r28620 | stig | 2009-06-03 05:38:07 -0500 (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.
 ------------------------------------------------------------------------
 r28621 | stig | 2009-06-03 07:13:07 -0500 (Wed, 03 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/acinclude.m4
    M /trunk/configure.in
 
 Use liblua by default, if available.
 ------------------------------------------------------------------------
 r28622 | stig | 2009-06-03 08:21:48 -0500 (Wed, 03 Jun 2009) | 3 lines
 Changed paths:
    M /trunk/acinclude.m4
 
 Added check for extraneous lua header directories, as some systems
 apparently put the headers in a "lua5.1" subdirectory.
 ------------------------------------------------------------------------
 r28623 | stig | 2009-06-03 08:45:48 -0500 (Wed, 03 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/acinclude.m4
 
 Only give a failure message if configuring with --with-lua=yes.
 ------------------------------------------------------------------------
 r28624 | stig | 2009-06-03 10:28:30 -0500 (Wed, 03 Jun 2009) | 3 lines
 Changed paths:
    M /trunk/acinclude.m4
 
 Fixed setting of LUA_INCLUDES when having extraneous lua heder directory.
 Fixed resetting flags after negative check for Lua.
 ------------------------------------------------------------------------
 r28625 | stig | 2009-06-03 10:40:12 -0500 (Wed, 03 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/acinclude.m4
 
 Don't reuse lua_dir in a for loop.
 ------------------------------------------------------------------------
 r28629 | etxrab | 2009-06-03 14:17:35 -0500 (Wed, 03 Jun 2009) | 1 line
 Changed paths:
    M /trunk/gtk/rtp_stream_dlg.c
 
 Unit is now ms.
 ------------------------------------------------------------------------
 r28633 | stig | 2009-06-04 03:21:51 -0500 (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.
 ------------------------------------------------------------------------
 r28636 | stig | 2009-06-04 09:22:16 -0500 (Thu, 04 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/epan/expert.c
 
 Added missing PI_DEBUG to expert_group_vals[].
 ------------------------------------------------------------------------
 r28637 | stig | 2009-06-04 09:23:30 -0500 (Thu, 04 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/epan/wslua/init_wslua.c
 
 Changed expert infos from PI_DEBUG to PI_UNDECODED for Lua errors.
 ------------------------------------------------------------------------
 r28640 | jake | 2009-06-04 12:37:48 -0500 (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.
 ------------------------------------------------------------------------
 r28648 | etxrab | 2009-06-06 12:03:34 -0500 (Sat, 06 Jun 2009) | 1 line
 Changed paths:
    M /trunk/asn1/s1ap/s1ap.cnf
    M /trunk/epan/dissectors/packet-nas_eps.c
    M /trunk/epan/dissectors/packet-s1ap.c
    M /trunk/epan/packet.c
    M /trunk/epan/packet_info.h
 
 Handle Detach and Service request, make it possible to set direction on link(UL/DL).
 ------------------------------------------------------------------------
 r28649 | etxrab | 2009-06-06 12:08:01 -0500 (Sat, 06 Jun 2009) | 1 line
 Changed paths:
    M /trunk/gtk/iax2_analysis.h
    M /trunk/gtk/rtp_analysis.c
    M /trunk/gtk/rtp_analysis.h
    M /trunk/tap-rtp-common.c
 
 Add time stamp to the list.
 ------------------------------------------------------------------------
 r28653 | guy | 2009-06-07 21:12:23 -0500 (Sun, 07 Jun 2009) | 4 lines
 Changed paths:
    M /trunk/acinclude.m4
 
 Check for a pcap-config script (as provided by libpcap 1.x) and, if we
 find it, use it to determine where to find libpcap and what additional
 libraries it requires.
 ------------------------------------------------------------------------
 r28659 | stig | 2009-06-08 05:03:41 -0500 (Mon, 08 Jun 2009) | 3 lines
 Changed paths:
    M /trunk/tools/lemon/lemon.c
 
 Remove resetting useCnt in errsym, as it seems to disable some error checking
 we need to validate the filter syntax.
 ------------------------------------------------------------------------
 r28660 | stig | 2009-06-08 06:54:38 -0500 (Mon, 08 Jun 2009) | 2 lines
 Changed paths:
    M /trunk/tools/lemon/lempar.c
 
 Move declaration of yymx.
 ------------------------------------------------------------------------
 
 
 Copy over the following by hand:
 ------------------------------------------------------------------------
 r28526 | gerald | 2009-05-29 12:57:55 -0500 (Fri, 29 May 2009) | 2 lines
 Changed paths:
    M /trunk/docbook/wsdg_graphics/ws-logo.png
    M /trunk/docbook/wsug_graphics/ws-logo.png
 
 Update the logo in the documentation.
 ------------------------------------------------------------------------
 r28642 | tuexen | 2009-06-05 08:33:18 -0500 (Fri, 05 Jun 2009) | 4 lines
 Changed paths:
    M /trunk/AUTHORS
    M /trunk/epan/dissectors/packet-sctp.c
    M /trunk/gtk/sctp_chunk_stat.c
    M /trunk/gtk/sctp_chunk_stat_dlg.c
    M /trunk/gtk/sctp_graph_dlg.c
    M /trunk/gtk/sctp_stat.c
    M /trunk/gtk/sctp_stat.h
 
 * Fix name of Irene in AUTHORS.
 * Add Varun Notibala to AUTHORS.
 * Add support for NR-SACK and fix stability problems.
 ------------------------------------------------------------------------

Directory: /trunk-1.2/epan/dfilter/
  Changes    Path          Action
  +146 -24   semcheck.c    Modified

Directory: /trunk-1.2/epan/dissectors/
  Changes    Path                      Action
  +1 -1      packet-edonkey.c          Modified
  +24 -8     packet-h245.c             Modified
  +1 -1      packet-ieee80211.c        Modified
  +1 -1      packet-memcache.c         Modified
  +183 -47   packet-nas_eps.c          Modified
  +15 -1     packet-s1ap.c             Modified
  +344 -114  packet-sctp.c             Modified
  +152 -2    packet-ssl-utils.c        Modified
  +6 -2      packet-zbee-security.c    Modified


(56 files not shown)