*
* $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
#include <epan/tap.h>
#include <epan/stat_cmd_args.h>
#include "epan/value_string.h"
-#include "smb.h"
+#include <epan/dissectors/packet-smb.h>
#include "register.h"
#include "timestats.h"
}
/* calculate time delta between request and reply */
- t.secs=pinfo->fd->abs_secs;
- t.nsecs=pinfo->fd->abs_usecs*1000;
- get_timedelta(&deltat, &t, &si->sip->req_time);
+ t=pinfo->fd->abs_ts;
+ nstime_delta(&deltat, &t, &si->sip->req_time);
if(sp){
time_stat_update(sp,&deltat, pinfo);
{
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");
}
/* 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;
td=0;
}
- printf("%-25s %6d %3d.%05d %3d.%05d %3d.%05d\n",
+ printf("%-25s %6d %3d.%05d %3d.%05d %3" G_GINT64_MODIFIER "u.%05" G_GINT64_MODIFIER "u\n",
val_to_str(i, smb_cmd_vals, "Unknown (0x%02x)"),
ss->proc[i].num,
(int)ss->proc[i].min.secs,ss->proc[i].min.nsecs/10000,
}
/* 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;
td=0;
}
- printf("%-25s %6d %3d.%05d %3d.%05d %3d.%05d\n",
+ printf("%-25s %6d %3d.%05d %3d.%05d %3" G_GINT64_MODIFIER "u.%05" G_GINT64_MODIFIER "u\n",
val_to_str(i, trans2_cmd_vals, "Unknown (0x%02x)"),
ss->trans2[i].num,
(int)ss->trans2[i].min.secs,ss->trans2[i].min.nsecs/10000,
}
/* 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;
td=0;
}
- printf("%-25s %6d %3d.%05d %3d.%05d %3d.%05d\n",
+ printf("%-25s %6d %3d.%05d %3d.%05d %3" G_GINT64_MODIFIER "u.%05" G_GINT64_MODIFIER "u\n",
val_to_str(i, nt_cmd_vals, "Unknown (0x%02x)"),
ss->nt_trans[i].num,
(int)ss->nt_trans[i].min.secs,ss->nt_trans[i].min.nsecs/10000,
static void
-smbstat_init(const char *optarg)
+smbstat_init(const char *optarg,void* userdata _U_)
{
smbstat_t *ss;
guint32 i;
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;
}
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);
void
register_tap_listener_smbstat(void)
{
- register_stat_cmd_arg("smb,rtt", smbstat_init);
+ register_stat_cmd_arg("smb,rtt", smbstat_init,NULL);
}