Commit Graph

72 Commits

Author SHA1 Message Date
Stig Bjørlykke ef92b4ec11 Added "Ignore Packet" menu items to the main menu.
Show ignored packages in the summary dialog.

svn path=/trunk/; revision=31289
2009-12-17 12:05:13 +00:00
Guy Harris 54c159cb41 Turn on -Wshorten-64-to-32 by default, and fix some issues that turned
up (99 44/100% of which were assignments of double-precision
floating-point constants to floats).  Hopefully this will catch at least
some P64 issues on UN*X.

svn path=/trunk/; revision=28108
2009-04-21 16:57:52 +00:00
Stig Bjørlykke b934653277 Use bold labels for headings.
svn path=/trunk/; revision=27525
2009-02-23 17:28:31 +00:00
Gerald Combs c99312dae0 Use a more accurate variable name for the wiretap file type. Add the file
encapsulation to the summary display.

svn path=/trunk/; revision=26459
2008-10-14 22:55:16 +00:00
Bill Meier 56206e0002 Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API
gtk_container_border_width()          ==> gtk_container_set_border_width()
  gtk_container_children()              ==> gtk_container_get_children()
  gtk_entry_new_with_max_length()       ==> gtk_entry_new(); gtk_entry_set_max_length()
  gtk_menu_append()                     ==> gtk_menu_shell_append()
  gtk_menu_prepend()                    ==> gtk_menu_shell_prepend()
  gtk_notebook_set_page()               ==> gtk_notebook_set_current_page()
  gtk_paned_gutter_size()               ==> gtk_paned_set_gutter_size()
  gtk_radio_button_group()              ==> gtk_radio_button_get_group()
  gtk_signal_connect()                  ==> g_signal_connect()
  gtk_signal_disconnect()               ==> g_signal_handler_disconnect()
  gtk_signal_emit_by_name()             ==> g_signal_emit_by_name()
  gtk_signal_handler_block_by_data()    ==> g_signal_handlers_block_matched()
  gtk_signal_handler_block_by_func()    ==> g_signal_handlers_block_by_func()
  gtk_signal_handler_unblock_by_data()  ==> g_signal-handlers_unblock_matched()
  gtk_signal_handler_unblock_by_func()  ==> g_signal-handlers_unblock_by_func()
  gtk_spin_button_get_value_as_float()  ==> gtk_spin_button_get_value()
  gtk_toggle_button_set_state()         ==> gtk_toggle_button_set_active()

svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
Guy Harris f441b8941e Add gtk/capture_globals.h, to declare global_capture_opts, so files that
don't need global_capture_opts don't need to have it declared and thus
don't need capture_options defined.

Include gtk/capture_globals in the files in question.

Change some more capture_opts references to refer to
global_capture_opts.

Change some global_capture_opts references in routines with a
capture_opts argument to refer to capture_opts.

The structure type is capture_options, not capture_opts; fix some
references.

Include <sys/types.h>, if it's present, in capture_opts.h, so we get
gid_t defined.

Clean up indentation.

svn path=/trunk/; revision=25574
2008-06-24 03:38:15 +00:00
Stig Bjørlykke 860028c634 Removed the usage of topic_available() as we now have all topics.
svn path=/trunk/; revision=25505
2008-06-21 13:36:31 +00:00
Ulf Lamping 644a474c95 sort #includes by directories
svn path=/trunk/; revision=24969
2008-04-13 03:32:24 +00:00
Ulf Lamping d4ccf577a8 where it's not necessary, remove #include "compat_macros.h"
svn path=/trunk/; revision=24922
2008-04-12 01:02:59 +00:00
Ulf Lamping 8e58ec7085 last round to replace SIGNAL_CONNECT with g_signal_connect
svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
Bill Meier ab9c1b68fd OBJECT_..._DATA --> g_object_..._data
svn path=/trunk/; revision=24899
2008-04-11 17:26:09 +00:00
Michael Tüxen 4306c7037d Include epan/strutil.h for gtk-1.2 builds.
svn path=/trunk/; revision=24513
2008-03-01 10:23:57 +00:00
Stig Bjørlykke 7deec480ff Next attempt to cleanup some string functions, including:
strncpy -> g_strlcpy, strncat -> g_strlcat

svn path=/trunk/; revision=24504
2008-02-29 13:33:37 +00:00
Stig Bjørlykke 10a8f59e03 Rewrote some prohibited APIs in gtk/ (sprintf, strcpy, strcat).
If we get some truncated strings we probably overwrote some buffers...

svn path=/trunk/; revision=24239
2008-02-01 01:07:58 +00:00
Stig Bjørlykke 0abea9b7d9 More summary enhancements:
- Don't hide columns in the GUI
- Show Packets count first
- Always show values in Packets count
- Don't show Avg. packet size if 1 packet
- Don't show time between packets if 1 packet

svn path=/trunk/; revision=23684
2007-11-30 13:28:12 +00:00
Stig Bjørlykke 6e39bc94d1 Summary enhancements:
- Added traffic statistics for marked packages.
- Do not show Displayed column unless using it.
- Removed Marked packets line, as this info is in the marked packets column.

