Add adns_dll.dep and adns_dll.rc to the tarball, as requested by Sake

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

diff --git a/tap-rpcprogs.c b/tap-rpcprogs.c
index 7b6155a6fc334462ad6c9ce0031b3b82bb42facb..10c6c2f7bbcfe5bce003a24ddf90e66787e80b42 100644 (file)
--- a/tap-rpcprogs.c
+++ b/tap-rpcprogs.c
@@ -1,10 +1,10 @@
 /* tap-rpcprogs.c
  * rpcstat   2002 Ronnie Sahlberg
  *
- * $Id: tap-rpcprogs.c,v 1.5 2003/04/23 08:20:02 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
@@ -22,8 +22,8 @@
  * 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,8 +38,9 @@
 
 #include <string.h>
 #include "epan/packet_info.h"
-#include "tap.h"
-#include "packet-rpc.h"
+#include <epan/tap.h>
+#include <epan/stat_cmd_args.h>
+#include <epan/dissectors/packet-rpc.h>
 #include "register.h"
 
 /* used to keep track of statistics for a specific program/version */
@@ -57,9 +58,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_, void *pri)
+rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pri)
 {
-       rpc_call_info_value *ri=pri;
+       const rpc_call_info_value *ri=pri;
        nstime_t delta;
        rpc_program_t *rp=NULL;
 
@@ -134,12 +135,7 @@ rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, v
        }
 
        /* 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) ){
@@ -182,22 +178,17 @@ rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, v
 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 +196,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,
@@ -220,7 +211,7 @@ rpcprogs_draw(void *dummy _U_)
 
 
 static void
-rpcprogs_init(char *optarg _U_)
+rpcprogs_init(const char *optarg _U_, void* userdata _U_)
 {
        GString *error_string;
 
@@ -231,7 +222,7 @@ rpcprogs_init(char *optarg _U_)
 
        error_string=register_tap_listener("rpc", NULL, NULL, NULL, rpcprogs_packet, rpcprogs_draw);
        if(error_string){
-               fprintf(stderr,"tethereal: Couldn't register rpc,programs tap: %s\n",
+               fprintf(stderr,"tshark: Couldn't register rpc,programs tap: %s\n",
                    error_string->str);
                g_string_free(error_string, TRUE);
                exit(1);
@@ -242,7 +233,7 @@ rpcprogs_init(char *optarg _U_)
 void
 register_tap_listener_rpcprogs(void)
 {
-       register_ethereal_tap("rpc,programs", rpcprogs_init);
+       register_stat_cmd_arg("rpc,programs", rpcprogs_init, NULL);
 }