aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>2003-01-22 01:24:06 +0000
committersahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>2003-01-22 01:24:06 +0000
commit70a92ad0a829ab13ae146fb026178ff16539c62d (patch)
treeb428afbb3d3e6e69e44df778e8d85b176938d174
parent3edc4abbf05da7837c8ad858ccafc9c96dd97eba (diff)
TopTalkers feature for Ethernet/IP/TokenRing
IO-Users is a feature for tethereal that will print statistics on io usage similar to top talkers in other tools. It needs to be ported to ethereal with a nice graph sometime later. try: -z io,users,ip see man-page git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6972 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--Makefile.am3
-rw-r--r--Makefile.nmake3
-rw-r--r--doc/tethereal.pod.template18
-rw-r--r--tap-iousers.c321
4 files changed, 343 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 47404e3965..b760c56563 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
-# $Id: Makefile.am,v 1.543 2003/01/22 00:40:30 sahlberg Exp $
+# $Id: Makefile.am,v 1.544 2003/01/22 01:24:04 sahlberg Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@@ -814,6 +814,7 @@ ethereal_static_LDFLAGS = -Wl,-static
TETHEREAL_TAP_SRC = \
tap-dcerpcstat.c \
tap-iostat.c \
+ tap-iousers.c \
tap-protocolinfo.c \
tap-protohierstat.c \
tap-rpcstat.c \
diff --git a/Makefile.nmake b/Makefile.nmake
index 91ce4e728f..7e0774d6ff 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
-# $Id: Makefile.nmake,v 1.272 2003/01/22 00:40:30 sahlberg Exp $
+# $Id: Makefile.nmake,v 1.273 2003/01/22 01:24:04 sahlberg Exp $
include config.nmake
include <win32.mak>
@@ -347,6 +347,7 @@ DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
TETHEREAL_TAP_SRC = \
tap-dcerpcstat.c \
tap-iostat.c \
+ tap-iousers.c \
tap-protocolinfo.c \
tap-protohierstat.c \
tap-rpcstat.c \
diff --git a/doc/tethereal.pod.template b/doc/tethereal.pod.template
index eda93748ec..f09c4b0d88 100644
--- a/doc/tethereal.pod.template
+++ b/doc/tethereal.pod.template
@@ -356,6 +356,24 @@ all filters and presented with one column of statistics for each filter.
This option can be used multiple times on the command line.
+B<-z> io,users,I<type>[,I<filter>]
+
+Create a table that lists all conversations that could be seen in the capture.
+I<type> specifies which type of conversation we want to generate the
+statistics for, currently the supported ones are
+ "eth" Ethernet
+ "ip" IP addresses
+ "tr" TokenRing
+
+If the optional filter string is specified, only those packets that match the
+filter will be used in the calculations.
+
+The table is presented with one line for each conversation and displays
+number of frames/bytes in each direction as well as total number of
+frames/bytes.
+The table is sorted according to total number of bytes.
+
+
B<-z> proto,colinfo,I<filter>,I<field>
Append all I<field> values for the packet to the COL_INFO information line.
diff --git a/tap-iousers.c b/tap-iousers.c
new file mode 100644
index 0000000000..85d4bfccf4
--- /dev/null
+++ b/tap-iousers.c
@@ -0,0 +1,321 @@
+/* tap-iousers.c
+ * iostat 2003 Ronnie Sahlberg
+ *
+ * $Id: tap-iousers.c,v 1.1 2003/01/22 01:24:04 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#include <string.h>
+#include "epan/packet_info.h"
+#include "epan/packet.h"
+#include "tap.h"
+#include "register.h"
+#include "packet-ip.h"
+#include "packet-eth.h"
+#include "packet-tr.h"
+#include <string.h>
+
+typedef struct _io_users_t {
+ char *type;
+ char *filter;
+ struct _io_users_item_t *items;
+} io_users_t;
+
+typedef struct _io_users_item_t {
+ struct _io_users_item_t *next;
+ char *name1;
+ char *name2;
+ void *addr1;
+ void *addr2;
+ guint32 frames1;
+ guint32 frames2;
+ guint32 bytes1;
+ guint32 bytes2;
+} io_users_item_t;
+
+static int
+iousers_ip_packet(io_users_t *iu, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
+{
+ e_ip *iph=vip;
+ guint32 addr1, addr2;
+ io_users_item_t *iui;
+
+ if(iph->ip_src>iph->ip_dst){
+ addr1=iph->ip_src;
+ addr2=iph->ip_dst;
+ } else {
+ addr2=iph->ip_src;
+ addr1=iph->ip_dst;
+ }
+
+ for(iui=iu->items;iui;iui=iui->next){
+ if((!memcmp(iui->addr1, &addr1, 4))
+ &&(!memcmp(iui->addr2, &addr2, 4)) ){
+ break;
+ }
+ }
+
+ if(!iui){
+ iui=g_malloc(sizeof(io_users_item_t));
+ iui->next=iu->items;
+ iu->items=iui;
+ iui->addr1=g_malloc(4);
+ memcpy(iui->addr1, &addr1, 4);
+ iui->name1=strdup(get_hostname(addr1));
+ iui->addr2=g_malloc(4);
+ memcpy(iui->addr2, &addr2, 4);
+ iui->name2=strdup(get_hostname(addr2));
+ iui->frames1=0;
+ iui->frames2=0;
+ iui->bytes1=0;
+ iui->bytes2=0;
+ }
+
+ if(!memcmp(&iph->ip_src,iui->addr1,4)){
+ iui->frames1++;
+ iui->bytes1+=pinfo->fd->pkt_len;
+ } else {
+ iui->frames2++;
+ iui->bytes2+=pinfo->fd->pkt_len;
+ }
+
+ return 1;
+}
+
+static int
+iousers_eth_packet(io_users_t *iu, packet_info *pinfo, epan_dissect_t *edt _U_, void *veth)
+{
+ eth_hdr *ehdr=veth;
+ gchar *addr1, *addr2;
+ io_users_item_t *iui;
+
+ if(memcmp(ehdr->src, ehdr->dst, 6)<0){
+ addr1=ehdr->src;
+ addr2=ehdr->dst;
+ } else {
+ addr2=ehdr->src;
+ addr1=ehdr->dst;
+ }
+
+ for(iui=iu->items;iui;iui=iui->next){
+ if((!memcmp(iui->addr1, addr1, 6))
+ &&(!memcmp(iui->addr2, addr2, 6)) ){
+ break;
+ }
+ }
+
+ if(!iui){
+ iui=g_malloc(sizeof(io_users_item_t));
+ iui->next=iu->items;
+ iu->items=iui;
+ iui->addr1=g_malloc(6);
+ memcpy(iui->addr1, addr1, 6);
+ iui->name1=strdup(ether_to_str(addr1));
+ iui->addr2=g_malloc(6);
+ memcpy(iui->addr2, addr2, 6);
+ iui->name2=strdup(ether_to_str(addr2));
+ iui->frames1=0;
+ iui->frames2=0;
+ iui->bytes1=0;
+ iui->bytes2=0;
+ }
+
+ if(!memcmp(ehdr->dst,iui->addr1,6)){
+ iui->frames1++;
+ iui->bytes1+=pinfo->fd->pkt_len;
+ } else {
+ iui->frames2++;
+ iui->bytes2+=pinfo->fd->pkt_len;
+ }
+
+ return 1;
+}
+
+
+static int
+iousers_tr_packet(io_users_t *iu, packet_info *pinfo, epan_dissect_t *edt _U_, void *vtr)
+{
+ tr_hdr *trhdr=vtr;
+ gchar *addr1, *addr2;
+ io_users_item_t *iui;
+
+ if(memcmp(trhdr->src, trhdr->dst, 6)<0){
+ addr1=trhdr->src;
+ addr2=trhdr->dst;
+ } else {
+ addr2=trhdr->src;
+ addr1=trhdr->dst;
+ }
+
+ for(iui=iu->items;iui;iui=iui->next){
+ if((!memcmp(iui->addr1, addr1, 6))
+ &&(!memcmp(iui->addr2, addr2, 6)) ){
+ break;
+ }
+ }
+
+ if(!iui){
+ iui=g_malloc(sizeof(io_users_item_t));
+ iui->next=iu->items;
+ iu->items=iui;
+ iui->addr1=g_malloc(6);
+ memcpy(iui->addr1, addr1, 6);
+ iui->name1=strdup(ether_to_str(addr1));
+ iui->addr2=g_malloc(6);
+ memcpy(iui->addr2, addr2, 6);
+ iui->name2=strdup(ether_to_str(addr2));
+ iui->frames1=0;
+ iui->frames2=0;
+ iui->bytes1=0;
+ iui->bytes2=0;
+ }
+
+ if(!memcmp(trhdr->dst,iui->addr1,6)){
+ iui->frames1++;
+ iui->bytes1+=pinfo->fd->pkt_len;
+ } else {
+ iui->frames2++;
+ iui->bytes2+=pinfo->fd->pkt_len;
+ }
+
+ return 1;
+}
+
+static void
+iousers_draw(io_users_t *iu)
+{
+ io_users_item_t *iui;
+ guint32 last_frames, max_frames;
+
+ printf("================================================================================\n");
+ printf("IO-USERS Statistics\n");
+ printf("Type:%s\n",iu->type);
+ printf("Filter:%s\n",iu->filter?iu->filter:"<No Filter>");
+ printf(" | <- | | -> | | Total |\n");
+ printf(" | Frames Bytes | | Frames Bytes | | Frames Bytes |\n");
+ max_frames=0xffffffff;
+ do {
+ last_frames=0;
+ for(iui=iu->items;iui;iui=iui->next){
+ guint32 tot_frames;
+ tot_frames=iui->frames1+iui->frames2;
+
+ if((tot_frames>last_frames)
+ &&(tot_frames<max_frames)){
+ last_frames=tot_frames;
+ }
+ }
+ for(iui=iu->items;iui;iui=iui->next){
+ guint32 tot_frames;
+ tot_frames=iui->frames1+iui->frames2;
+
+ if(tot_frames==last_frames){
+ printf("%-20s <-> %-20s %6d %9d %6d %9d %6d %9d\n",
+ iui->name1, iui->name2,
+ iui->frames1, iui->bytes1,
+ iui->frames2, iui->bytes2,
+ iui->frames1+iui->frames2,
+ iui->bytes1+iui->bytes2
+ );
+ }
+ }
+ max_frames=last_frames;
+ } while(last_frames);
+ printf("================================================================================\n");
+}
+
+void
+iousers_init(char *optarg)
+{
+ char *filter=NULL;
+ char *tap_type;
+ static int (*packet_func)(io_users_t *, packet_info *, epan_dissect_t *, void *);
+ io_users_t *iu=NULL;
+
+ if(!strncmp(optarg,"io,users,eth",12)){
+ if(optarg[12]==','){
+ filter=optarg+13;
+ } else {
+ filter=NULL;
+ }
+ tap_type="eth";
+ packet_func=iousers_eth_packet;
+ } else if(!strncmp(optarg,"io,users,tr",11)){
+ if(optarg[11]==','){
+ filter=optarg+12;
+ } else {
+ filter=NULL;
+ }
+ tap_type="tr";
+ packet_func=iousers_tr_packet;
+ } else if(!strncmp(optarg,"io,users,ip",11)){
+ if(optarg[11]==','){
+ filter=optarg+12;
+ } else {
+ filter=NULL;
+ }
+ tap_type="ip";
+ packet_func=iousers_ip_packet;
+ } else {
+ fprintf(stderr, "tethereal: invalid \"-z io,users,<type>[,<filter>]\" argument\n");
+ fprintf(stderr," <type> must be one of\n");
+ fprintf(stderr," \"eth\"\n");
+ fprintf(stderr," \"ip\"\n");
+ fprintf(stderr," \"tr\"\n");
+ exit(1);
+ }
+
+
+ iu=g_malloc(sizeof(io_users_t));
+ iu->items=NULL;
+ iu->type=tap_type;
+ if(filter){
+ iu->filter=strdup(filter);
+ } else {
+ iu->filter=NULL;
+ }
+
+ if(register_tap_listener(tap_type, iu, filter, NULL, (void*)packet_func, (void*)iousers_draw)){
+ if(iu->items){
+ g_free(iu->items);
+ }
+ g_free(iu);
+ fprintf(stderr,"tethereal: iousers_init() failed to attach tap\n");
+ exit(1);
+ }
+
+}
+
+void
+register_tap_listener_iousers(void)
+{
+ register_ethereal_tap("io,users,", iousers_init, NULL, NULL);
+}
+