Commit Graph

39 Commits

Author SHA1 Message Date
Bill Meier 94f28dd8f9 (FWIW) One step towards including stdio.h & stdlib.h only when req'd.
svn path=/trunk/; revision=29568
2009-08-26 19:27:49 +00:00
Anders Broman ca335d25cb From Kovarththanan Rajaratnam:
- Compute and cache color/custom filters dynamically.
- Delay column construction.

svn path=/trunk/; revision=29370
2009-08-10 20:52:56 +00:00
Stephen Fisher edc8ae64f1 Introduce packet list coloring for the NEW_PACKET_LIST. One caveat: when
enabling/disabling the coloring of the packet list from the menus, the user
has to drag the mouse cursor over each displayed row to take away/add the
coloring.  Dragging the scroll bar up or down will also take care of this as
only the displayed rows are colored.


svn path=/trunk/; revision=29142
2009-07-20 06:21:35 +00:00
Stephen Fisher e6d0686f7b Introduce experimental new feature: GTK2 tree view based packet list
To use the GTK2 based packet list, define NEW_PACKET_LIST when compiling.
To do this with gcc, set the environment variable CPPFLAGS to
"-DNEW_PACKET_LIST" and re-run configure.

Many features do not yet work.  This work began with prototypes by Ulf
quite a while back.  I've put quite a bit of work into this so far and
as discussed with a few of the core team members at Sharkfest09 and it was
decided that it would be best to commit what I have so far to allow others to
help work on this.


svn path=/trunk/; revision=28892
2009-06-30 18:05:04 +00:00
Jeff Morriss a5cee04fad Move the file utility functions from wiretap to libwsutil so that
libwireshark (and the plugins using those functions) do not depend on
wiretap on Windows.

While doing that, rename the eth_* functions to ws_*.

svn path=/trunk/; revision=25354
2008-05-22 15:46:27 +00:00
Bill Meier a2b19b3603 Fix another compile error ....
svn path=/trunk/; revision=24484
2008-02-27 00:24:24 +00:00
Jeff Morriss 2389b57232 get_datafile_path() and get_persconffile_path() return malloc'd memory,
free it when we're done with the file name.

svn path=/trunk/; revision=24478
2008-02-26 19:13:43 +00:00
Stig Bjørlykke a2d1e9005d This patch adds support for configuration profiles, which can be used to
configure and use more than one set of preferences and configuration files.

This can be found in the "Configuration Profiles..." menu item from the Edit
menu, or by pressing Shift-Ctrl-A.  It's also possible to start wireshark
and tshark with a named profile by using the "-C ProfileName" option.
A new status pane in the main window will show the current profile.

The configuration files currently stored in the Profiles are:
- Preferences
- Capture Filters
- Display Filters
- Coloring Rules
- Disabled Protocols
- User Accessible Tables

The recent data are by design not added to the profile.

Planned future enhancements:
- make a more convenient function to switch between profiles
- add a "clone profile" button to copy an existing profile
- make the profiles list active and accept return as OK
- save users "Decode as" in the profile
- make new, clone and deletion of profiles more secure
- make some of the recent values available in the profile

This patch also fixes:
- setting default status pane sizes
- a bug setting status pane for packets when not having main lower pane.

svn path=/trunk/; revision=24089
2008-01-14 16:40:23 +00:00
Sake Blok 9a2d18d386 Changes the name of the menu item "View/Reset Coloring" to
"View/Reset Coloring 1-10" and adds sensitivity to it so that
it will be greyed out when none of the temporary color filters
are used.

(as per discussion on wireshark-dev some time ago)


svn path=/trunk/; revision=23879
2007-12-15 23:38:29 +00:00
Sake Blok f9ca33580f Make it possible to "move" a filter around the temporary coloring rules
svn path=/trunk/; revision=23585
2007-11-25 15:55:45 +00:00
Sake Blok 61e7574a5c Reset the temporary coloring filters to defaults instead of doing it
implicitly by calling "color_filters_init()". This should probably
fix the crashes experienced when pressing ctrl-space a couple of times


svn path=/trunk/; revision=23583
2007-11-25 14:17:56 +00:00
Sake Blok db2f6ce546 Fixes crashing when opening color filters and pressing OK
(introduced in SVN 23560)


