kern/74861: Support to ISL VLANS?
Josef Karthauser
joe at tao.org.uk
Wed Dec 8 10:30:33 PST 2004
>Number: 74861
>Category: kern
>Synopsis: Support to ISL VLANS?
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 08 18:30:32 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Josef Karthauser
>Release: FreeBSD 5.3-STABLE i386
>Organization:
Tao Research
>Environment:
System: FreeBSD genius.pact.cpes.susx.ac.uk 5.3-STABLE FreeBSD 5.3-STABLE #0: Sat Dec 4 01:02:49 GMT 2004 joe at genius2.tao.org.uk:/usr/obj/usr/src/sys/GENERIC i386
>Description:
A long time ago I asked Joe Marcus <marcus at miami.edu> about the
possibility of adding ISL vlan support to FreeBSD. It's
probably not needed now-a-days due to 802.1q becoming
standardised, etc, but instead of throwing the email/code away
I thought that I'd put it in a PR and let someone else throw it
away! :)
>How-To-Repeat:
>Fix:
Here's the code/email:
Date: Sun, 17 Dec 2000 12:28:51 -0500 (EST)
From: Joe Marcus Clarke <marcus at miami.edu>
Subject: Re: ISL
To: Josef Karthauser <joe at tao.org.uk>
I've found a spec that made it out into the Open Source community. The
ethereal packet analyzer decodes ISL, and it works quite well. Attached
is the packet-isl.c file that handles decoding of ISL packets. At the
bottom, in the register_isl() function, it breaks out the different fields
into byte sizes, and specifies the various values for enumerated
fields. Let me know if this helps you.
Joe
The code:
/* packet-isl.c
* Routines for Cisco ISL Ethernet header disassembly
*
* $Id: packet-isl.c,v 1.17 2000/11/19 08:53:58 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald at zing.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.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#include <glib.h>
#include "packet.h"
#include "packet-eth.h"
#include "packet-tr.h"
#include "etypes.h"
/*
* See
*
* http://www.cisco.com/warp/public/741/4.html
*
* and
*
* http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm
*
* for information on ISL.
*/
static int proto_isl = -1;
static int hf_isl_dst = -1;
static int hf_isl_type = -1;
static int hf_isl_user_eth = -1;
static int hf_isl_user = -1;
static int hf_isl_src = -1;
static int hf_isl_addr = -1;
static int hf_isl_len = -1;
static int hf_isl_hsa = -1;
static int hf_isl_vlan_id = -1;
static int hf_isl_bpdu = -1;
static int hf_isl_index = -1;
static int hf_isl_crc = -1;
static int hf_isl_src_vlan_id = -1;
static int hf_isl_explorer = -1;
static int hf_isl_dst_route_descriptor = -1;
static int hf_isl_src_route_descriptor = -1;
static int hf_isl_fcs_not_incl = -1;
static int hf_isl_esize = -1;
static gint ett_isl = -1;
#define ISL_HEADER_SIZE 26
#define TYPE_ETHER 0x0
#define TYPE_TR 0x1
#define TYPE_FDDI 0x2
#define TYPE_ATM 0x3
void
capture_isl(const u_char *pd, int offset, packet_counts *ld)
{
guint8 type;
if (!BYTES_ARE_IN_FRAME(offset, ISL_HEADER_SIZE)) {
ld->other++;
return;
}
type = (pd[offset+5] >> 4)&0x0F;
switch (type) {
case TYPE_ETHER:
offset += 14+12; /* skip the header */
capture_eth(pd, offset, ld);
break;
case TYPE_TR:
offset += 14+17; /* skip the header */
capture_tr(pd, offset, ld);
break;
default:
ld->other++;
break;
}
}
static const value_string type_vals[] = {
{TYPE_ETHER, "Ethernet"},
{TYPE_TR, "Token-Ring"},
{TYPE_FDDI, "FDDI"},
{TYPE_ATM, "ATM"},
{0, NULL}
};
static const value_string ether_user_vals[] = {
{0x0, "Normal priority"},
{0x1, "Priority 1"},
{0x2, "Priority 2"},
{0x3, "Highest priority"},
{0, NULL}
};
static const true_false_string bpdu_tfs = {
"Yes",
"No"
};
static const true_false_string explorer_tfs = {
"Explorer frame",
"Data frame"
};
void
dissect_isl(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
proto_tree *fh_tree = NULL;
proto_item *ti;
guint8 type;
guint16 length;
tvbuff_t *next_tvb;
OLD_CHECK_DISPLAY_AS_DATA(proto_isl, pd, offset, fd, tree);
if (!BYTES_ARE_IN_FRAME(offset, ISL_HEADER_SIZE)) {
old_dissect_data(pd, offset, fd, tree);
return;
}
if (check_col(fd, COL_PROTOCOL))
col_set_str(fd, COL_PROTOCOL, "ISL");
if (check_col(fd, COL_INFO))
col_add_fstr(fd, COL_INFO, "VLAN ID: 0x%04X", pntohs(&pd[offset+20]) >> 1);
type = (pd[offset+5] >> 4)&0x0F;
if (tree) {
ti = proto_tree_add_protocol_format(tree, proto_isl, NullTVB, offset, ISL_HEADER_SIZE,
"ISL");
fh_tree = proto_item_add_subtree(ti, ett_isl);
proto_tree_add_ether(fh_tree, hf_isl_dst, NullTVB, offset+0, 6, &pd[offset+0]);
proto_tree_add_ether_hidden(fh_tree, hf_isl_addr, NullTVB, offset+0, 6, &pd[offset+0]);
proto_tree_add_uint(fh_tree, hf_isl_type, NullTVB, offset+5, 1, pd[offset+5]);
switch (type) {
case TYPE_ETHER:
proto_tree_add_uint(fh_tree, hf_isl_user_eth, NullTVB, offset+5, 1,
pd[offset+5]&0x03);
break;
default:
/* XXX - the spec appears to indicate that the "User" field is
used for TYPE_TR to distinguish between types of packets. */
proto_tree_add_uint(fh_tree, hf_isl_user, NullTVB, offset+5, 1, pd[offset+5]);
break;
}
proto_tree_add_ether(fh_tree, hf_isl_src, NullTVB, offset+6, 6, &pd[offset+6]);
proto_tree_add_ether_hidden(fh_tree, hf_isl_addr, NullTVB, offset+6, 6, &pd[offset+6]);
length = pntohs(&pd[offset+12]);
proto_tree_add_uint(fh_tree, hf_isl_len, NullTVB, offset+12, 2, length);
/* This part looks sort of like a SNAP-encapsulated LLC header... */
proto_tree_add_text(fh_tree, NullTVB, offset+14, 1, "DSAP: 0x%X", pd[offset+14]);
proto_tree_add_text(fh_tree, NullTVB, offset+15, 1, "SSAP: 0x%X", pd[offset+15]);
proto_tree_add_text(fh_tree, NullTVB, offset+16, 1, "Control: 0x%X", pd[offset+16]);
/* ...but this is the manufacturer's ID portion of the source address
field (which is, admittedly, an OUI). */
proto_tree_add_uint(fh_tree, hf_isl_hsa, NullTVB, offset+17, 3,
pd[offset+17] << 16 | pd[offset+18] << 8 | pd[offset+19]);
proto_tree_add_uint(fh_tree, hf_isl_vlan_id, NullTVB, offset+20, 2,
pntohs(&pd[offset+20]));
proto_tree_add_boolean(fh_tree, hf_isl_bpdu, NullTVB, offset+20, 2,
pntohs(&pd[offset+20]));
proto_tree_add_uint(fh_tree, hf_isl_index, NullTVB, offset+22, 2,
pntohs(&pd[offset+22]));
/* Now for the CRC, which is at the *end* of the packet. */
if (BYTES_ARE_IN_FRAME(pi.len - 4, 4)) {
proto_tree_add_uint(fh_tree, hf_isl_crc, NullTVB, pi.len - 4, 4,
pntohl(&pd[END_OF_FRAME - 4]));
}
}
switch (type) {
case TYPE_ETHER:
next_tvb = tvb_create_from_top(offset+26);
dissect_eth(next_tvb, &pi, tree);
break;
case TYPE_TR:
proto_tree_add_uint(fh_tree, hf_isl_src_vlan_id, NullTVB, offset+24, 2,
pntohs(&pd[offset+24]));
proto_tree_add_boolean(fh_tree, hf_isl_explorer, NullTVB, offset+24, 2,
pntohs(&pd[offset+24]));
proto_tree_add_uint(fh_tree, hf_isl_dst_route_descriptor, NullTVB, offset+26, 2,
pntohs(&pd[offset+26]));
proto_tree_add_uint(fh_tree, hf_isl_src_route_descriptor, NullTVB, offset+28, 2,
pntohs(&pd[offset+28]));
proto_tree_add_boolean(fh_tree, hf_isl_fcs_not_incl, NullTVB, offset+30, 1,
pd[offset+30]);
proto_tree_add_uint(fh_tree, hf_isl_esize, NullTVB, offset+16, 1,
pd[offset+30]);
next_tvb = tvb_create_from_top(offset+31);
dissect_tr(next_tvb, &pi, tree);
break;
default:
next_tvb = tvb_create_from_top(offset+26);
dissect_data(next_tvb, 0, &pi, tree);
break;
}
}
void
proto_register_isl(void)
{
static hf_register_info hf[] = {
{ &hf_isl_dst,
{ "Destination", "isl.dst", FT_ETHER, BASE_NONE, NULL, 0x0,
"Destination Address" }},
{ &hf_isl_type,
{ "Type", "isl.type", FT_UINT8, BASE_NONE,
VALS(type_vals), 0xF0, "Type" }},
{ &hf_isl_user_eth,
{ "User", "isl.user_eth", FT_UINT8, BASE_NONE,
VALS(ether_user_vals), 0x0F, "Priority (for Ethernet)" }},
{ &hf_isl_user,
{ "User", "isl.user", FT_UINT8, BASE_HEX, NULL, 0x0F,
"User-defined bits" }},
{ &hf_isl_src,
{ "Source", "isl.src", FT_ETHER, BASE_NONE, NULL, 0x0,
"Source Hardware Address" }},
{ &hf_isl_addr,
{ "Source or Destination Address", "isl.addr", FT_ETHER, BASE_NONE, NULL, 0x0,
"Source or Destination Hardware Address" }},
{ &hf_isl_len,
{ "Length", "isl.len", FT_UINT16, BASE_DEC, NULL, 0x0,
"" }},
{ &hf_isl_hsa,
{ "HSA", "isl.hsa", FT_UINT24, BASE_HEX, NULL, 0x0,
"High bits of source address" }},
{ &hf_isl_vlan_id,
{ "VLAN ID", "isl.vlan_id", FT_UINT16, BASE_HEX, NULL,
0xFFFE, "Virtual LAN ID" }},
{ &hf_isl_bpdu,
{ "BPDU", "isl.bpdu", FT_BOOLEAN, 16,
TFS(&bpdu_tfs), 0x0001, "BPDU indicator" }},
{ &hf_isl_index,
{ "Index", "isl.index", FT_UINT16, BASE_DEC, NULL, 0x0,
"Port index of packet source" }},
{ &hf_isl_crc,
{ "CRC", "isl.crc", FT_UINT32, BASE_HEX, NULL, 0x0,
"CRC field of encapsulated frame" }},
{ &hf_isl_src_vlan_id,
{ "Source VLAN ID", "isl.src_vlan_id", FT_UINT16, BASE_HEX, NULL,
0xFFFE, "Source Virtual LAN ID" }},
{ &hf_isl_explorer,
{ "Explorer", "isl.explorer", FT_BOOLEAN, 16,
TFS(&explorer_tfs), 0x0001, "Explorer" }},
{ &hf_isl_dst_route_descriptor,
{ "Destination route descriptor", "isl.dst_route_desc",
FT_UINT16, BASE_HEX, NULL, 0x0,
"Route descriptor to be used for forwarding" }},
{ &hf_isl_src_route_descriptor,
{ "Source-route descriptor", "isl.src_route_desc",
FT_UINT16, BASE_HEX, NULL, 0x0,
"Route descriptor to be used for source learning" }},
{ &hf_isl_fcs_not_incl,
{ "FCS Not Included", "isl.fcs_not_incl", FT_BOOLEAN, 9,
NULL, 0x40, "FCS not included" }},
{ &hf_isl_esize,
{ "Esize", "isl.esize", FT_UINT8, BASE_DEC, NULL,
0x3F, "Frame size for frames less than 64 bytes" }},
};
static gint *ett[] = {
&ett_isl,
};
proto_isl = proto_register_protocol("Cisco ISL", "isl");
proto_register_field_array(proto_isl, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-bugs
mailing list