aboutsummaryrefslogtreecommitdiffstats
path: root/gtk2
diff options
context:
space:
mode:
authorsahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>2002-09-06 10:13:17 +0000
committersahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>2002-09-06 10:13:17 +0000
commit6d81af1bb7665dc4e5a1d81279eb5d671e52e9f1 (patch)
tree3361abe12c22ae4e14b1c31ab5fc0423194fb18b /gtk2
parentf5ffa1ea3cf94a6cd78c411bdbacff01ef87b675 (diff)
Gtk2 port of RPCPROGS statistics
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6194 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk2')
-rw-r--r--gtk2/Makefile.am4
-rw-r--r--gtk2/Makefile.nmake3
-rw-r--r--gtk2/main.c9
-rw-r--r--gtk2/menu.c4
4 files changed, 15 insertions, 5 deletions
diff --git a/gtk2/Makefile.am b/gtk2/Makefile.am
index 11035af88b..f5c709f411 100644
--- a/gtk2/Makefile.am
+++ b/gtk2/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for the GTK2 interface routines for Ethereal
#
-# $Id: Makefile.am,v 1.2 2002/09/04 22:18:12 sahlberg Exp $
+# $Id: Makefile.am,v 1.3 2002/09/06 10:13:17 sahlberg Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@@ -61,6 +61,8 @@ libui_a_SOURCES = \
gtkglobals.h \
gtk2-rpcstat.c \
gtk2-rpcstat.h \
+ gtk2-rpcprogs.c \
+ gtk2-rpcprogs.h \
gui_prefs.c \
gui_prefs.h \
help_dlg.c \
diff --git a/gtk2/Makefile.nmake b/gtk2/Makefile.nmake
index 3518326d81..710a5459a0 100644
--- a/gtk2/Makefile.nmake
+++ b/gtk2/Makefile.nmake
@@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id: Makefile.nmake,v 1.3 2002/09/04 22:18:12 sahlberg Exp $
+# $Id: Makefile.nmake,v 1.4 2002/09/06 10:13:17 sahlberg Exp $
include ..\config.nmake
@@ -39,6 +39,7 @@ OBJECTS=capture_dlg.obj \
follow_dlg.obj \
goto_dlg.obj \
gtk2-rpcstat.obj \
+ gtk2-rpcprogs.obj \
gui_prefs.obj \
help_dlg.obj \
main.obj \
diff --git a/gtk2/main.c b/gtk2/main.c
index dd4a46a177..1e0318d04b 100644
--- a/gtk2/main.c
+++ b/gtk2/main.c
@@ -1,6 +1,6 @@
/* main.c
*
- * $Id: main.c,v 1.5 2002/09/06 08:58:20 sahlberg Exp $
+ * $Id: main.c,v 1.6 2002/09/06 10:13:17 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -118,6 +118,7 @@
#include "image/clist_descend.xpm"
#include "../tap.h"
#include "gtk2-rpcstat.h"
+#include "gtk2-rpcprogs.h"
#ifdef WIN32
#include "capture-wpcap.h"
@@ -1722,8 +1723,12 @@ main(int argc, char *argv[])
fprintf(stderr, "ethereal: invalid \"-z rpc,rtt,<program>,<version>\" argument\n");
exit(1);
}
+ } else if(!strncmp(optarg,"rpc,programs",12)){
+ gtk2_rpcprogs_init();
} else {
- fprintf(stderr, "ethereal: invalid -z argument. Argument must be \"-z rpc,rtt,...\"\n");
+ fprintf(stderr, "ethereal: invalid -z argument. Argument must be one of:\n");
+ fprintf(stderr, " \"-z rpc,rtt,<program>,<version>\"\n");
+ fprintf(stderr, " \"-z rpc,programs\"\n");
exit(1);
}
} else {
diff --git a/gtk2/menu.c b/gtk2/menu.c
index 63e07e2d68..338e3970cf 100644
--- a/gtk2/menu.c
+++ b/gtk2/menu.c
@@ -1,7 +1,7 @@
/* menu.c
* Menu routines
*
- * $Id: menu.c,v 1.3 2002/09/05 18:48:51 jmayer Exp $
+ * $Id: menu.c,v 1.4 2002/09/06 10:13:17 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -58,6 +58,7 @@
#include "tcp_graph.h"
#include <epan/epan_dissect.h>
#include "gtk2-rpcstat.h"
+#include "gtk2-rpcprogs.h"
GtkWidget *popup_menu_object;
@@ -174,6 +175,7 @@ static GtkItemFactoryEntry menu_items[] =
{"/Tools/Statistics", NULL, NULL, 0, "<Branch>", NULL },
{"/Tools/Statistics/ONC-RPC", NULL, NULL, 0, "<Branch>", NULL },
{"/Tools/Statistics/ONC-RPC/RTT", NULL, GTK_MENU_FUNC(gtk2_rpcstat_cb), 0, NULL, NULL },
+ {"/Tools/Statistics/ONC-RPC/Programs", NULL, GTK_MENU_FUNC(gtk2_rpcprogs_init), 0, NULL, NULL },
{"/_Help", NULL, NULL, 0, "<LastBranch>", NULL },
{"/Help/_Help", NULL, GTK_MENU_FUNC(help_cb), 0, "<StockItem>", GTK_STOCK_HELP },
{"/Help/<separator>", NULL, NULL, 0, "<Separator>", NULL },