*
* $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
* 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.
*/
-/* This module provides ProtocolHierarchyStatistics for tethereal */
+/* This module provides ProtocolHierarchyStatistics for tshark */
#ifdef HAVE_CONFIG_H
# include "config.h"
#include "epan/epan_dissect.h"
#include "epan/proto.h"
#include <epan/tap.h>
-#include <epan/stat.h>
+#include <epan/stat_cmd_args.h>
#include "register.h"
typedef struct _phs_t {
int protocol;
const char *proto_name;
guint32 frames;
- guint32 bytes;
+ guint64 bytes;
} phs_t;
static void
phs_draw(phs_t *rs, int indentation)
{
- int i;
- char str[80];
+ int i, stroff;
+#define MAXPHSLINE 80
+ char str[MAXPHSLINE];
for(;rs;rs=rs->sibling){
if(rs->protocol==-1){
return;
}
str[0]=0;
+ stroff=0;
for(i=0;i<indentation;i++){
- strcat(str," ");
+ if(i>15){
+ stroff+=g_snprintf(str+stroff, MAXPHSLINE-stroff, "...");
+ break;
+ }
+ stroff+=g_snprintf(str+stroff, MAXPHSLINE-stroff, " ");
}
- strcat(str, rs->proto_name);
- printf("%-40s frames:%d bytes:%d\n",str, rs->frames, rs->bytes);
+ stroff+=g_snprintf(str+stroff, MAXPHSLINE-stroff, rs->proto_name);
+ printf("%-40s frames:%d bytes:%" G_GINT64_MODIFIER "d\n",str, rs->frames, rs->bytes);
phs_draw(rs->child, indentation+1);
}
}
static void
-protohierstat_init(const char *optarg)
+protohierstat_init(const char *optarg, void* userdata _U_)
{
phs_t *rs;
int pos=0;
will be populated. "frame" matches everything so
that one is used instead of no filter.
*/
- filter="frame";
+ filter="frame";
}
} else {
- fprintf(stderr, "tethereal: invalid \"-z io,phs[,<filter>]\" argument\n");
+ fprintf(stderr, "tshark: invalid \"-z io,phs[,<filter>]\" argument\n");
exit(1);
}
rs=new_phs_t(NULL);
if(filter){
- rs->filter=g_malloc(strlen(filter)+1);
- strcpy(rs->filter, filter);
+ rs->filter=g_strdup(filter);
} else {
rs->filter=NULL;
}
g_free(rs->filter);
g_free(rs);
- fprintf(stderr, "tethereal: Couldn't register io,phs tap: %s\n",
+ fprintf(stderr, "tshark: Couldn't register io,phs tap: %s\n",
error_string->str);
g_string_free(error_string, TRUE);
exit(1);
void
register_tap_listener_protohierstat(void)
{
- register_stat_cmd_arg("io,phs", protohierstat_init);
+ register_stat_cmd_arg("io,phs", protohierstat_init, NULL);
}