Will add documentation changes if keeping this feature.

svn path=/trunk/; revision=23633
2007-11-28 01:09:02 +00:00
Stig Bjørlykke ff0346154a Added some parentheses to clarify the gint64 cast.
svn path=/trunk/; revision=23447
2007-11-14 10:15:20 +00:00
Stig Bjørlykke b4980a48bd From Shiang-Ming Huang:
Removed unnecessary parentheses that make the average packets size 
calculated as an integer instead of a float.

svn path=/trunk/; revision=23446
2007-11-14 09:37:44 +00:00
Gerald Combs 92802883a6 Change the "--enable-setuid-install" option to install dumpcap and TShark
setuid instead of Wireshark.  Remove the "DANGEROUS" notices, but leave it
disabled by default.  Whine if the user runs Wireshark or TShark as root.
Add a preference to disable the whining.  Add a "setuid-root" script that
can be used to switch dumpcap and TShark's setuid-ness on and off for
development and testing.  Update the release notes and README.packaging.

svn path=/trunk/; revision=22733
2007-08-30 00:24:40 +00:00
Guy Harris 5a43799a17 Use G_GINT64_MODIFIER, rather than the PRI[douxX]64 macros, for GLib
routines and routines using those routines.  GLib might use different
modifiers for 64-bit quantities than the platform's C library does.

svn path=/trunk/; revision=21990
2007-05-29 18:52:42 +00:00
Guy Harris d2ac4f7133 Check for G_GINT64_MODIFIER in Wireshark as we do in Wiretap.
In all the places where a cast to "long long" or "unsigned long long"
was done, use G_GINT64_MODIFIER and get rid of the cast, as

	1) there's no guarantee that "%ll" works

and

	2) there's no guarantee that "long long" works

(the latter definitely does *NOT* work with MSVC++; the former doesn't
work with regular printf in MSVC++, but it might work with the GLib
printf-based functions).

svn path=/trunk/; revision=21978
2007-05-29 06:56:07 +00:00
Sebastien Tandel 76729e5d0f From David Howells :
Fix compilation failures when building wireshark-0.99.6-SVN-21916 on an
x86_64-unknown-linux-gnu target with gcc version 4.1.2 20070403 (Red Hat
4.1.2-8).

The failures fall into two categories:
  (1) Casts between pointers and 32-bit integers without an intermediary cast
via 'long' or 'unsigned long'.  This results in a compiler warning complaining
about casts between a pointer and an integer of a different size.
  (2) Passing values to "%lld" or similar printf-style format options that the
compiler thinks are a different size.  Such values need to be cast to 'long
long' or 'unsigned long long'.

svn path=/trunk/; revision=21975
2007-05-29 02:43:18 +00:00
Guy Harris 944d2e5487 Squelch some qualifier (const vs. non-const) warnings.
svn path=/trunk/; revision=21938
2007-05-25 19:13:49 +00:00
Ulf Lamping 59d6c8ea33 change all file offsets from long to gint64 so we can - theoretically - handle files > 2GB correct.
Please distclean Win32 builds!

svn path=/trunk/; revision=19814
2006-11-05 22:46:44 +00:00
Guy Harris 92552c2d76 Get rid of a bunch of "Ethereal"s and "ethereal"s in comments, GUI
strings, and function names.

svn path=/trunk/; revision=18205
2006-05-22 07:29:40 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Ulf Lamping 79053183c5 remove dependencies to pcap.h, so getting an idea what needs to be done by dumpcap in addition to the things already done now
various dumpcap related code cleanup: mainly #include's and capture engine related stuff

svn path=/trunk/; revision=17327
2006-02-17 02:18:48 +00:00
Ulf Lamping eafbbbcabb renamed ui_util.c/.h to gui_utils.c/.h to prevent confusion with identical named ui_util.h in / dir
svn path=/trunk/; revision=15465
2005-08-20 12:09:48 +00:00
Guy Harris 5fb6e97fb4 Squelch more const warnings (and fix some memory leaks that found).
_U_-ify some unused arguments, rather than assigning them to themselves.

Un-constify one variable that gets assigned a mallocated pointer.

Clean up indentation.

svn path=/trunk/; revision=15236
2005-08-06 03:44:55 +00:00
Ulf Lamping dc6b471aad MSVC: fix some guint64 related compiler errors
strange enough, MSVC cannot convert from guint64 to float, so cast guint64 -> gint64 -> float

However, even gint64 might be big enough to prevent us from an overflow :-)

svn path=/trunk/; revision=14888
2005-07-09 11:28:13 +00:00
Guy Harris 979511b3fa Make the counters in the summary 64-bit, so they don't overflow on
Really Big Captures.

svn path=/trunk/; revision=14875
2005-07-08 09:12:11 +00:00
Jörg Mayer 58d8f2f652 - pcap.h needs to be included before capture.h
- As capture.h is empty without libpcap defined, only include it in that
  case and don't protect the file internally against libpcap any more.