svn path=/trunk/; revision=23582
2007-11-25 12:36:33 +00:00
Sake Blok 9b6f806089 This patch adds (ten) temporary coloring rules which will only live until Wireshark is
quit. Temporary coloring filters can be set by:

- pressing <ctrl>-<digit> will create a conversation coloring filter based on the
  addresses of the currently selected packet (order TCP/UDP/IP/Ethernet)
  This can also be achieved from the "View|Colorize Conversation" menu.

- Rightclicking on a packet in the packet-list will give the option to
  "Colorize Conversation" just as "Conversation Filter" does.

- Rightclicking on an item in the packet-detail-list will give the option to
  "Colorize with filter" which works similar to "Apply as filter"

Temporary filters can be cleared from the same menus or by pressing <ctrl>-<space>.

This patch also adds an item to the above mentioned menu's to add a permanent color filter
in the same way.


The colors for the temporary coloring rules are now hardcoded as I do not know
how to change the color of menu-items and therefore I chose to use icons to
show the actual color of each of the ten temporary coloring rules. Is it at all
possible to have different menu items in different colors?

One other way of solving this is to recreate the icons on the fly after changing
the colors. I will have a look into that once it is clear whether I can use 
different colors within the menu structure.


svn path=/trunk/; revision=23560
2007-11-24 11:38:16 +00:00
Sake Blok 508e268063 This patch makes it possible to disable individual coloring rules
without having to delete them. The patch has been tested on
Fedora-7 with GTK+ 1.2.10 and GTK+ 2.10.11.

Since I don't know how to use "strikethrough" in clists in GTK1
there is a little difference in how the disabled coloring rules
are displayed. In GTK2 they are striked through and in GTK1
they are shown in lightgrey on a white background.

Any info on how to use strikthrough in clists within GTK1 is more
than welcome :-)


svn path=/trunk/; revision=23421
2007-11-10 15:18:49 +00:00
Richard van der Hoff 0c3e8b7c31 From Florent DROUIN <florent.drouin@alcatel.fr>, bug 1518:
Fix for g_assert when clicking 'OK' on colour filters dialogue whilst
individual filter edit window is open. 


svn path=/trunk/; revision=22572
2007-08-21 21:15:57 +00:00
Ulf Lamping ba962a91ea fix 1203 as found by stephen fisher
svn path=/trunk/; revision=19839
2006-11-06 23:59:49 +00:00
Guy Harris ea6f745160 Fix some compiler warnings.
svn path=/trunk/; revision=19470
2006-10-10 08:07:14 +00:00
Ulf Lamping 7a7b422fa9 fix the memory leak problem mentioned lately by adding and using color_filters_cleanup()
svn path=/trunk/; revision=19422
2006-10-03 23:24:48 +00:00
Ulf Lamping 0da877169b changes of the coloring rules sometimes crashed as dissection keeps pointers to the color_filter for later reference -> simply deleting the filters leave the pointers invalid -> crash.
for now, don't delete the filters but keep them floating around in memory (leaking) -> at least better than crashing

svn path=/trunk/; revision=19421
2006-10-03 22:32:03 +00:00
Ulf Lamping 9e6c7b11ae Implement a real "Cancel" button for the coloring rules dialog - this was a hard one! It seems to be working without bugs and as designed now.
As this was a huge internal change, new bugs are very probable - please report.

The implementation isn't still perfect, a new dialog internal list could possibly be removed again. 

However, I want to check in at this condition, just in case I make things worse - again.

svn path=/trunk/; revision=19413
2006-10-03 18:39:36 +00:00
Ulf Lamping 59d206d18e further code cleanup: don't use the term "marked" for the color filters, the right term is "selected". That caused me "concerns" wether the marked feature of the packet list was involved - which is actually not
svn path=/trunk/; revision=19399
2006-10-02 23:01:33 +00:00
Ulf Lamping b2c8fb8f55 refactor apply_color_filter() as it was a bit confusing - it will also be a bit faster now -
and some other minor code cleanup

