iscsi also has a system port (860) registered in addition to the more common

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

diff --git a/tap-smbstat.c b/tap-smbstat.c
index 4c6b4ef4a4da2e7c0193d2351e6b45834df7f287..eae8b27a210a74cb419d90f9bef8f1361495d67c 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
@@ -22,10 +22,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */  
-#define _NEED_VAR_IMPORT_
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -39,8 +35,9 @@
 #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 <epan/dissectors/packet-smb.h>
 #include "register.h"
 #include "timestats.h"
 
@@ -55,11 +52,11 @@ typedef struct _smbstat_t {
 
 
 static int
-smbstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, void *psi)
+smbstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi)
 {
        smbstat_t *ss=(smbstat_t *)pss;
-       smb_info_t *si=psi;
-       nstime_t delta;
+       const smb_info_t *si=psi;
+       nstime_t t, deltat;
        timestat_t *sp=NULL;
 
        /* we are only interested in reply packets */
@@ -71,14 +68,14 @@ smbstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, void *psi
                return 0;
        }
 
-       if(si->cmd==0xA0){
+       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){
+       } 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*/
@@ -90,15 +87,11 @@ smbstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, void *psi
        }
 
        /* calculate time delta between request and reply */
-       delta.secs=pinfo->fd->abs_secs-si->sip->req_time.secs;
-       delta.nsecs=pinfo->fd->abs_usecs*1000-si->sip->req_time.nsecs;
-       if(delta.nsecs<0){
-               delta.nsecs+=1000000000;
-               delta.secs--;
-       }
+       t=pinfo->fd->abs_ts;
+       nstime_delta(&deltat, &t, &si->sip->req_time);
 
        if(sp){
-               time_stat_update(sp,&delta, pinfo);
+               time_stat_update(sp,&deltat, pinfo);
        }
 
        return 1;
@@ -109,11 +102,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");
@@ -136,8 +125,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;
@@ -145,7 +133,7 @@ smbstat_draw(void *pss)
                        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,
@@ -163,8 +151,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;
@@ -172,7 +159,7 @@ smbstat_draw(void *pss)
                        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,
@@ -190,8 +177,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;
@@ -199,7 +185,7 @@ smbstat_draw(void *pss)
                        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,
@@ -213,11 +199,11 @@ smbstat_draw(void *pss)
 
 
 static void
-smbstat_init(char *optarg)
+smbstat_init(const char *optarg,void* userdata _U_)
 {
        smbstat_t *ss;
        guint32 i;
-       char *filter=NULL;
+       const char *filter=NULL;
        GString *error_string;
 
        if(!strncmp(optarg,"smb,rtt,",8)){
@@ -228,8 +214,7 @@ smbstat_init(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;
        }
@@ -266,13 +251,13 @@ smbstat_init(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);
@@ -283,6 +268,6 @@ smbstat_init(char *optarg)
 void
 register_tap_listener_smbstat(void)
 {
-       register_ethereal_tap("smb,rtt", smbstat_init);
+       register_stat_cmd_arg("smb,rtt", smbstat_init,NULL);
 }