*
* $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
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/* This module provides rpc call/reply SRT statistics to tethereal.
- * It is only used by tethereal and not ethereal
+/* This module provides rpc call/reply SRT statistics to tshark.
+ * It is only used by tshark and not wireshark
*/
#ifdef HAVE_CONFIG_H
/* we are only interested in reply packets */
- if(ri->request){
+ if(ri->request || !rp){
return 0;
}
static void
rpcprogs_draw(void *dummy _U_)
{
-#ifdef G_HAVE_UINT64
guint64 td;
-#else
- guint32 td;
-#endif
rpc_program_t *rp;
char str[64];
printf("Program Version Calls Min SRT Max SRT Avg SRT\n");
for(rp=prog_list;rp;rp=rp->next){
/* scale it to units of 10us.*/
- /* for long captures with a large tot time, this can overflow on 32bit */
- td=(int)rp->tot.secs;
+ td=rp->tot.secs;
td=td*100000+(int)rp->tot.nsecs/10000;
if(rp->num){
td/=rp->num;
}
g_snprintf(str, sizeof(str), "%s(%d)",rpc_prog_name(rp->program),rp->program);
- printf("%-15s %2d %6d %3d.%05d %3d.%05d %3d.%05d\n",
+ printf("%-15s %2d %6d %3d.%05d %3d.%05d %3" G_GINT64_MODIFIER "u.%05" G_GINT64_MODIFIER "u\n",
str,
rp->version,
rp->num,
static void
-rpcprogs_init(const char *optarg _U_)
+rpcprogs_init(const char *optarg _U_, void* userdata _U_)
{
GString *error_string;
}
already_enabled=1;
- error_string=register_tap_listener("rpc", NULL, NULL, NULL, rpcprogs_packet, rpcprogs_draw);
+ error_string=register_tap_listener("rpc", NULL, NULL, 0, NULL, rpcprogs_packet, rpcprogs_draw);
if(error_string){
- fprintf(stderr,"tethereal: Couldn't register rpc,programs tap: %s\n",
+ fprintf(stderr,"tshark: Couldn't register rpc,programs tap: %s\n",
error_string->str);
g_string_free(error_string, TRUE);
exit(1);
void
register_tap_listener_rpcprogs(void)
{
- register_stat_cmd_arg("rpc,programs", rpcprogs_init);
+ register_stat_cmd_arg("rpc,programs", rpcprogs_init, NULL);
}