1.3.5 -> 1.3.6.

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

diff --git a/tap-dcerpcstat.c b/tap-dcerpcstat.c
index a15f18209d38644ee1adfda41b047d84221dd68a..7c3cd169318a940b39d6bf022c3104befdd3e0d3 100644 (file)
--- a/tap-dcerpcstat.c
+++ b/tap-dcerpcstat.c
@@ -147,11 +147,7 @@ dcerpcstat_draw(void *prs)
 {
        rpcstat_t *rs=prs;
        guint32 i;
-#ifdef G_HAVE_UINT64
        guint64 td;
-#else
-       guint32 td;
-#endif
        printf("\n");
        printf("===================================================================\n");
        printf("%s Major Version %u RTT Statistics:\n", rs->prog, rs->ver);
@@ -159,8 +155,7 @@ dcerpcstat_draw(void *prs)
        printf("Procedure                  Calls   Min RTT   Max RTT   Avg RTT\n");
        for(i=0;i<rs->num_procedures;i++){
                /* scale it to units of 10us.*/
-               /* for long captures with a large tot time, this can overflow on 32bit */
-               td=(int)rs->procedures[i].tot.secs;
+               td=rs->procedures[i].tot.secs;
                td=td*100000+(int)rs->procedures[i].tot.nsecs/10000;
                if(rs->procedures[i].num){
                        td/=rs->procedures[i].num;
@@ -168,7 +163,7 @@ dcerpcstat_draw(void *prs)
                        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",
                        rs->procedures[i].proc,
                        rs->procedures[i].num,
                        (int)rs->procedures[i].min.secs,rs->procedures[i].min.nsecs/10000,
@@ -229,15 +224,15 @@ dcerpcstat_init(const char *optarg, void* userdata _U_)
                        filter=NULL;
                }
        } else {
-               fprintf(stderr, "twireshark: invalid \"-z dcerpc,rtt,<uuid>,<major version>.<minor version>[,<filter>]\" argument\n");
+               fprintf(stderr, "tshark: invalid \"-z dcerpc,rtt,<uuid>,<major version>.<minor version>[,<filter>]\" argument\n");
                exit(1);
        }
        if (major < 0 || major > 65535) {
-               fprintf(stderr,"twireshark: dcerpcstat_init() Major version number %d is invalid - must be positive and <= 65535\n", major);
+               fprintf(stderr,"tshark: dcerpcstat_init() Major version number %d is invalid - must be positive and <= 65535\n", major);
                exit(1);
        }
        if (minor < 0 || minor > 65535) {
-               fprintf(stderr,"twireshark: dcerpcstat_init() Minor version number %d is invalid - must be positive and <= 65535\n", minor);
+               fprintf(stderr,"tshark: dcerpcstat_init() Minor version number %d is invalid - must be positive and <= 65535\n", minor);
                exit(1);
        }
        ver = major;
@@ -246,7 +241,7 @@ dcerpcstat_init(const char *optarg, void* userdata _U_)
        rs->prog=dcerpc_get_proto_name(&uuid, ver);
        if(!rs->prog){
                g_free(rs);
-               fprintf(stderr,"twireshark: dcerpcstat_init() Protocol with uuid:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x v%u not supported\n",uuid.Data1,uuid.Data2,uuid.Data3,uuid.Data4[0],uuid.Data4[1],uuid.Data4[2],uuid.Data4[3],uuid.Data4[4],uuid.Data4[5],uuid.Data4[6],uuid.Data4[7],ver);
+               fprintf(stderr,"tshark: dcerpcstat_init() Protocol with uuid:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x v%u not supported\n",uuid.Data1,uuid.Data2,uuid.Data3,uuid.Data4[0],uuid.Data4[1],uuid.Data4[2],uuid.Data4[3],uuid.Data4[4],uuid.Data4[5],uuid.Data4[6],uuid.Data4[7],ver);
                exit(1);
        }
        procs=dcerpc_get_proto_sub_dissector(&uuid, ver);
@@ -254,8 +249,7 @@ dcerpcstat_init(const char *optarg, void* userdata _U_)
        rs->ver=ver;
 
        if(filter){
-               rs->filter=g_malloc(strlen(filter)+1);
-               strcpy(rs->filter, filter);
+               rs->filter=g_strdup(filter);
        } else {
                rs->filter=NULL;
        }
@@ -284,14 +278,14 @@ dcerpcstat_init(const char *optarg, void* userdata _U_)
                rs->procedures[i].tot.nsecs=0;
        }
 
-       error_string=register_tap_listener("dcerpc", rs, filter, NULL, dcerpcstat_packet, dcerpcstat_draw);
+       error_string=register_tap_listener("dcerpc", rs, filter, 0, NULL, dcerpcstat_packet, dcerpcstat_draw);
        if(error_string){
                /* error, we failed to attach to the tap. clean up */
                g_free(rs->procedures);
                g_free(rs->filter);
                g_free(rs);
 
-               fprintf(stderr, "twireshark: Couldn't register dcerpc,rtt tap: %s\n",
+               fprintf(stderr, "tshark: Couldn't register dcerpc,rtt tap: %s\n",
                    error_string->str);
                g_string_free(error_string, TRUE);
                exit(1);