svn path=/trunk/; revision=13648
2005-03-07 10:19:33 +00:00
Ulf Lamping 3a63719e38 another two steps towards privilege seperation:
move another two capture related fields (iface and cfilter) from cfile to capture_opts

also move the handling of capture related command line options from main.c to capture.c, that way a future privilege seperated capture program can use the same code to parse it's command line than Ethereal. 
It might be even possible to share this parser code even with Tethereal, didn't took a closer look at this.

svn path=/trunk/; revision=13320
2005-02-06 21:20:35 +00:00
Ulf Lamping 69e94faff8 remove #include "globals.h" from summary.c, as it's a bad idea for multiple capture files.
If a summary user would like to get a summary, it should know the file of *which* it needs the summary.

svn path=/trunk/; revision=13291
2005-02-04 19:29:27 +00:00
Ulf Lamping 66ce7f3623 add some more online help functionality and help buttons at various dialog boxes, if a help page *is* available. However, the new help system needs a lot more work before completed.
svn path=/trunk/; revision=13152
2005-01-20 23:17:23 +00:00
Guy Harris 0067b4b94e The right way to check whether a pointer is null and get a Boolean is to
test it against null, not to cast it to a Boolean type - as Boolean
types in C89/C90, at least, are just integral types, that cast might
just throw away the upper 32 bits; that probably yields the results you
want, but the compiler might well justifiably warn about that on an LP64
platform.

svn path=/trunk/; revision=12915
2005-01-01 23:19:11 +00:00
Guy Harris 8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Guy Harris 641a9fbf47 "ti_time" is a "time_t", not a "long" ("time_t" isn't necessarily a
"long").

Make "elapsed_time" an "unsigned int" rather than an "unsigned long" -
2^32-1 seconds is about 136 years, so on LP64 machines that won't
matter, and on ILP32 machines it doesn't make any difference, but it
*does* generate compiler warnings from "%u" being used with "unsigned
long" values.

svn path=/trunk/; revision=11181
2004-06-18 20:23:10 +00:00
Ulf Lamping 14a5228639 add timestamp of first and last packet to summary dialog
svn path=/trunk/; revision=11179
2004-06-18 14:11:09 +00:00
Ulf Lamping cc68368037 use new functions in window API (ui_util.h),
use window_new instead of dlg_window_new for the statistics windows
(as these are no dialog windows)
do some code cleanup

svn path=/trunk/; revision=10979
2004-05-23 23:24:07 +00:00
Ulf Lamping d6eeb0936d going to have a standard behaviour of the dialogs
(including remebering of the dialog size in recent file).
for a first step, I replaced all window_new() calls from dialogs
into dlg_window_new() ones, and removed all gtk_window_set_position
calls, this should be done in a more generalized way

svn path=/trunk/; revision=10964
2004-05-22 19:56:19 +00:00
Ulf Lamping c58455e882 code cleanup (e.g. removed unused function parameters),
added new about page, showing the authors file (but still commented out)

svn path=/trunk/; revision=10942
2004-05-21 08:55:07 +00:00
Guy Harris ebbebf1705 GCC warns about zero-length format strings, presumably either because
not all *printf routines don't handle them or because there's no
advantage to using one rather than just copying a null string to the
target (the length-checking done by "snprintf"-style routines is useful
for a null string only if the target is zero-length, which it isn't in
this case).

Clean up indentation.

svn path=/trunk/; revision=10940
2004-05-21 06:39:25 +00:00
Ulf Lamping 83dfc924cd complete new layout of the summary dialog
svn path=/trunk/; revision=10933
2004-05-20 23:01:53 +00:00
Ulf Lamping 7b62a629e8 replaced sprintf / snprintf by g_snprintf,
various other string related changes

svn path=/trunk/; revision=10373
2004-03-13 15:15:26 +00:00
Guy Harris 36ece5a17a Add a "window_new()" routine that creates a window of a given type, sets
the title, and arranges to set the icon for it.  Use that instead of
"gtk_window_new()" and separate calls to set the title and arrange to
set the icon.

Regularize #includes a bit.

Clean up white space.

svn path=/trunk/; revision=10054
2004-02-13 00:53:37 +00:00
Guy Harris 12e944262d Include <string.h> to declare "strlen()".
svn path=/trunk/; revision=9959
2004-02-02 22:51:30 +00:00
Ulf Lamping b1141c97d1 beautified the dialog a bit
svn path=/trunk/; revision=9947
2004-02-01 15:33:08 +00:00
Ulf Lamping 44f10048da avoid very large dialogs, when display filters becoming too large,
especially true when working with TCP stream filtering

svn path=/trunk/; revision=9946
2004-02-01 13:13:33 +00:00
Ulf Lamping 8e2a930023 implemented dlg_button_row_new to get a standard function for
layouting the dialog buttons, and use it where appropriate.
This will help us with the GTK1/2 conflict on button layouts and
will also result in a more consistent look of the dialogs at all.

svn path=/trunk/; revision=9771
2004-01-21 21:19:34 +00:00