Commit graph

694 commits

Author SHA1 Message Date
Ronnie Sahlberg
834c08904b Fix two compiler warnings
svn path=/trunk/; revision=6748
2002-12-05 22:19:24 +00:00
Jörg Mayer
4169436eb9 Add compat_macros.h to the tarball
svn path=/trunk/; revision=6732
2002-12-03 01:26:31 +00:00
Guy Harris
293ec59fea From Jason House: MSVC++ doesn't like cases with no statements, so add
break statements.

svn path=/trunk/; revision=6716
2002-12-02 19:44:09 +00:00
Olivier Abad
0f3a25cafd Put back the "width" local variable in proto_cb() which is used only by
the GTK1.2 UI.

svn path=/trunk/; revision=6715
2002-12-02 11:05:58 +00:00
Olivier Abad
90b9fa59f6 Make the new protocol list work with GTK2. The "status" column uses a
toggle button instead of a text.

svn path=/trunk/; revision=6714
2002-12-02 10:59:23 +00:00
Olivier Abad
1010194bec Remove gtk_tree_view_set_search_column() which is not needed.
svn path=/trunk/; revision=6712
2002-12-02 10:53:34 +00:00
Gerald Combs
d59c4bd399 Allow keyboard-only navigation of the Protocols dialog. Protocols can
be enabled or disabled using the space bar.  Update the documentation
accordingly.

svn path=/trunk/; revision=6711
2002-12-02 02:28:54 +00:00
Gerald Combs
a10da42709 Enable/disable protocols with a single click. Fix the behavior of
cancelling the Protocols dialog, which my previous checkin broke.

svn path=/trunk/; revision=6710
2002-12-01 22:51:56 +00:00
Gerald Combs
07e0a47740 Update some text in the help dialog.
Replace the large matrix of protocol togglebuttons with a GtkCList. The
CList displays three columns: the enabled/disabled state, the protocol's
abbreviated name and the protocol's full name.  Protocols can be enabled
or disabled by double-clicking on them.  The enable all, disable all, and
invert buttons were left intact.

I made a half-assed attempt at Gtk2 support by copying code from
plugins_dlg.c.  It's incomplete, and probably won't compile.

Using check boxes in the first column instead of the word "Disabled" would
have been nice.  GtkCLists don't let you embed anything besides text and
pixmaps unfortunately.

Update the man page accordingly.

We still need a way to save a list of disabled protocols.

svn path=/trunk/; revision=6707
2002-12-01 19:11:54 +00:00
Ronnie Sahlberg
d5f5ebd79e Updte for io-stat to make it more powerful.
There is not a third option Advanced... in addition to frames/tick and bytes/tick.


See ethereal man page for description and how one can use this to graph how NFS response time MAX/MIN/AVG changes over time.

svn path=/trunk/; revision=6703
2002-11-29 11:37:33 +00:00
Guy Harris
0051e3c2e8 That was the wrong cast, d00d....
svn path=/trunk/; revision=6686
2002-11-28 02:04:23 +00:00
Guy Harris
5dbad1dcdc Constify some pointers to avoid converting const pointers to non-const
pointers.

svn path=/trunk/; revision=6685
2002-11-28 01:58:27 +00:00
Ronnie Sahlberg
8eb275cdb3 put nice io-stat title on the io-stat window
svn path=/trunk/; revision=6661
2002-11-19 08:10:13 +00:00
Ronnie Sahlberg
31f4e6b38f update for gui version of io-stat
the graph now has a scrollbar one can use to scroll the graph window

svn path=/trunk/; revision=6652
2002-11-17 11:43:40 +00:00
Guy Harris
cb7215b486 If you include "gtk/gtkglobals.h" before including <ctype.h>, at least
on Windows in my build environment, the definition of "isprint" in
"gtk/gtkglobals.h" causes problems when processing the definition of
"isprint" in <ctype.h>, and, somehow, <ctype.h> appears to get included,
at least in Windows in my build environment, after we include
"gtk/gtkglobals.h" even though we don't include it explicitly.

Include it explicitly, before we include "gtk/gtkglobals.h", so that it
compiles.

svn path=/trunk/; revision=6650
2002-11-16 21:40:32 +00:00
Ronnie Sahlberg
1e41b7480d io-stat. Previously io-stat was hardcoded to calculate the statistics over 1 second intervals. Now there is a menu to control the length of ther measurement intervals from 10ms to 1 sec.
svn path=/trunk/; revision=6646
2002-11-16 11:45:58 +00:00
Olivier Abad
380bd12489 New gtk1/gtk2 compatibility macros used for menu entries.
svn path=/trunk/; revision=6641
2002-11-15 23:50:06 +00:00
Olivier Abad
0ec7f232e2 In gtk2 code :
gdk_font_from_description() may return NULL if no GdkFont matching a
PangoFontDescription can be loaded.
Replace primitives using GdkFonts (gdk_string_width, gdk_draw_string)
with their pango equivalent (pango_layout_get_pixel_size,
gdk_draw_layout).

