*
* Laurent Deniel <deniel@worldnet.fr>
*
- * $Id: packet-fddi.c,v 1.47 2001/01/10 09:07:35 guy Exp $
+ * $Id: packet-fddi.c,v 1.55 2001/12/10 00:25:27 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * 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
static int proto_fddi = -1;
static int hf_fddi_fc = -1;
+static int hf_fddi_fc_clf = -1;
+static int hf_fddi_fc_prio = -1;
+static int hf_fddi_fc_smt_subtype = -1;
+static int hf_fddi_fc_mac_subtype = -1;
static int hf_fddi_dst = -1;
static int hf_fddi_src = -1;
static int hf_fddi_addr = -1;
static gint ett_fddi = -1;
+static gint ett_fddi_fc = -1;
/* FDDI Frame Control values */
#define FDDI_FC_ASYNC_R 0x08 /* Reserved */
#define FDDI_FC_ASYNC_PRI 0x07 /* Priority */
+#define CLFF_BITS(fc) (((fc) & FDDI_FC_CLFF) >> 4)
+#define ZZZZ_BITS(fc) ((fc) & FDDI_FC_ZZZZ)
+
+static const value_string clf_vals[] = {
+ { CLFF_BITS(FDDI_FC_VOID), "Void" },
+ { CLFF_BITS(FDDI_FC_SMT), "SMT" },
+ { CLFF_BITS(FDDI_FC_LLC_ASYNC), "Async LLC" },
+ { CLFF_BITS(FDDI_FC_IMP_ASYNC), "Implementor Async" },
+ { CLFF_BITS(FDDI_FC_NRT), "Nonrestricted Token" },
+ { CLFF_BITS(FDDI_FC_MAC), "MAC" },
+ { CLFF_BITS(FDDI_FC_LLC_SYNC), "Sync LLC" },
+ { CLFF_BITS(FDDI_FC_IMP_SYNC), "Implementor Sync" },
+ { 0, NULL }
+};
+
+static const value_string smt_subtype_vals[] = {
+ { ZZZZ_BITS(FDDI_FC_SMT_INFO), "Info" },
+ { ZZZZ_BITS(FDDI_FC_SMT_NSA), "Next Station Address" },
+ { 0, NULL }
+};
+
+static const value_string mac_subtype_vals[] = {
+ { ZZZZ_BITS(FDDI_FC_MAC_BEACON), "Beacon" },
+ { ZZZZ_BITS(FDDI_FC_MAC_CLAIM), "Claim" },
+ { 0, NULL }
+};
+
#define FDDI_HEADER_SIZE 13
/* field positions */
#define FDDI_P_SHOST 7
static dissector_handle_t llc_handle;
+static dissector_handle_t data_handle;
static void
swap_mac_addr(u_char *swapped_addr, const u_char *orig_addr)
void
-capture_fddi(const u_char *pd, packet_counts *ld)
+capture_fddi(const u_char *pd, int len, packet_counts *ld)
{
int offset = 0, fc;
- if (!BYTES_ARE_IN_FRAME(0, FDDI_HEADER_SIZE)) {
+ if (!BYTES_ARE_IN_FRAME(0, len, FDDI_HEADER_SIZE)) {
ld->other++;
return;
}
case FDDI_FC_LLC_ASYNC + 13 :
case FDDI_FC_LLC_ASYNC + 14 :
case FDDI_FC_LLC_ASYNC + 15 :
- capture_llc(pd, offset, ld);
+ capture_llc(pd, offset, len, ld);
return;
default :
ld->other++;
proto_tree *fh_tree = NULL;
proto_item *ti;
gchar *fc_str;
+ proto_tree *fc_tree;
static u_char src[6], dst[6];
u_char src_swapped[6], dst_swapped[6];
tvbuff_t *next_tvb;
- CHECK_DISPLAY_AS_DATA(proto_fddi, tvb, pinfo, tree);
-
- pinfo->current_proto = "FDDI";
- if (check_col(pinfo->fd, COL_PROTOCOL))
- col_set_str(pinfo->fd, COL_PROTOCOL, "FDDI");
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "FDDI");
fc = (int) tvb_get_guint8(tvb, FDDI_P_FC);
fc_str = fddifc_to_str(fc);
- if (check_col(pinfo->fd, COL_INFO))
- col_add_str(pinfo->fd, COL_INFO, fc_str);
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_add_str(pinfo->cinfo, COL_INFO, fc_str);
if (tree) {
ti = proto_tree_add_protocol_format(tree, proto_fddi, tvb, 0, FDDI_HEADER_SIZE,
"Fiber Distributed Data Interface, %s", fc_str);
fh_tree = proto_item_add_subtree(ti, ett_fddi);
- proto_tree_add_uint(fh_tree, hf_fddi_fc, tvb, FDDI_P_FC, 1, fc);
+ ti = proto_tree_add_uint_format(fh_tree, hf_fddi_fc, tvb, FDDI_P_FC, 1, fc,
+ "Frame Control: 0x%02x (%s)", fc, fc_str);
+ fc_tree = proto_item_add_subtree(ti, ett_fddi_fc);
+ proto_tree_add_uint(fc_tree, hf_fddi_fc_clf, tvb, FDDI_P_FC, 1, fc);
+ switch (fc & FDDI_FC_CLFF) {
+
+ case FDDI_FC_SMT:
+ proto_tree_add_uint(fc_tree, hf_fddi_fc_smt_subtype, tvb, FDDI_P_FC, 1, fc);
+ break;
+
+ case FDDI_FC_MAC:
+ if (fc != FDDI_FC_RT)
+ proto_tree_add_uint(fc_tree, hf_fddi_fc_mac_subtype, tvb, FDDI_P_FC, 1, fc);
+ break;
+
+ case FDDI_FC_LLC_ASYNC:
+ if (!(fc & FDDI_FC_ASYNC_R))
+ proto_tree_add_uint(fc_tree, hf_fddi_fc_prio, tvb, FDDI_P_FC, 1, fc);
+ break;
+ }
}
/* Extract the destination address, possibly bit-swapping it. */
/* XXX - copy them to some buffer associated with "pi", rather than
just making "dst" static? */
- SET_ADDRESS(&pi.dl_dst, AT_ETHER, 6, &dst[0]);
- SET_ADDRESS(&pi.dst, AT_ETHER, 6, &dst[0]);
+ SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, &dst[0]);
+ SET_ADDRESS(&pinfo->dst, AT_ETHER, 6, &dst[0]);
if (fh_tree) {
proto_tree_add_ether(fh_tree, hf_fddi_dst, tvb, FDDI_P_DHOST, 6, dst);
/* XXX - copy them to some buffer associated with "pi", rather than
just making "src" static? */
- SET_ADDRESS(&pi.dl_src, AT_ETHER, 6, &src[0]);
- SET_ADDRESS(&pi.src, AT_ETHER, 6, &src[0]);
+ SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, &src[0]);
+ SET_ADDRESS(&pinfo->src, AT_ETHER, 6, &src[0]);
if (fh_tree) {
proto_tree_add_ether(fh_tree, hf_fddi_src, tvb, FDDI_P_SHOST, 6, src);
return;
default :
- dissect_data(next_tvb, 0, pinfo, tree);
+ call_dissector(data_handle,next_tvb, pinfo, tree);
return;
} /* fc */
*/
{ &hf_fddi_fc,
{ "Frame Control", "fddi.fc", FT_UINT8, BASE_HEX, NULL, 0x0,
- "" }},
+ "", HFILL }},
+
+ { &hf_fddi_fc_clf,
+ { "Class/Length/Format", "fddi.fc.clf", FT_UINT8, BASE_HEX, VALS(clf_vals), FDDI_FC_CLFF,
+ "", HFILL }},
+
+ { &hf_fddi_fc_prio,
+ { "Priority", "fddi.fc.prio", FT_UINT8, BASE_DEC, NULL, FDDI_FC_ASYNC_PRI,
+ "", HFILL }},
+
+ { &hf_fddi_fc_smt_subtype,
+ { "SMT Subtype", "fddi.fc.smt_subtype", FT_UINT8, BASE_DEC, VALS(smt_subtype_vals), FDDI_FC_ZZZZ,
+ "", HFILL }},
+
+ { &hf_fddi_fc_mac_subtype,
+ { "MAC Subtype", "fddi.fc.mac_subtype", FT_UINT8, BASE_DEC, VALS(mac_subtype_vals), FDDI_FC_ZZZZ,
+ "", HFILL }},
{ &hf_fddi_dst,
{ "Destination", "fddi.dst", FT_ETHER, BASE_NONE, NULL, 0x0,
- "Destination Hardware Address" }},
+ "Destination Hardware Address", HFILL }},
{ &hf_fddi_src,
{ "Source", "fddi.src", FT_ETHER, BASE_NONE, NULL, 0x0,
- "" }},
+ "", HFILL }},
{ &hf_fddi_addr,
{ "Source or Destination Address", "fddi.addr", FT_ETHER, BASE_NONE, NULL, 0x0,
- "Source or Destination Hardware Address" }},
+ "Source or Destination Hardware Address", HFILL }},
};
static gint *ett[] = {
&ett_fddi,
+ &ett_fddi_fc,
};
proto_fddi = proto_register_protocol("Fiber Distributed Data Interface",
void
proto_reg_handoff_fddi(void)
{
+ dissector_handle_t fddi_handle, fddi_bitswapped_handle;
+
/*
* Get a handle for the LLC dissector.
*/
llc_handle = find_dissector("llc");
+ data_handle = find_dissector("data");
- dissector_add("wtap_encap", WTAP_ENCAP_FDDI,
- dissect_fddi_not_bitswapped, proto_fddi);
+ fddi_handle = find_dissector("fddi");
+ dissector_add("wtap_encap", WTAP_ENCAP_FDDI, fddi_handle);
+ fddi_bitswapped_handle =
+ create_dissector_handle(dissect_fddi_bitswapped, proto_fddi);
dissector_add("wtap_encap", WTAP_ENCAP_FDDI_BITSWAPPED,
- dissect_fddi_bitswapped, proto_fddi);
+ fddi_bitswapped_handle);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff