various string related changes, mainly replace sprintf/snprintf by g_snprintf

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

diff --git a/tap-smbstat.c b/tap-smbstat.c
index ff3d29ab15d5837a56939094a1e324a9b8474a64..6a383e61aea42c628981b8441ed624ec0c6169a1 100644 (file)
--- a/tap-smbstat.c
+++ b/tap-smbstat.c
@@ -1,22 +1,22 @@
 /* tap-smbstat.c
  * smbstat   2003 Ronnie Sahlberg
  *
- * $Id: tap-smbstat.c,v 1.1 2003/01/22 00:42:03 sahlberg Exp $
+ * $Id: tap-smbstat.c,v 1.5 2003/09/28 00:00:36 sahlberg Exp $
  *
  * 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.
@@ -38,21 +38,14 @@
 #include "epan/value_string.h"
 #include "smb.h"
 #include "register.h"
-
-
-typedef struct _smb_procedure_t {
-       int num;
-       nstime_t min;
-       nstime_t max;
-       nstime_t tot;
-} smb_procedure_t;
+#include "timestats.h"
 
 /* used to keep track of the statistics for an entire program interface */
 typedef struct _smbstat_t {
        char *filter;
-       smb_procedure_t proc[256];
-       smb_procedure_t trans2[256];
-       smb_procedure_t nt_trans[256];
+       timestat_t proc[256];
+       timestat_t trans2[256];
+       timestat_t nt_trans[256];
 } smbstat_t;
 
 
@@ -63,7 +56,7 @@ smbstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, void *psi
        smbstat_t *ss=(smbstat_t *)pss;
        smb_info_t *si=psi;
        nstime_t delta;
-       smb_procedure_t *sp;
+       timestat_t *sp=NULL;
 
        /* we are only interested in reply packets */
        if(si->request){
@@ -78,12 +71,16 @@ smbstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, void *psi
                smb_nt_transact_info_t *sti=(smb_nt_transact_info_t *)si->sip->extra_info;
 
                /*nt transaction*/
-               sp=&(ss->nt_trans[sti->subcmd]);
+               if(sti){
+                       sp=&(ss->nt_trans[sti->subcmd]);
+               }
        } else if(si->cmd==0x32){
                smb_transact2_info_t *st2i=(smb_transact2_info_t *)si->sip->extra_info;
 
                /*transaction2*/
-               sp=&(ss->trans2[st2i->subcmd]);
+               if(st2i){
+                       sp=&(ss->trans2[st2i->subcmd]);
+               }
        } else {
                sp=&(ss->proc[si->cmd]);
        }
@@ -96,40 +93,10 @@ smbstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, void *psi
                delta.secs--;
        }
 
-       if((sp->max.secs==0)
-       && (sp->max.nsecs==0) ){
-               sp->max.secs=delta.secs;
-               sp->max.nsecs=delta.nsecs;
-       }
-
-       if((sp->min.secs==0)
-       && (sp->min.nsecs==0) ){
-               sp->min.secs=delta.secs;
-               sp->min.nsecs=delta.nsecs;
+       if(sp){
+               time_stat_update(sp,&delta, pinfo);
        }
 
-       if( (delta.secs<sp->min.secs)
-       ||( (delta.secs==sp->min.secs)
-         &&(delta.nsecs<sp->min.nsecs) ) ){
-               sp->min.secs=delta.secs;
-               sp->min.nsecs=delta.nsecs;
-       }
-
-       if( (delta.secs>sp->max.secs)
-       ||( (delta.secs==sp->max.secs)
-         &&(delta.nsecs>sp->max.nsecs) ) ){
-               sp->max.secs=delta.secs;
-               sp->max.nsecs=delta.nsecs;
-       }
-       
-       sp->tot.secs += delta.secs;
-       sp->tot.nsecs += delta.nsecs;
-       if(sp->tot.nsecs>1000000000){
-               sp->tot.nsecs-=1000000000;
-               sp->tot.secs++;
-       }
-       sp->num++;
-
        return 1;
 }
 
@@ -247,7 +214,7 @@ smbstat_init(char *optarg)
        smbstat_t *ss;
        guint32 i;
        char *filter=NULL;
-
+       GString *error_string;
 
        if(!strncmp(optarg,"smb,rtt,",8)){
                filter=optarg+8;
@@ -264,29 +231,46 @@ smbstat_init(char *optarg)
        }
 
        for(i=0;i<256;i++){
-               ss->proc[i].num=0;      
+               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].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;
        }
 
-       if(register_tap_listener("smb", ss, filter, NULL, smbstat_packet, smbstat_draw)){
+       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: smbstat_init() failed to attach to tap.\n");
+               fprintf(stderr, "tethereal: Couldn't register smb,rtt tap: %s\n",
+                   error_string->str);
+               g_string_free(error_string, TRUE);
                exit(1);
        }
 }
@@ -295,6 +279,6 @@ smbstat_init(char *optarg)
 void
 register_tap_listener_smbstat(void)
 {
-       register_ethereal_tap("smb,rtt", smbstat_init, NULL, NULL);
+       register_ethereal_tap("smb,rtt", smbstat_init);
 }