svn path=/trunk/; revision=19398
2006-10-02 21:55:26 +00:00
Ronnie Sahlberg f0b33a4789 ethereal->wireshark updates
svn path=/trunk/; revision=18206
2006-05-22 08:14:01 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Ulf Lamping c3187174bf replace *a lot* of file related calls by their GLib counterparts. This is necessary for the switch to GTK 2.6 (at least on WIN32).
to do this, I've added file_util.h to wiretap (would file_compat.h be a better name?), and provide compat_macros like eth_open() instead of open(). While at it, move other file related things there, like #include <io.h>, definition of O_BINARY and alike, so it's all in one place.

deleted related things from config.h.win32

As of these massive changes, I'm almost certain that this will break the Unix build. I'll keep an eye on the buildbot so hopefully everything is working again soon.

svn path=/trunk/; revision=16403
2005-11-06 22:43:25 +00:00
Jörg Mayer 956eee946f Some 'no previous declararion' warning fixes
svn path=/trunk/; revision=15355
2005-08-14 23:25:20 +00:00
Jörg Mayer 4e1f4b18ab More char -> const char warning fixes.
Removed (very few) casts that only change the warning message
  but don't remove it (with gcc-4).

svn path=/trunk/; revision=15227
2005-08-05 20:59:08 +00:00
Ulf Lamping 729749c5b9 add a new checkitem "Colorize Packet List" into the View menu
keep it's setting in the recent file

svn path=/trunk/; revision=13929
2005-03-27 02:19:51 +00:00
Ulf Lamping 2b8ac21d60 move some color_filter related things from file.c to color_filters.c
svn path=/trunk/; revision=13920
2005-03-26 11:32:43 +00:00
Guy Harris f3d2a926e2 There's no need to create a directory just because you're about to
remove a file in it - the directory presumably exists already, if you're
about to remove a file in it.

svn path=/trunk/; revision=13914
2005-03-26 03:27:46 +00:00
Ulf Lamping ccff84dbdf code cleanup: use common prefix for all functions in color_filters.h
svn path=/trunk/; revision=13910
2005-03-26 01:09:14 +00:00
Ulf Lamping 008d4b8106 code cleanup: the term filter_list was used with different meanings throughout the code, and the filter_list of the color_filters is "global".
use appropriate prefixes to avoid confusion and bugs

svn path=/trunk/; revision=13905
2005-03-25 22:52:45 +00:00
Lars Roland f3294ee49a change nmake makefiles in /trunk and /trunk/epan so that
object code for libethereal.dll isn't generated by the
makefile in /trunk.

Having no code in /trunk linked into libethereal.dll
anymore, the definition of the macro _NEED_VAR_IMPORT_
can be moved from various source files in /trunk to /trunk/Makefile.nmake .
So do that, too.

svn path=/trunk/; revision=13389
2005-02-13 00:10:15 +00:00
Guy Harris 1d182e4fcc "get_persconffile_path()" doesn't return a "const char *", it just
returns a "char *", so don't assign its return value to a "const char *".

svn path=/trunk/; revision=12882
2004-12-31 00:29:09 +00:00
Ulf Lamping 6f0ad62d14 fixed some comment typos
svn path=/trunk/; revision=12057
2004-09-21 05:17:59 +00:00
Guy Harris d3e6d377e1 From Lars Roland: _NEED_VAR_IMPORT_ has to be defined so that variables
are imported correctly from libethereal.dll when compiling with MSVC.

svn path=/trunk/; revision=11516
2004-07-25 09:55:52 +00:00
Guy Harris 13e4c5b1f2 Rename "create_color()" to "initialize_color()", as that reflects a bit
better what it actually does.

svn path=/trunk/; revision=11502
2004-07-24 02:08:42 +00:00
Guy Harris e046206fad Add some comments from Gerald's Windows version of color_filters.c.
svn path=/trunk/; revision=11501
2004-07-24 01:32:29 +00:00
Guy Harris b67a0f92d2 Move color_filters.c and color_filters.h up to the top-level directory,
as they're now (theoretically) toolkit-independent (modulo changes that
might be required to the code to update filter lists when a new filter
is read in).

svn path=/trunk/; revision=11500
2004-07-24 01:29:12 +00:00