the flags are FT_BOOLEAN not FT_UINT8

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

diff --git a/tap-dcerpcstat.c b/tap-dcerpcstat.c
index 18a2402447200012c58b969ca668da6fffdcd3d1..99767166c8ddbf338e0c87194cd498a6e3006dc2 100644 (file)
--- a/tap-dcerpcstat.c
+++ b/tap-dcerpcstat.c
@@ -3,8 +3,8 @@
  *
  * $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
@@ -35,8 +35,8 @@
 #include <string.h>
 #include "epan/packet_info.h"
 #include <epan/tap.h>
+#include <epan/stat_cmd_args.h>
 #include <epan/dissectors/packet-dcerpc.h>
-#include "stat.h"
 #include "register.h"
 
 /* used to keep track of statistics for a specific procedure */
@@ -104,12 +104,7 @@ dcerpcstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, const
        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;
@@ -187,7 +182,7 @@ dcerpcstat_draw(void *prs)
 
 
 static void
-dcerpcstat_init(const char *optarg)
+dcerpcstat_init(const char *optarg, void* userdata _U_)
 {
        rpcstat_t *rs;
        guint32 i, max_procs;
@@ -213,7 +208,7 @@ dcerpcstat_init(const 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){
@@ -234,15 +229,15 @@ dcerpcstat_init(const char *optarg)
                        filter=NULL;
                }
        } else {
-               fprintf(stderr, "tethereal: invalid \"-z dcerpc,rtt,<uuid>,<major version>.<minor version>[,<filter>]\" argument\n");
+               fprintf(stderr, "tshark: invalid \"-z dcerpc,rtt,<uuid>,<major version>.<minor version>[,<filter>]\" argument\n");
                exit(1);
        }
        if (major < 0 || major > 65535) {
-               fprintf(stderr,"tethereal: dcerpcstat_init() Major version number %d is invalid - must be positive and <= 65535\n", major);
+               fprintf(stderr,"tshark: dcerpcstat_init() Major version number %d is invalid - must be positive and <= 65535\n", major);
                exit(1);
        }
        if (minor < 0 || minor > 65535) {
-               fprintf(stderr,"tethereal: dcerpcstat_init() Minor version number %d is invalid - must be positive and <= 65535\n", minor);
+               fprintf(stderr,"tshark: dcerpcstat_init() Minor version number %d is invalid - must be positive and <= 65535\n", minor);
                exit(1);
        }
        ver = major;
@@ -251,7 +246,7 @@ dcerpcstat_init(const char *optarg)
        rs->prog=dcerpc_get_proto_name(&uuid, ver);
        if(!rs->prog){
                g_free(rs);
-               fprintf(stderr,"tethereal: dcerpcstat_init() Protocol with uuid:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x v%u not supported\n",uuid.Data1,uuid.Data2,uuid.Data3,uuid.Data4[0],uuid.Data4[1],uuid.Data4[2],uuid.Data4[3],uuid.Data4[4],uuid.Data4[5],uuid.Data4[6],uuid.Data4[7],ver);
+               fprintf(stderr,"tshark: dcerpcstat_init() Protocol with uuid:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x v%u not supported\n",uuid.Data1,uuid.Data2,uuid.Data3,uuid.Data4[0],uuid.Data4[1],uuid.Data4[2],uuid.Data4[3],uuid.Data4[4],uuid.Data4[5],uuid.Data4[6],uuid.Data4[7],ver);
                exit(1);
        }
        procs=dcerpc_get_proto_sub_dissector(&uuid, ver);
@@ -296,7 +291,7 @@ dcerpcstat_init(const char *optarg)
                g_free(rs->filter);
                g_free(rs);
 
-               fprintf(stderr, "tethereal: Couldn't register dcerpc,rtt tap: %s\n",
+               fprintf(stderr, "tshark: Couldn't register dcerpc,rtt tap: %s\n",
                    error_string->str);
                g_string_free(error_string, TRUE);
                exit(1);
@@ -306,5 +301,5 @@ dcerpcstat_init(const char *optarg)
 void
 register_tap_listener_dcerpcstat(void)
 {
-       register_stat_cmd_arg("dcerpc,rtt,", dcerpcstat_init);
+       register_stat_cmd_arg("dcerpc,rtt,", dcerpcstat_init,NULL);
 }