Commit graph

48 commits

Author SHA1 Message Date
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
Ulf Lamping
e3dd2f5472 use stock buttons whereever possible,
added some ethereal specific stock icons

svn path=/trunk/; revision=9763
2004-01-21 03:54:32 +00:00
Guy Harris
5c7fd0723c If we don't have any packets, or don't have any filtered packets, don't
even show the averages over the empty sets in question.

svn path=/trunk/; revision=9400
2003-12-21 22:32:07 +00:00
Olivier Biot
44ea0de58f Move display filter into filtered packets frame.
Fix NaN when a capture and/or a filter don't have any matching packets
so the average packet size is obtained by dividing by zero.

svn path=/trunk/; revision=9369
2003-12-20 12:03:35 +00:00
Guy Harris
71034c5a3f From Jean-Michel Fayard: show in Tools:Summary window statistics about
packets that passed the current display filter, as well as about the
entire capture.

Document the Tools:Summary item in the man page.

Update Gerald's e-mail address.

svn path=/trunk/; revision=8344
2003-09-02 22:10:32 +00:00
Gerald Combs
40606a6ed2 Add an average packet size, as suggested by Daniel Jackson.
svn path=/trunk/; revision=7313
2003-03-07 20:27:02 +00:00
Olivier Abad
29011060de Use gtk1/gtk2 compatibility macros to reduce #ifdefs.
svn path=/trunk/; revision=6610
2002-11-11 15:39:06 +00:00
Olivier Abad
05ef1fc475 Merge gtk and gtk2 directories.
svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
Jörg Mayer
e4a2e2cefe Include cleanups in gtk and gtk2:
Remove unneded includes
Add include wrappers where missing

svn path=/trunk/; revision=6191
2002-09-05 18:48:52 +00:00
Gerald Combs
074cb0f6d2 Cast the Mbits/s calculation as a float, so that we display the value
correctly for large captures.

svn path=/trunk/; revision=6150
2002-08-31 00:40:46 +00:00
Jörg Mayer
7c4176d868 Removed trailing whitespaces from .h and .c files using the
winapi_cleanup tool written by Patrik Stridvall for the wine
project.

svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Guy Harris
5fe414c555 From Joerg Mayer: use _U_ to flag unused arguments.
svn path=/trunk/; revision=4878
2002-03-05 11:56:00 +00:00
Guy Harris
89a4acb438 Have Wiretap set the snapshot length to 0 if it can't be derived from
reading the capture file.  Have callers of "wtap_snapshot_length()"
treat a value of 0 as "unknown", and default to WTAP_MAX_PACKET_SIZE (so
that, when writing a capture file in a format that *does* store the
snapshot length, we can at least put *something* in the file).

If we don't know the snapshot length of the current capture file, don't
display a value in the summary window.

Don't use "cfile.snap" as the snapshot length option when capturing -
doing so causes Ethereal to default, when capturing, to the snapshot
length of the last capture file that you read in, rather than to the
snapshot length of the last capture you did (or the initial default of
"no snapshot length").

Redo the "Capture Options" dialog box to group options into sections
with frames around them, and add units to the snapshot length, maximum
file size, and capture duration options, as per a suggestion by Ulf
Lamping.  Also add units to the capture count option.

Make the snapshot length, capture count, maximum file size, and capture
duration options into a combination of a check box and a spin button.
If the check box is not checked, the limit in question is inactive
(snapshot length of 65535, no max packet count, no max file size, no max
capture duration); if it's checked, the spinbox specifies the limit.
Default all of the check boxes to "not checked" and all of the spin
boxes to small values.

Use "gtk_toggle_button_get_active()" rather than directly fetching the
state of a check box.

svn path=/trunk/; revision=4709
2002-02-08 10:07:41 +00:00
Gerald Combs
7e092f2dd8 Go nuts with the 3D logo.
Add a routine to ui_util.c that sets a window's icon pixmap to a 16x16
version of the 3D logo.  Call the routine for each window that is created.
This has been tested with kwm and Sawfish (which expect a 16x16 icon), but
we may have to come up with a better solution for other window managers
(e.g. olwm and mwm).

