Revert r35132 so that a better fix can be implemented that doesn't break

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

diff --git a/tap-smbstat.c b/tap-smbstat.c
index a1ff557ca9b02693d65e0d8302781ea38cad4727..a2d0d66cf197b7f4a5ba542172c37a16c732969d 100644 (file)
--- a/tap-smbstat.c
+++ b/tap-smbstat.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
@@ -37,8 +37,7 @@
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
 #include "epan/value_string.h"
-#include <epan/smb.h>
-#include "register.h"
+#include <epan/dissectors/packet-smb.h>
 #include "timestats.h"
 
 /* used to keep track of the statistics for an entire program interface */
@@ -102,11 +101,7 @@ smbstat_draw(void *pss)
 {
        smbstat_t *ss=(smbstat_t *)pss;
        guint32 i;
-#ifdef G_HAVE_UINT64
        guint64 td;
-#else
-       guint32 td;
-#endif
        printf("\n");
        printf("===================================================================\n");
        printf("SMB RTT Statistics:\n");
@@ -129,8 +124,7 @@ smbstat_draw(void *pss)
                }
 
                /* scale it to units of 10us.*/
-               /* for long captures with a large tot time, this can overflow on 32bit */
-               td=(int)ss->proc[i].tot.secs;
+               td=ss->proc[i].tot.secs;
                td=td*100000+(int)ss->proc[i].tot.nsecs/10000;
                if(ss->proc[i].num){
                        td/=ss->proc[i].num;
@@ -138,8 +132,8 @@ smbstat_draw(void *pss)
                        td=0;
                }
 
-               printf("%-25s %6d %3d.%05d %3d.%05d %3d.%05d\n",
-                       val_to_str(i, smb_cmd_vals, "Unknown (0x%02x)"),
+               printf("%-25s %6d %3d.%05d %3d.%05d %3" G_GINT64_MODIFIER "u.%05" G_GINT64_MODIFIER "u\n",
+                       val_to_str_ext(i, &smb_cmd_vals_ext, "Unknown (0x%02x)"),
                        ss->proc[i].num,
                        (int)ss->proc[i].min.secs,ss->proc[i].min.nsecs/10000,
                        (int)ss->proc[i].max.secs,ss->proc[i].max.nsecs/10000,
@@ -156,8 +150,7 @@ smbstat_draw(void *pss)
                }
 
                /* scale it to units of 10us.*/
-               /* for long captures with a large tot time, this can overflow on 32bit */
-               td=(int)ss->trans2[i].tot.secs;
+               td=ss->trans2[i].tot.secs;
                td=td*100000+(int)ss->trans2[i].tot.nsecs/10000;
                if(ss->trans2[i].num){
                        td/=ss->trans2[i].num;
@@ -165,8 +158,8 @@ smbstat_draw(void *pss)
                        td=0;
                }
 
-               printf("%-25s %6d %3d.%05d %3d.%05d %3d.%05d\n",
-                       val_to_str(i, trans2_cmd_vals, "Unknown (0x%02x)"),
+               printf("%-25s %6d %3d.%05d %3d.%05d %3" G_GINT64_MODIFIER "u.%05" G_GINT64_MODIFIER "u\n",
+                       val_to_str_ext(i, &trans2_cmd_vals_ext, "Unknown (0x%02x)"),
                        ss->trans2[i].num,
                        (int)ss->trans2[i].min.secs,ss->trans2[i].min.nsecs/10000,
                        (int)ss->trans2[i].max.secs,ss->trans2[i].max.nsecs/10000,
@@ -183,8 +176,7 @@ smbstat_draw(void *pss)
                }
 
                /* scale it to units of 10us.*/
-               /* for long captures with a large tot time, this can overflow on 32bit */
-               td=(int)ss->nt_trans[i].tot.secs;
+               td=ss->nt_trans[i].tot.secs;
                td=td*100000+(int)ss->nt_trans[i].tot.nsecs/10000;
                if(ss->nt_trans[i].num){
                        td/=ss->nt_trans[i].num;
@@ -192,8 +184,8 @@ smbstat_draw(void *pss)
                        td=0;
                }
 
-               printf("%-25s %6d %3d.%05d %3d.%05d %3d.%05d\n",
-                       val_to_str(i, nt_cmd_vals, "Unknown (0x%02x)"),
+               printf("%-25s %6d %3d.%05d %3d.%05d %3" G_GINT64_MODIFIER "u.%05" G_GINT64_MODIFIER "u\n",
+                       val_to_str_ext(i, &nt_cmd_vals_ext, "Unknown (0x%02x)"),
                        ss->nt_trans[i].num,
                        (int)ss->nt_trans[i].min.secs,ss->nt_trans[i].min.nsecs/10000,
                        (int)ss->nt_trans[i].max.secs,ss->nt_trans[i].max.nsecs/10000,
@@ -206,7 +198,7 @@ smbstat_draw(void *pss)
 
 
 static void
-smbstat_init(const char *optarg)
+smbstat_init(const char *optarg,void* userdata _U_)
 {
        smbstat_t *ss;
        guint32 i;
@@ -221,8 +213,7 @@ smbstat_init(const char *optarg)
 
        ss=g_malloc(sizeof(smbstat_t));
        if(filter){
-               ss->filter=g_malloc(strlen(filter)+1);
-               strcpy(ss->filter, filter);
+               ss->filter=g_strdup(filter);
        } else {
                ss->filter=NULL;
        }
@@ -259,13 +250,13 @@ smbstat_init(const char *optarg)
                ss->nt_trans[i].tot.nsecs=0;
        }
 
-       error_string=register_tap_listener("smb", ss, filter, NULL, smbstat_packet, smbstat_draw);
+       error_string=register_tap_listener("smb", ss, filter, 0, NULL, smbstat_packet, smbstat_draw);
        if(error_string){
                /* error, we failed to attach to the tap. clean up */
                g_free(ss->filter);
                g_free(ss);
 
-               fprintf(stderr, "tethereal: Couldn't register smb,rtt tap: %s\n",
+               fprintf(stderr, "tshark: Couldn't register smb,rtt tap: %s\n",
                    error_string->str);
                g_string_free(error_string, TRUE);
                exit(1);
@@ -276,6 +267,6 @@ smbstat_init(const char *optarg)
 void
 register_tap_listener_smbstat(void)
 {
-       register_stat_cmd_arg("smb,rtt", smbstat_init);
+       register_stat_cmd_arg("smb,rtt", smbstat_init,NULL);
 }