2002-12-08 02:32:36 +00:00
|
|
|
/* packet-ipfc.c
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
* Routines for Decoding Network_Header for IP-over-FC when we only
|
|
|
|
* capture the frame starting at the Network_Header (as opposed to
|
|
|
|
* when we have the full FC frame).
|
2003-01-21 05:21:03 +00:00
|
|
|
* See RFC 2625.
|
2002-12-08 02:32:36 +00:00
|
|
|
* Copyright 2001, Dinesh G Dutt <ddutt@cisco.com>
|
|
|
|
*
|
2004-07-18 00:24:25 +00:00
|
|
|
* $Id$
|
2002-12-08 02:32:36 +00:00
|
|
|
*
|
2006-05-21 04:49:01 +00:00
|
|
|
* Wireshark - Network traffic analyzer
|
|
|
|
* By Gerald Combs <gerald@wireshark.org>
|
2002-12-08 02:32:36 +00:00
|
|
|
* 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.
|
2011-01-16 18:37:56 +00:00
|
|
|
*
|
2002-12-08 02:32:36 +00:00
|
|
|
* 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.
|
2011-01-16 18:37:56 +00:00
|
|
|
*
|
2002-12-08 02:32:36 +00:00
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
2012-06-28 23:18:38 +00:00
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
2002-12-08 02:32:36 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include "config.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <glib.h>
|
|
|
|
|
|
|
|
#include <epan/packet.h>
|
2005-09-17 00:02:31 +00:00
|
|
|
#include <epan/etypes.h>
|
2006-04-21 11:08:24 +00:00
|
|
|
#include <epan/conversation.h>
|
2006-10-11 10:38:59 +00:00
|
|
|
#include "packet-scsi.h"
|
2002-12-08 02:32:36 +00:00
|
|
|
#include "packet-fc.h"
|
2002-12-08 22:35:30 +00:00
|
|
|
#include "packet-ipfc.h"
|
|
|
|
#include "packet-llc.h"
|
2002-12-08 02:32:36 +00:00
|
|
|
|
|
|
|
/* Initialize the protocol and registered fields */
|
|
|
|
static int proto_ipfc = -1;
|
|
|
|
static int hf_ipfc_network_da = -1;
|
|
|
|
static int hf_ipfc_network_sa = -1;
|
|
|
|
|
|
|
|
/* Initialize the subtree pointers */
|
|
|
|
static gint ett_ipfc = -1;
|
2002-12-08 22:01:20 +00:00
|
|
|
static dissector_handle_t llc_handle;
|
2002-12-08 02:32:36 +00:00
|
|
|
|
2002-12-08 22:35:30 +00:00
|
|
|
void
|
|
|
|
capture_ipfc (const guchar *pd, int len, packet_counts *ld)
|
|
|
|
{
|
|
|
|
if (!BYTES_ARE_IN_FRAME(0, len, 16)) {
|
|
|
|
ld->other++;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
capture_llc(pd, 16, len, ld);
|
|
|
|
}
|
|
|
|
|
2002-12-08 02:32:36 +00:00
|
|
|
static void
|
|
|
|
dissect_ipfc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
|
|
{
|
|
|
|
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
proto_item *ti;
|
|
|
|
proto_tree *ipfc_tree;
|
|
|
|
int offset = 0;
|
|
|
|
tvbuff_t *next_tvb;
|
|
|
|
|
|
|
|
/* Make entries in Protocol column and Info column on summary display */
|
2009-08-09 06:26:46 +00:00
|
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IP/FC");
|
2002-12-08 02:32:36 +00:00
|
|
|
|
|
|
|
if (tree) {
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
ti = proto_tree_add_protocol_format (tree, proto_ipfc, tvb, offset, 16,
|
|
|
|
"IP Over FC Network_Header");
|
2002-12-08 02:32:36 +00:00
|
|
|
ipfc_tree = proto_item_add_subtree (ti, ett_ipfc);
|
|
|
|
|
|
|
|
proto_tree_add_string (ipfc_tree, hf_ipfc_network_da, tvb, offset, 8,
|
2011-01-16 18:37:56 +00:00
|
|
|
tvb_fcwwn_to_str (tvb, offset));
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_string (ipfc_tree, hf_ipfc_network_sa, tvb, offset+8, 8,
|
2011-01-16 18:37:56 +00:00
|
|
|
tvb_fcwwn_to_str (tvb, offset+8));
|
2002-12-08 02:32:36 +00:00
|
|
|
}
|
|
|
|
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining (tvb, 16);
|
2002-12-08 22:01:20 +00:00
|
|
|
call_dissector(llc_handle, next_tvb, pinfo, tree);
|
2002-12-08 02:32:36 +00:00
|
|
|
}
|
|
|
|
|
2006-05-21 04:49:01 +00:00
|
|
|
/* Register the protocol with Wireshark */
|
2002-12-08 02:32:36 +00:00
|
|
|
|
|
|
|
/* this format is require because a script is used to build the C function
|
|
|
|
that calls all the protocol registration.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
|
|
|
proto_register_ipfc (void)
|
2011-01-16 18:37:56 +00:00
|
|
|
{
|
2002-12-08 02:32:36 +00:00
|
|
|
|
|
|
|
/* Setup list of header fields See Section 1.6.1 for details*/
|
|
|
|
static hf_register_info hf[] = {
|
|
|
|
{ &hf_ipfc_network_da,
|
From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero
svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
|
|
|
{"Network DA", "ipfc.nh.da", FT_STRING, BASE_NONE, NULL,
|
|
|
|
0x0, NULL, HFILL}},
|
2002-12-08 02:32:36 +00:00
|
|
|
{ &hf_ipfc_network_sa,
|
From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero
svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
|
|
|
{"Network SA", "ipfc.nh.sa", FT_STRING, BASE_NONE, NULL,
|
|
|
|
0x0, NULL, HFILL}},
|
2002-12-08 02:32:36 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Setup protocol subtree array */
|
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_ipfc,
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Register the protocol name and description */
|
|
|
|
proto_ipfc = proto_register_protocol("IP Over FC", "IPFC", "ipfc");
|
|
|
|
|
|
|
|
/* Required function calls to register the header fields and subtrees used */
|
|
|
|
proto_register_field_array(proto_ipfc, hf, array_length(hf));
|
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If this dissector uses sub-dissector registration add a registration routine.
|
|
|
|
This format is required because a script is used to find these routines and
|
|
|
|
create the code that calls these routines.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
proto_reg_handoff_ipfc (void)
|
|
|
|
{
|
|
|
|
dissector_handle_t ipfc_handle;
|
|
|
|
|
|
|
|
ipfc_handle = create_dissector_handle (dissect_ipfc, proto_ipfc);
|
2010-12-20 05:35:29 +00:00
|
|
|
dissector_add_uint("wtap_encap", WTAP_ENCAP_IP_OVER_FC, ipfc_handle);
|
2002-12-08 02:32:36 +00:00
|
|
|
|
2002-12-08 22:01:20 +00:00
|
|
|
llc_handle = find_dissector ("llc");
|
2002-12-08 02:32:36 +00:00
|
|
|
}
|