Add a 3D exclamation point image.  Replace the exclamation point and
Ethereal logo images used in simple_dialog() with their 3D counterparts.

Remove the old icons from the source distribution.

svn path=/trunk/; revision=4390
2001-12-12 21:39:01 +00:00
Guy Harris
bf0a3a32d1 In Ethereal, attempt to get the packet statistics from libpcap when
capturing; if we succeed, display the packet drops count as the "Drops"
value in the status line and as the "Dropped packets" statistics in the
summary dialog box, otherwise don't display it at all.

In Tethereal, attempt to get the packet statistics from libpcap when
capturing; if we succeed, and if there were any dropped packets, print
out the count of dropped packets when the capture finishes.

svn path=/trunk/; revision=3016
2001-02-11 09:28:17 +00:00
Laurent Deniel
05984d233d Add the number of marked packets in the summary window.
svn path=/trunk/; revision=2323
2000-08-21 18:20:19 +00:00
Laurent Deniel
9110dda9dc Add Mbit/sec to the summary window.
svn path=/trunk/; revision=2300
2000-08-19 21:36:51 +00:00
Laurent Deniel
6a480953a9 Miscellaneous code cleaning
- add <stdarg.h> or <varargs.h> in snprintf.h
  and remove those inclusions in the other #ifdef NEED_SNPRINTF_H codes

- remove the check of multiple inclusions in source (.c)  code
  (there is a bit loss of _cpp_ performance, but I prefer the gain of
   code reading and maintenance; and nowadays, disk caches and VM are
   correctly optimized ;-).

- protect all (well almost) header files against multiple inclusions

- add header (i.e. GPL license) in some include files

- reorganize a bit the way header files are included:

  First:
  #include <system_include_files>
  #include <external_package_include_files (e.g. gtk, glib etc.)>
  Then
  #include "ethereal_include_files"

  with the correct HAVE_XXX or NEED_XXX protections.

- add some HAVE_XXX checks before including some system header files

- add the same HAVE_XXX in wiretap as in ethereal

Please forgive me, if I break something (I've only compiled and regression
tested on Linux).

svn path=/trunk/; revision=2254
2000-08-11 13:37:21 +00:00
Guy Harris
4522bab239 Put the close button in an HButtonBox, so that it doesn't expand to the
width of the window.

svn path=/trunk/; revision=2115
2000-07-05 06:19:27 +00:00
Guy Harris
d96eb452ac Make the summary dialog box use the new utilities to make the Return
and Esc keys close the dialog box; to make the Return key work, we have
to make the "Close" button the default widget.

svn path=/trunk/; revision=1906
2000-05-03 07:44:12 +00:00
Guy Harris
c577b0ef60 As we always have to have a filter string (thanks to a bug in the Linux
libpcap), if we have a null filter string we report it as "no filter",
just as we would do for a null filter string pointer.

svn path=/trunk/; revision=1844
2000-04-13 09:17:09 +00:00
Guy Harris
239109b3e9 No work need be done when a summary dialog box is destroyed, or when the
window manager tries to delete it, so no callback is needed for the
"destroy" or "delete_event" signals (grabs are, at least in GTK+ 1.2.7,
removed when a widget is destroyed, and there's no need for the destroy
callback to destroy the widget itself; the delete event handler *could*,
for example, pop up a dialog box saying "Do you really want to close
this?", and allow the user to back out of the operation, but there's
no unsaved work that would be lost by closing the window, so there's no
point in having a delete event handler that does that).

svn path=/trunk/; revision=1771
2000-04-01 09:16:49 +00:00
Gilbert Ramirez
71b7cd5031 Move GTK code out of summary.c and into gtk/summary_dlg.c
summary.c now provides a struct of info (see summary.h)

Changed the name of the summary dialogue callback (hence the change
in menu.c), and added a close button to the dialogue.

Moved #include <gtk/gtk.h> out of print.c and into prefs.h where it
was needed for GdkColor.

svn path=/trunk/; revision=1273
1999-12-10 04:21:04 +00:00