The Styleguide section has been moved to the Wireshark Developer's Guide.

[obnox/wireshark/wip.git] / tap-rpcprogs.c

diff --git a/tap-rpcprogs.c b/tap-rpcprogs.c
index 83da9823d1afa590d828473800c6daf4650b1cb6..295932bec0445e747a1cdae7547ceacfa314dd67 100644 (file)
--- a/tap-rpcprogs.c
+++ b/tap-rpcprogs.c
@@ -1,29 +1,29 @@
 /* tap-rpcprogs.c
  * rpcstat   2002 Ronnie Sahlberg
  *
- * $Id: tap-rpcprogs.c,v 1.2 2002/10/23 23:12:34 guy Exp $
+ * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/* This module provides rpc call/reply RTT statistics to tethereal.
- * It is only used by tethereal and not ethereal
+/* This module provides rpc call/reply SRT statistics to tshark.
+ * It is only used by tshark and not wireshark
  */
 
 #ifdef HAVE_CONFIG_H
@@ -38,10 +38,9 @@
 
 #include <string.h>
 #include "epan/packet_info.h"
-#include "tap.h"
-#include "tap-rpcprogs.h"
-#include "packet-rpc.h"
-
+#include <epan/tap.h>
+#include <epan/stat_cmd_args.h>
+#include <epan/dissectors/packet-rpc.h>
 
 /* used to keep track of statistics for a specific program/version */
 typedef struct _rpc_program_t {
@@ -58,8 +57,9 @@ static rpc_program_t *prog_list=NULL;
 static int already_enabled=0;
 
 static int
-rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, rpc_call_info_value *ri)
+rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pri)
 {
+       const rpc_call_info_value *ri=pri;
        nstime_t delta;
        rpc_program_t *rp=NULL;
 
@@ -127,19 +127,14 @@ rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, r
                }
        }
 
-       
+
        /* we are only interested in reply packets */
-       if(ri->request){
+       if(ri->request || !rp){
                return 0;
        }
 
        /* calculate time delta between request and reply */
-       delta.secs=pinfo->fd->abs_secs-ri->req_time.secs;
-       delta.nsecs=pinfo->fd->abs_usecs*1000-ri->req_time.nsecs;
-       if(delta.nsecs<0){
-               delta.nsecs+=1000000000;
-               delta.secs--;
-       }
+       nstime_delta(&delta, &pinfo->fd->abs_ts, &ri->req_time);
 
        if((rp->max.secs==0)
        && (rp->max.nsecs==0) ){
@@ -166,7 +161,7 @@ rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, r
                rp->max.secs=delta.secs;
                rp->max.nsecs=delta.nsecs;
        }
-       
+
        rp->tot.secs += delta.secs;
        rp->tot.nsecs += delta.nsecs;
        if(rp->tot.nsecs>1000000000){
@@ -182,22 +177,17 @@ rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, r
 static void
 rpcprogs_draw(void *dummy _U_)
 {
-#ifdef G_HAVE_UINT64
        guint64 td;
-#else
-       guint32 td;
-#endif
        rpc_program_t *rp;
        char str[64];
 
        printf("\n");
        printf("===================================================================\n");
        printf("ONC-RPC Program Statistics:\n");
-       printf("Program    Version  Calls   Min RTT   Max RTT   Avg RTT\n");
+       printf("Program    Version  Calls   Min SRT   Max SRT   Avg SRT\n");
        for(rp=prog_list;rp;rp=rp->next){
                /* scale it to units of 10us.*/
-               /* for long captures with a large tot time, this can overflow on 32bit */
-               td=(int)rp->tot.secs;
+               td=rp->tot.secs;
                td=td*100000+(int)rp->tot.nsecs/10000;
                if(rp->num){
                        td/=rp->num;
@@ -205,8 +195,8 @@ rpcprogs_draw(void *dummy _U_)
                        td=0;
                }
 
-               sprintf(str,"%s(%d)",rpc_prog_name(rp->program),rp->program);
-               printf("%-15s %2d %6d %3d.%05d %3d.%05d %3d.%05d\n",
+               g_snprintf(str, sizeof(str), "%s(%d)",rpc_prog_name(rp->program),rp->program);
+               printf("%-15s %2d %6d %3d.%05d %3d.%05d %3" G_GINT64_MODIFIER "u.%05" G_GINT64_MODIFIER "u\n",
                        str,
                        rp->version,
                        rp->num,
@@ -219,20 +209,30 @@ rpcprogs_draw(void *dummy _U_)
 }
 
 
-void
-rpcprogs_init(void)
+static void
+rpcprogs_init(const char *optarg _U_, void* userdata _U_)
 {
+       GString *error_string;
+
        if(already_enabled){
                return;
        }
        already_enabled=1;
 
-       if(register_tap_listener("rpc", NULL, NULL, NULL, (void*)rpcprogs_packet, (void*)rpcprogs_draw)){
-               fprintf(stderr,"tethereal: rpcprogs_init() failed to attach to tap.\n");
+       error_string=register_tap_listener("rpc", NULL, NULL, 0, NULL, rpcprogs_packet, rpcprogs_draw);
+       if(error_string){
+               fprintf(stderr,"tshark: Couldn't register rpc,programs tap: %s\n",
+                   error_string->str);
+               g_string_free(error_string, TRUE);
                exit(1);
        }
 }
 
 
+void
+register_tap_listener_rpcprogs(void)
+{
+       register_stat_cmd_arg("rpc,programs", rpcprogs_init, NULL);
+}