svn path=/trunk/; revision=6639
2002-11-15 22:21:15 +00:00
Guy Harris
fb67329086 Clean up the GTK+ 1.2[.x] menu items. (This really calls for another
"compat_macros.h" macro....)

Add some comments on #else's and #endif's to make it a bit easier to
follow the twisty maze.

svn path=/trunk/; revision=6637
2002-11-15 18:45:18 +00:00
Ronnie Sahlberg
a361b76756 Gtk1 version of io-stat
svn path=/trunk/; revision=6636
2002-11-15 10:55:19 +00:00
Ronnie Sahlberg
76f5391acc Feature for Gtk2: GUI version of IO-STAT. Looks reasonable with one graph. Looks "sub-optimal" with multiple graphs overwriting eachothers.
We can just delete it later if it cant be improved visually.

svn path=/trunk/; revision=6629
2002-11-14 10:32:22 +00:00
Guy Harris
bbb2129ab2 Make "tethereal-tap-register.c" and "ethereal-tap-register.c" depend on
the script that builds them.

svn path=/trunk/; revision=6627
2002-11-14 08:09:35 +00:00
Guy Harris
f002ffd9ce From Didier Gautheron: make the rule to build "ethereal-tap-register.c"
work when a build is done outside the source tree, and make
"ethereal-tap-register.c" depend on the script that builds it.

svn path=/trunk/; revision=6626
2002-11-14 08:07:12 +00:00
Olivier Abad
3cd4fed22d Use gtk1/gtk2 compatibility macros.
svn path=/trunk/; revision=6616
2002-11-11 18:57:00 +00:00
Olivier Abad
189640857a In the gtk2 port, make double click in the tree view expand or collapse
a row.

svn path=/trunk/; revision=6615
2002-11-11 18:46:16 +00:00
Guy Harris
13b8bc3f9c "gtk_quit_add_destroy()" takes a "GtkObject *" as its second argument in
both GTK+ 1.2[.x] and 2.x, so put the "GTK_OBJECT()" cast back in to
squelch a compiler warning.

svn path=/trunk/; revision=6612
2002-11-11 17:32:42 +00:00
Guy Harris
1981d976e3 Put in some missing macros needed for recent changes.
svn path=/trunk/; revision=6611
2002-11-11 17:30:26 +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
c2c5e20927 Replace gtk_rpcprogs_init with gtk_rpcprogs_cb in the gtk2 menu entry.
svn path=/trunk/; revision=6609
2002-11-11 12:37:15 +00:00
Gerald Combs
2329ea1483 Add tethereal's tap objects to Makefile.nmake's "clean" target.
Instead of setting MIBDIRS in tethereal.c and gtk/main.c, set it in
packet-snmp.c.

svn path=/trunk/; revision=6606
2002-11-10 20:53:06 +00:00
Olivier Abad
425e7406d2 When opening tap windows, we don't need to search the tap_list again. It
has been done when processing the -z command line option.

svn path=/trunk/; revision=6602
2002-11-10 11:41:45 +00:00
Olivier Abad
573f0840eb - use gtk1/gtk2 compatibility macros to reduce #ifdefs
- when processing tap extensions command line options, wait until the
  main window has been created before opening the tap window, to avoid
  lots of GTK warnings.

svn path=/trunk/; revision=6601
2002-11-10 11:36:39 +00:00
Olivier Abad
b48fd02f40 Use gtk1/gtk2 compatibility macros to reduce #ifdefs.
svn path=/trunk/; revision=6600
2002-11-10 11:00:29 +00:00
Olivier Abad
048ab33a26 Use gtk1/gtk2 compatibility macros to reduce #ifdefs.
svn path=/trunk/; revision=6597
2002-11-09 20:52:39 +00:00
Olivier Abad
7a3de321f8 Helper macros fro gtk1.2/gtk2 compatibility.
It should reduce the number of #ifdefs in gtk source code.

svn path=/trunk/; revision=6596
2002-11-09 20:00:35 +00:00
Guy Harris
70aaa6ddcc From Jason House: add the rule to make "ethereal-tap-register.c".
Make that rule work correctly, by making "ETHEREAL_TAP_SRC" refer to the
*source* files, making "ETHEREAL_TAP_OBJECTS" be the *object* files (as
generated from the list of source files), and adding
"ETHEREAL_TAP_OBJECTS" rather than "ETHEREAL_TAP_SRC" to the list of
objects to link.

svn path=/trunk/; revision=6574
2002-11-07 05:33:50 +00:00
Guy Harris
cb8300571b Fix the message printed when making "ethereal-tap-register.c".
svn path=/trunk/; revision=6573
2002-11-07 05:29:07 +00:00
Guy Harris
dd02634bd5 Add "ethereal-tap-register.c" to the gtk ".cvsignore" file, as it's a
generated file.

