Ethereal->Wireshark

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

diff --git a/tap-dcerpcstat.c b/tap-dcerpcstat.c
index bd14a7b71872ffd9b129979f4634110424ebb8d3..e5f990ee9c374cacc5645016f3ff4b20bcaaba06 100644 (file)
--- a/tap-dcerpcstat.c
+++ b/tap-dcerpcstat.c
@@ -1,10 +1,10 @@
 /* tap-dcerpcstat.c
  * dcerpcstat   2002 Ronnie Sahlberg
  *
- * $Id: tap-dcerpcstat.c,v 1.10 2004/05/07 11:25:15 ulfl 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
@@ -34,13 +34,14 @@
 
 #include <string.h>
 #include "epan/packet_info.h"
-#include "tap.h"
-#include "packet-dcerpc.h"
+#include <epan/tap.h>
+#include <epan/stat_cmd_args.h>
+#include <epan/dissectors/packet-dcerpc.h>
 #include "register.h"
 
 /* used to keep track of statistics for a specific procedure */
 typedef struct _rpc_procedure_t {
-       char *proc;
+       const char *proc;
        int num;
        nstime_t min;
        nstime_t max;
@@ -49,7 +50,7 @@ typedef struct _rpc_procedure_t {
 
 /* used to keep track of the statistics for an entire program interface */
 typedef struct _rpcstat_t {
-       char *prog;
+       const char *prog;
        char *filter;
        e_uuid_t uuid;
        guint16 ver;
@@ -60,9 +61,9 @@ typedef struct _rpcstat_t {
 
 
 static int
-dcerpcstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, void *pri)
+dcerpcstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pri)
 {
-       dcerpc_info *ri=pri;
+       const dcerpc_info *ri=pri;
        rpcstat_t *rs=prs;
        nstime_t delta;
        rpc_procedure_t *rp;
@@ -103,12 +104,7 @@ dcerpcstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, void *
        rp=&(rs->procedures[ri->call_data->opnum]);
 
        /* calculate time delta between request and reply */
-       delta.secs=pinfo->fd->abs_secs-ri->call_data->req_time.secs;
-       delta.nsecs=pinfo->fd->abs_usecs*1000-ri->call_data->req_time.nsecs;
-       if(delta.nsecs<0){
-               delta.nsecs+=1000000000;
-               delta.secs--;
-       }
+       nstime_delta(&delta, &pinfo->fd->abs_ts, &ri->call_data->req_time);
 
        if(rp->num==0){
                rp->max.secs=delta.secs;
@@ -186,7 +182,7 @@ dcerpcstat_draw(void *prs)
 
 
 static void
-dcerpcstat_init(char *optarg)
+dcerpcstat_init(const char *optarg, void* userdata _U_)
 {
        rpcstat_t *rs;
        guint32 i, max_procs;
@@ -196,7 +192,7 @@ dcerpcstat_init(char *optarg)
        int major, minor;
        guint16 ver;
        int pos=0;
-        char *filter=NULL;
+        const char *filter=NULL;
         GString *error_string;
     
        /*
@@ -212,7 +208,7 @@ dcerpcstat_init(char *optarg)
         * if it's omitted?
         *
         * XXX - should this be called "srt" rather than "rtt"?  The
-        * equivalent tap for Ethereal calls it "srt", for "Service
+        * equivalent tap for Wireshark calls it "srt", for "Service
         * Response Time", rather than "rtt" for "Round-Trip Time".
         */
        if(sscanf(optarg,"dcerpc,rtt,%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x,%d.%d%n", &d1,&d2,&d3,&d40,&d41,&d42,&d43,&d44,&d45,&d46,&d47,&major,&minor,&pos)==13){
@@ -305,5 +301,5 @@ dcerpcstat_init(char *optarg)
 void
 register_tap_listener_dcerpcstat(void)
 {
-       register_ethereal_tap("dcerpc,rtt,", dcerpcstat_init);
+       register_stat_cmd_arg("dcerpc,rtt,", dcerpcstat_init,NULL);
 }