aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/to_str.c8
-rw-r--r--epan/to_str.h5
-rw-r--r--gtk/Makefile.am3
-rw-r--r--gtk/Makefile.nmake3
-rw-r--r--gtk/endpoint_talkers_fc.c191
-rw-r--r--packet-fc.c34
-rw-r--r--packet-fc.h10
7 files changed, 223 insertions, 31 deletions
diff --git a/epan/to_str.c b/epan/to_str.c
index 215a1c757a..da56c45a93 100644
--- a/epan/to_str.c
+++ b/epan/to_str.c
@@ -1,7 +1,7 @@
/* to_str.c
* Routines for utilities to convert various other types to strings.
*
- * $Id: to_str.c,v 1.28 2003/06/26 08:47:31 guy Exp $
+ * $Id: to_str.c,v 1.29 2003/08/23 13:35:06 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -582,10 +582,8 @@ fc_to_str(const guint8 *ad)
return bytestring_to_str (ad, 3, '.');
}
-/* convert the fc id stored in the three high order bytes of a guint32 into a
- fc id string*/
gchar *
-fc32_to_str(guint32 ad32)
+fc32_to_str(address *addr)
{
static gchar *cur;
static gchar str[3][9];
@@ -598,7 +596,7 @@ fc32_to_str(guint32 ad32)
cur = &str[0][0];
}
- sprintf(cur,"%02x.%02x.%02x", ad32&0xff, (ad32>>8)&0xff, (ad32>>16)&0xff);
+ sprintf(cur,"%02x.%02x.%02x", addr->data[0], addr->data[1], addr->data[2]);
return cur;
}
diff --git a/epan/to_str.h b/epan/to_str.h
index 5bb2150ac9..8a0b9d1117 100644
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -1,7 +1,7 @@
/* to_str.h
* Definitions for utilities to convert various other types to strings.
*
- * $Id: to_str.h,v 1.15 2003/06/23 09:15:08 sahlberg Exp $
+ * $Id: to_str.h,v 1.16 2003/08/23 13:35:06 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -28,6 +28,7 @@
#include <glib.h>
#include "nstime.h"
+#include "epan/packet_info.h"
/*
* Resolution of a time stamp.
@@ -49,7 +50,7 @@ extern gchar* ether_to_str(const guint8 *);
extern gchar* ip_to_str(const guint8 *);
extern void ip_to_str_buf(const guint8 *, gchar *);
extern gchar* fc_to_str(const guint8 *);
-extern gchar* fc32_to_str(guint32);
+extern gchar* fc32_to_str(address *);
extern gchar* fcwwn_to_str (const guint8 *);
extern char* ip6_to_str(const struct e_in6_addr *);
extern gchar* ipx_addr_to_str(guint32, const guint8 *);
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index f5112f7dc6..a29d4fd8fa 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for the GTK interface routines for Ethereal
#
-# $Id: Makefile.am,v 1.62 2003/08/23 09:09:35 sahlberg Exp $
+# $Id: Makefile.am,v 1.63 2003/08/23 13:35:06 sahlberg Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@@ -30,6 +30,7 @@ CLEANFILES = \
ETHEREAL_TAP_SRC = \
dcerpc_stat.c \
endpoint_talkers_eth.c \
+ endpoint_talkers_fc.c \
endpoint_talkers_ip.c \
endpoint_talkers_tcpip.c \
endpoint_talkers_tr.c \
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 6d2c38ad3b..187fee77ea 100644
--- a/gtk/Makefile.nmake
+++ b/gtk/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.47 2003/08/23 09:09:35 sahlberg Exp $
+# $Id: Makefile.nmake,v 1.48 2003/08/23 13:35:06 sahlberg Exp $
include ..\config.nmake
@@ -22,6 +22,7 @@ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
ETHEREAL_TAP_SRC = \
dcerpc_stat.c \
endpoint_talkers_eth.c \
+ endpoint_talkers_fc.c \
endpoint_talkers_ip.c \
endpoint_talkers_tcpip.c \
endpoint_talkers_tr.c \
diff --git a/gtk/endpoint_talkers_fc.c b/gtk/endpoint_talkers_fc.c
new file mode 100644
index 0000000000..01e743b225
--- /dev/null
+++ b/gtk/endpoint_talkers_fc.c
@@ -0,0 +1,191 @@
+/* endpoint_talkers_fc.c
+ * endpoint_talkers_fc 2003 Ronnie Sahlberg
+ *
+ * $Id: endpoint_talkers_fc.c,v 1.1 2003/08/23 13:35:06 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 <gtk/gtk.h>
+#include <string.h>
+#include "menu.h"
+#include "../epan/packet_info.h"
+#include "../tap.h"
+#include "../register.h"
+#include "compat_macros.h"
+#include "../simple_dialog.h"
+#include "../file.h"
+#include "../globals.h"
+#include "endpoint_talkers_table.h"
+#include "packet-fc.h"
+
+/* used to keep track of the statistics for one instance of the stats */
+typedef struct _fc_talkers_t {
+ GtkWidget *win;
+ endpoints_table talkers;
+} fc_talkers_t;
+
+
+void protect_thread_critical_region(void);
+void unprotect_thread_critical_region(void);
+static void
+win_destroy_cb(GtkWindow *win _U_, gpointer data)
+{
+ fc_talkers_t *fc_talkers=(fc_talkers_t *)data;
+
+ protect_thread_critical_region();
+ remove_tap_listener(fc_talkers);
+ unprotect_thread_critical_region();
+
+ reset_ett_table_data(&fc_talkers->talkers);
+ g_free(fc_talkers);
+}
+
+
+static char *
+fc_address_to_str(address *addr)
+{
+ static int i=0;
+ static char *strp, str[4][9];
+
+ i++;
+ if(i>=4){
+ i=0;
+ }
+ strp=str[i];
+
+ sprintf(strp, "%02x.%02x.%02x", addr->data[0], addr->data[1], addr->data[2]);
+
+ return strp;
+}
+
+static void
+fc_talkers_reset(void *pit)
+{
+ fc_talkers_t *fc_talkers=(fc_talkers_t *)pit;
+
+ reset_ett_table_data(&fc_talkers->talkers);
+}
+
+
+static void
+fc_talkers_draw(void *pit)
+{
+ fc_talkers_t *fc_talkers=(fc_talkers_t *)pit;
+
+ draw_ett_table_data(&fc_talkers->talkers);
+}
+
+
+static int
+fc_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
+{
+ fc_talkers_t *fc_talkers=(fc_talkers_t *)pit;
+ fc_hdr *fchdr=vip;
+
+ add_ett_table_data(&fc_talkers->talkers, &fchdr->s_id, &fchdr->d_id, 0, 0, 1, pinfo->fd->pkt_len);
+
+ return 1;
+}
+
+
+
+static void
+gtk_fc_talkers_init(char *optarg)
+{
+ char *filter=NULL;
+ fc_talkers_t *fc_talkers;
+ GtkWidget *vbox;
+ GtkWidget *label;
+ GString *error_string;
+
+
+ if(!strncmp(optarg,"talkers,fc,",11)){
+ filter=optarg+11;
+ } else {
+ filter=NULL;
+ }
+
+ fc_talkers=g_malloc(sizeof(fc_talkers_t));
+
+ fc_talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_default_size(GTK_WINDOW(fc_talkers->win), 750, 400);
+ gtk_window_set_title(GTK_WINDOW(fc_talkers->win), "Fibre Channel Talkers");
+
+ SIGNAL_CONNECT(fc_talkers->win, "destroy", win_destroy_cb, fc_talkers);
+
+ vbox=gtk_vbox_new(FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(fc_talkers->win), vbox);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
+ gtk_widget_show(vbox);
+
+ label=gtk_label_new("Fibre Channel Talkers");
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+ gtk_widget_show(label);
+
+ /* We must display TOP LEVEL Widget before calling init_ett_table() */
+ gtk_widget_show(fc_talkers->win);
+
+ init_ett_table(&fc_talkers->talkers, vbox, fc_address_to_str, NULL);
+
+ error_string=register_tap_listener("fc", fc_talkers, filter, fc_talkers_reset, fc_talkers_packet, fc_talkers_draw);
+ if(error_string){
+ simple_dialog(ESD_TYPE_WARN, NULL, error_string->str);
+ g_string_free(error_string, TRUE);
+ g_free(fc_talkers);
+ return;
+ }
+
+ gtk_widget_show_all(fc_talkers->win);
+ redissect_packets(&cfile);
+}
+
+
+static void
+gtk_fc_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+ gtk_fc_talkers_init("talkers,fc");
+}
+
+
+void
+register_tap_menu_fc_talkers(void)
+{
+ register_tap_menu_item("Endpoint Talkers/Fibre Channel", gtk_fc_endpoints_cb);
+}
+
+
+
+
+void
+register_tap_listener_fc_talkers(void)
+{
+ register_ethereal_tap("talkers,fc", gtk_fc_talkers_init);
+}
+
diff --git a/packet-fc.c b/packet-fc.c
index 3fa56dcd82..30c7feb460 100644
--- a/packet-fc.c
+++ b/packet-fc.c
@@ -4,7 +4,7 @@
* Copyright 2003 Ronnie Sahlberg, exchange first/last matching and
* tap listener and misc updates
*
- * $Id: packet-fc.c,v 1.12 2003/07/09 06:23:19 guy Exp $
+ * $Id: packet-fc.c,v 1.13 2003/08/23 13:35:05 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -165,10 +165,10 @@ fc_exchange_equal_unmatched(gconstpointer v1, gconstpointer v2)
}
/* compare s_id, d_id and treat the fc address
s_id==00.00.00 as a wildcard matching anything */
- if( (fced1->s_id!=0) && (fced1->s_id!=fced2->s_id) ){
+ if( ((fced1->s_id.data[0]!=0)||(fced1->s_id.data[1]!=0)||(fced1->s_id.data[2]!=0)) && CMP_ADDRESS(&fced1->s_id, &fced2->s_id) ){
return 0;
}
- if(fced1->d_id!=fced2->d_id){
+ if(CMP_ADDRESS(&fced1->d_id, &fced2->d_id)){
return 0;
}
@@ -733,8 +733,10 @@ dissect_fc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
fchdr.r_ctl = tvb_get_guint8 (tvb, offset);
}
- fchdr.d_id=tvb_get_letoh24(tvb, offset+1);
- fchdr.s_id=tvb_get_letoh24(tvb, offset+5);
+ SET_ADDRESS (&pinfo->dst, AT_FC, 3, tvb_get_ptr(tvb,offset+1,3));
+ SET_ADDRESS (&fchdr.d_id, AT_FC, 3, tvb_get_ptr(tvb,offset+1,3));
+ SET_ADDRESS (&pinfo->src, AT_FC, 3, tvb_get_ptr(tvb,offset+5,3));
+ SET_ADDRESS (&fchdr.s_id, AT_FC, 3, tvb_get_ptr(tvb,offset+5,3));
fchdr.cs_ctl = tvb_get_guint8 (tvb, offset+4);
fchdr.type = tvb_get_guint8 (tvb, offset+8);
fchdr.fctl=tvb_get_ntoh24(tvb,offset+9);
@@ -743,8 +745,6 @@ dissect_fc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
fchdr.rxid=tvb_get_ntohs(tvb,offset+18);
param = tvb_get_ntohl (tvb, offset+20);
- SET_ADDRESS (&pinfo->dst, AT_FC, 3, tvb_get_ptr(tvb,offset+1,3));
- SET_ADDRESS (&pinfo->src, AT_FC, 3, tvb_get_ptr(tvb,offset+5,3));
pinfo->oxid = fchdr.oxid;
pinfo->rxid = fchdr.rxid;
pinfo->ptype = PT_EXCHG;
@@ -780,16 +780,16 @@ dissect_fc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
is still open/unmatched.
*/
fced.oxid=fchdr.oxid;
- fced.s_id=fchdr.s_id;
- fced.d_id=fchdr.d_id;
+ SET_ADDRESS(&fced.s_id, fchdr.s_id.type, fchdr.s_id.len, fchdr.s_id.data);
+ SET_ADDRESS(&fced.d_id, fchdr.d_id.type, fchdr.d_id.len, fchdr.d_id.data);
old_fced=g_hash_table_lookup(fc_exchange_unmatched, &fced);
if(old_fced){
g_hash_table_remove(fc_exchange_unmatched, old_fced);
}
old_fced=g_mem_chunk_alloc(fc_exchange_vals);
old_fced->oxid=fchdr.oxid;
- old_fced->s_id=fchdr.s_id;
- old_fced->d_id=fchdr.d_id;
+ COPY_ADDRESS(&old_fced->s_id, &fchdr.s_id);
+ COPY_ADDRESS(&old_fced->d_id, &fchdr.d_id);
old_fced->first_exchange_frame=pinfo->fd->num;
old_fced->fc_time.nsecs = pinfo->fd->abs_usecs*1000;
old_fced->fc_time.secs = pinfo->fd->abs_secs;
@@ -809,8 +809,8 @@ dissect_fc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
fc_exchange_data fced, *old_fced;
fced.oxid=fchdr.oxid;
- fced.s_id=fchdr.d_id;
- fced.d_id=fchdr.s_id;
+ SET_ADDRESS(&fced.s_id, fchdr.d_id.type, fchdr.d_id.len, fchdr.d_id.data);
+ SET_ADDRESS(&fced.d_id, fchdr.s_id.type, fchdr.s_id.len, fchdr.s_id.data);
old_fced=g_hash_table_lookup(fc_exchange_unmatched, &fced);
if(old_fced){
g_hash_table_remove(fc_exchange_unmatched, old_fced);
@@ -943,17 +943,17 @@ dissect_fc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* XXX - use "fc_wka_vals[]" on this? */
proto_tree_add_string (fc_tree, hf_fc_did, tvb, offset+1, 3,
- fc32_to_str (fchdr.d_id));
+ fc32_to_str (&fchdr.d_id));
proto_tree_add_string_hidden (fc_tree, hf_fc_id, tvb, offset+1, 3,
- fc32_to_str (fchdr.d_id));
+ fc32_to_str (&fchdr.d_id));
proto_tree_add_uint (fc_tree, hf_fc_csctl, tvb, offset+4, 1, fchdr.cs_ctl);
/* XXX - use "fc_wka_vals[]" on this? */
proto_tree_add_string (fc_tree, hf_fc_sid, tvb, offset+5, 3,
- fc32_to_str (fchdr.s_id));
+ fc32_to_str (&fchdr.s_id));
proto_tree_add_string_hidden (fc_tree, hf_fc_id, tvb, offset+5, 3,
- fc32_to_str (fchdr.s_id));
+ fc32_to_str (&fchdr.s_id));
if (ftype == FC_FTYPE_LINKCTL) {
if (((fchdr.r_ctl & 0x0F) == FC_LCTL_FBSYB) ||
diff --git a/packet-fc.h b/packet-fc.h
index 9088685f37..f4d97c814b 100644
--- a/packet-fc.h
+++ b/packet-fc.h
@@ -2,7 +2,7 @@
* Basic Fibre Channel Header definitions
* Copyright 2002 Dinesh G Dutt (ddutt@cisco.com)
*
- * $Id: packet-fc.h,v 1.3 2003/06/25 10:21:44 sahlberg Exp $
+ * $Id: packet-fc.h,v 1.4 2003/08/23 13:35:05 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -118,8 +118,8 @@ extern const value_string fc_fc4_val[];
frames and time deltas
*/
typedef struct _fc_exchange_data {
- guint32 s_id;
- guint32 d_id;
+ address s_id;
+ address d_id;
guint16 oxid;
guint32 first_exchange_frame;
guint32 last_exchange_frame;
@@ -128,8 +128,8 @@ typedef struct _fc_exchange_data {
/* FC header structure */
typedef struct _fc_hdr {
- guint32 s_id;
- guint32 d_id;
+ address s_id;
+ address d_id;
guint32 fctl;
guint8 type;
guint16 seqcnt;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 02:22:32 +0000