svn path=/trunk/; revision=6571
2002-11-06 23:41:21 +00:00
Ronnie Sahlberg
b3e0a56390 First step in creating an API to register TAPs for use with ethereal instead of hardcoding them in main.c/menu.c
This adds functions to register the command line arguments to use the API in the same way as is done for tethereal.

Later it may be extended to also register the GUI/Menu entry point to ethereal using this api but that iwll be later since the changes required to menu.c are not as intrusive as the main.c command line parsing ones were.


Some of the latest changes (before this checkin) has made ethereal to produce lots of GTK errors when starting up the extension windows.
They were there before this checking but will be investigated.

svn path=/trunk/; revision=6566
2002-11-06 10:53:36 +00:00
Olivier Abad
05ef1fc475 Merge gtk and gtk2 directories.
svn path=/trunk/; revision=6552
2002-11-03 17:38:45 +00:00
Guy Harris
72d59f0596 The versions of UCD SNMP that we now support all install
<ucd-snmp/version.h>, so get rid of the stuff to check for its presence
and handle its absence.

svn path=/trunk/; revision=6503
2002-10-25 03:13:11 +00:00
Guy Harris
35c1970720 From Ronnie Sahlberg: Ethereal support for DCERPCSTAT.
svn path=/trunk/; revision=6499
2002-10-25 01:08:49 +00:00
Guy Harris
f54f6a1a0a At least according to the UNIX 98 spec, you need to include <unistd.h>
to declare "getopt()" and the variables it uses; tethereal.c already
includes it, but gtk/main.c and gtk2/main.c, which also use "getopt()",
don't - make them do so.

svn path=/trunk/; revision=6497
2002-10-25 00:29:12 +00:00
Guy Harris
ae1ebc09da Don't include the header file to get the SNMP version unless we're
building with an SNMP library.

If we have Net-SNMP, include <net-snmp/version.h>, not
<ucd-snmp/version.h>.

Don't include any of the SNMP headers unless HAVE_SOME_SNMP is defined.

Include <net-snmp/config_api.h> if we have Net-SNMP, to declare
"read_premib_configs()" and "read_configs()".

Supply the include directories for Net-SNMP in the Makefile.nmake for
GTK 1.2 and GTK 2.

svn path=/trunk/; revision=6493
2002-10-24 07:08:26 +00:00
Guy Harris
3266b0bb14 From Ronnie Sahlberg: make the tap listeners for gtk and gtk2 redissect
the packet list immediately when the tap is started.

svn path=/trunk/; revision=6488
2002-10-23 23:17:26 +00:00
Guy Harris
6d8d731412 From Ronnie Sahlberg: pass a pointer to the epan_dissect_t for a packet
to taps.

svn path=/trunk/; revision=6487
2002-10-23 23:12:38 +00:00
Guy Harris
cc8a765d8e From Wes Hardaker:
Define HAVE_SOME_SNMP if either HAVE_UCD_SNMP or HAVE_NET_SNMP
	is defined, and use HAVE_SOME_SNMP, rather than HAVE_UCD_SNMP,
	in most places when testing whether we have an SNMP library or
	not.

	Be more selective when including Net-SNMP header files.

Fix up {gtk,gtk2}/main.c to do the same SNMP stuff that tethereal.c
does - including the MIB stuff that gtk/main.c was doing but gtk2/main.c
wasn't doing.

Fix the copyright date in gtk/main.c.

svn path=/trunk/; revision=6483
2002-10-23 18:24:09 +00:00
Jörg Mayer
34141201f2 Add (back) some #include <string.h>
svn path=/trunk/; revision=6394
2002-10-10 01:49:21 +00:00
Jörg Mayer
1b626a140a Add a missing #include <string.h>
svn path=/trunk/; revision=6390
2002-10-09 23:03:11 +00:00
Gerald Combs
ec8fd2703a Link to libsnmp under Win32.
In gtk/main.c and tethereal.c set MIBDIRS to <get_program_path()>\snmp\mibs
so that we can drop the MIB files there, instead of the default c:\usr\...
path.

Add NET_SNMP_DIR to config.nmake and modify Makefile.nmake to adjust
CFLAGs, ethereal_LIBS and tethereal_LIBS accordingly.

Define HAVE_UCD_SNMP in config.h.win32.

I tested this by creating c:\program files\ethereal\snmp\mibs and
dropping in the MIB files that come with Net-SNMP.  Ethereal resolved
system.sysDescr.0 to "iso.3.6.1.2.1.1.1.0" under Windows.  Under Linux
it resolved to "SNMPv2-MIB::sysDescr.0".

Ethereal.nsi still needs to be updated.

A compiled version of the Net-SNMP library can be found at

    http://www.ethereal.com/distribution/win32/development/

svn path=/trunk/; revision=6385
2002-10-09 03:07:34 +00:00