Gtk2 port of RPCPROGS statistics

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6194 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index 798dc600bb08b2f0686e207a99c880ac3d8baabb..ff29a4d86f8840d17ea5977b2961abc4cffc2167 100644 (file)
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -280,6 +280,15 @@ Example: use B<-z rpc,rtt,100003,3> to collect data for NFS v3.  This
 option can be used multiple times on the command line. 
 
 This feature is only available for the Gtk2 port of B<Ethereal>.
+
+B<-z> rpc,programs
+
+Collect call/reply RTT data for all known ONC-RPC programs/versions.  
+Data collected is number of calls for each protocol/version, MinRTT, 
+MaxRTT and AvgRTT. 
+
+This feature is only available for the Gtk2 port of B<Ethereal>.
+
 =back
 
 =head1 INTERFACE

diff --git a/gtk2/Makefile.am b/gtk2/Makefile.am
index 11035af88beca9d83d3729d76867ea67aa852b23..f5c709f4114ce9abab9b7ad6c668f7911403f86d 100644 (file)
--- 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 3518326d81f684b0f41d768eef2b472ef220cd6a..710a5459a0a1f91427d0402924b5b5e42bee3175 100644 (file)
--- 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 dd4a46a1778626e9b6801cd1fb8a61871da235ba..1e0318d04bd22e317a5346550df0bef89ac253f3 100644 (file)
--- 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 63e07e2d685c8b3e2b9e053b004d7adfb2a29b8c..338e3970cfe57f2c1dd1bf7101d21d395ea3cd1e 100644 (file)
--- 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 },