![Ulf Lamping](/assets/img/avatar_default.png)
I've done more than a day to change the timestamp resolution from microseconds to nanoseconds. As I really don't want to loose those changes, I'm going to check in the changes I've done so far. Hopefully someone else will give me a helping hand with the things left ... What's done: I've changed the timestamp resolution from usec to nsec in almost any place in the sources. I've changed parts of the implementation in nstime.s/.h and a lot of places elsewhere. As I don't understand the editcap source (well, I'm maybe just too tired right now), hopefully someone else might be able to fix this soon. Doing all those changes, we get native nanosecond timestamp resolution in Ethereal. After fixing all the remaining issues, I'll take a look how to display this in a convenient way... As I've also changed the wiretap timestamp resolution from usec to nsec we might want to change the wiretap version number... svn path=/trunk/; revision=15520
282 lines
6.7 KiB
C
282 lines
6.7 KiB
C
/* tap-smbstat.c
|
|
* smbstat 2003 Ronnie Sahlberg
|
|
*
|
|
* $Id$
|
|
*
|
|
* Ethereal - Network traffic analyzer
|
|
* By Gerald Combs <gerald@ethereal.com>
|
|
* Copyright 1998 Gerald Combs
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include "config.h"
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
# include <sys/types.h>
|
|
#endif
|
|
|
|
#include <string.h>
|
|
#include "epan/packet_info.h"
|
|
#include <epan/tap.h>
|
|
#include <epan/stat_cmd_args.h>
|
|
#include "epan/value_string.h"
|
|
#include "smb.h"
|
|
#include "register.h"
|
|
#include "timestats.h"
|
|
|
|
/* used to keep track of the statistics for an entire program interface */
|
|
typedef struct _smbstat_t {
|
|
char *filter;
|
|
timestat_t proc[256];
|
|
timestat_t trans2[256];
|
|
timestat_t nt_trans[256];
|
|
} smbstat_t;
|
|
|
|
|
|
|
|
static int
|
|
smbstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi)
|
|
{
|
|
smbstat_t *ss=(smbstat_t *)pss;
|
|
const smb_info_t *si=psi;
|
|
nstime_t t, deltat;
|
|
timestat_t *sp=NULL;
|
|
|
|
/* we are only interested in reply packets */
|
|
if(si->request){
|
|
return 0;
|
|
}
|
|
/* if we havnt seen the request, just ignore it */
|
|
if(!si->sip){
|
|
return 0;
|
|
}
|
|
|
|
if(si->cmd==0xA0 && si->sip->extra_info_type == SMB_EI_NTI){
|
|
smb_nt_transact_info_t *sti=(smb_nt_transact_info_t *)si->sip->extra_info;
|
|
|
|
/*nt transaction*/
|
|
if(sti){
|
|
sp=&(ss->nt_trans[sti->subcmd]);
|
|
}
|
|
} else if(si->cmd==0x32 && si->sip->extra_info_type == SMB_EI_T2I){
|
|
smb_transact2_info_t *st2i=(smb_transact2_info_t *)si->sip->extra_info;
|
|
|
|
/*transaction2*/
|
|
if(st2i){
|
|
sp=&(ss->trans2[st2i->subcmd]);
|
|
}
|
|
} else {
|
|
sp=&(ss->proc[si->cmd]);
|
|
}
|
|
|
|
/* calculate time delta between request and reply */
|
|
t=pinfo->fd->abs_ts;
|
|
nstime_delta(&deltat, &t, &si->sip->req_time);
|
|
|
|
if(sp){
|
|
time_stat_update(sp,&deltat, pinfo);
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
static void
|
|
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");
|
|
printf("Filter: %s\n",ss->filter?ss->filter:"");
|
|
printf("Commands Calls Min RTT Max RTT Avg RTT\n");
|
|
for(i=0;i<256;i++){
|
|
/* nothing seen, nothing to do */
|
|
if(ss->proc[i].num==0){
|
|
continue;
|
|
}
|
|
|
|
/* we deal with transaction2 later */
|
|
if(i==0x32){
|
|
continue;
|
|
}
|
|
|
|
/* we deal with nt transaction later */
|
|
if(i==0xA0){
|
|
continue;
|
|
}
|
|
|
|
/* 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=td*100000+(int)ss->proc[i].tot.nsecs/10000;
|
|
if(ss->proc[i].num){
|
|
td/=ss->proc[i].num;
|
|
} else {
|
|
td=0;
|
|
}
|
|
|
|
printf("%-25s %6d %3d.%05d %3d.%05d %3d.%05d\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,
|
|
(int)ss->proc[i].max.secs,ss->proc[i].max.nsecs/10000,
|
|
td/100000, td%100000
|
|
);
|
|
}
|
|
|
|
printf("\n");
|
|
printf("Transaction2 Commands Calls Min RTT Max RTT Avg RTT\n");
|
|
for(i=0;i<256;i++){
|
|
/* nothing seen, nothing to do */
|
|
if(ss->trans2[i].num==0){
|
|
continue;
|
|
}
|
|
|
|
/* 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=td*100000+(int)ss->trans2[i].tot.nsecs/10000;
|
|
if(ss->trans2[i].num){
|
|
td/=ss->trans2[i].num;
|
|
} else {
|
|
td=0;
|
|
}
|
|
|
|
printf("%-25s %6d %3d.%05d %3d.%05d %3d.%05d\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,
|
|
(int)ss->trans2[i].max.secs,ss->trans2[i].max.nsecs/10000,
|
|
td/100000, td%100000
|
|
);
|
|
}
|
|
|
|
printf("\n");
|
|
printf("NT Transaction Commands Calls Min RTT Max RTT Avg RTT\n");
|
|
for(i=0;i<256;i++){
|
|
/* nothing seen, nothing to do */
|
|
if(ss->nt_trans[i].num==0){
|
|
continue;
|
|
}
|
|
|
|
/* 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=td*100000+(int)ss->nt_trans[i].tot.nsecs/10000;
|
|
if(ss->nt_trans[i].num){
|
|
td/=ss->nt_trans[i].num;
|
|
} else {
|
|
td=0;
|
|
}
|
|
|
|
printf("%-25s %6d %3d.%05d %3d.%05d %3d.%05d\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,
|
|
(int)ss->nt_trans[i].max.secs,ss->nt_trans[i].max.nsecs/10000,
|
|
td/100000, td%100000
|
|
);
|
|
}
|
|
|
|
printf("===================================================================\n");
|
|
}
|
|
|
|
|
|
static void
|
|
smbstat_init(const char *optarg)
|
|
{
|
|
smbstat_t *ss;
|
|
guint32 i;
|
|
const char *filter=NULL;
|
|
GString *error_string;
|
|
|
|
if(!strncmp(optarg,"smb,rtt,",8)){
|
|
filter=optarg+8;
|
|
} else {
|
|
filter=NULL;
|
|
}
|
|
|
|
ss=g_malloc(sizeof(smbstat_t));
|
|
if(filter){
|
|
ss->filter=g_malloc(strlen(filter)+1);
|
|
strcpy(ss->filter, filter);
|
|
} else {
|
|
ss->filter=NULL;
|
|
}
|
|
|
|
for(i=0;i<256;i++){
|
|
ss->proc[i].num=0;
|
|
ss->proc[i].min_num=0;
|
|
ss->proc[i].max_num=0;
|
|
ss->proc[i].min.secs=0;
|
|
ss->proc[i].min.nsecs=0;
|
|
ss->proc[i].max.secs=0;
|
|
ss->proc[i].max.nsecs=0;
|
|
ss->proc[i].tot.secs=0;
|
|
ss->proc[i].tot.nsecs=0;
|
|
|
|
ss->trans2[i].num=0;
|
|
ss->trans2[i].min_num=0;
|
|
ss->trans2[i].max_num=0;
|
|
ss->trans2[i].min.secs=0;
|
|
ss->trans2[i].min.nsecs=0;
|
|
ss->trans2[i].max.secs=0;
|
|
ss->trans2[i].max.nsecs=0;
|
|
ss->trans2[i].tot.secs=0;
|
|
ss->trans2[i].tot.nsecs=0;
|
|
|
|
ss->nt_trans[i].num=0;
|
|
ss->nt_trans[i].min_num=0;
|
|
ss->nt_trans[i].max_num=0;
|
|
ss->nt_trans[i].min.secs=0;
|
|
ss->nt_trans[i].min.nsecs=0;
|
|
ss->nt_trans[i].max.secs=0;
|
|
ss->nt_trans[i].max.nsecs=0;
|
|
ss->nt_trans[i].tot.secs=0;
|
|
ss->nt_trans[i].tot.nsecs=0;
|
|
}
|
|
|
|
error_string=register_tap_listener("smb", ss, filter, 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",
|
|
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);
|
|
}
|
|
|