/* packet-fddi.c
* Routines for FDDI packet disassembly
*
- * Laurent Deniel <deniel@worldnet.fr>
+ * Laurent Deniel <laurent.deniel@free.fr>
*
- * $Id: packet-fddi.c,v 1.51 2001/07/03 04:56:45 guy Exp $
+ * $Id: packet-fddi.c,v 1.62 2003/08/29 10:59:09 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.
# include "config.h"
#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
#include <stdio.h>
#include <string.h>
#include <glib.h>
-#include "bitswap.h"
-#include "packet.h"
+#include <epan/bitswap.h>
+#include <epan/packet.h>
+#include "prefs.h"
#include "packet-fddi.h"
#include "packet-llc.h"
-#include "resolv.h"
+#include "tap.h"
+
+#include <epan/resolv.h>
static int proto_fddi = -1;
static int hf_fddi_fc = -1;
static gint ett_fddi = -1;
static gint ett_fddi_fc = -1;
+static int fddi_tap = -1;
+
+static gboolean fddi_padding = FALSE;
+
+#define FDDI_PADDING ((fddi_padding) ? 3 : 0)
+
/* FDDI Frame Control values */
#define FDDI_FC_VOID 0x00 /* Void frame */
#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)
+swap_mac_addr(guint8 *swapped_addr, const guint8 *orig_addr)
{
int i;
void
-capture_fddi(const u_char *pd, packet_counts *ld)
+capture_fddi(const guchar *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 + FDDI_PADDING)) {
ld->other++;
return;
}
- offset = FDDI_HEADER_SIZE;
+ offset = FDDI_PADDING + FDDI_HEADER_SIZE;
- fc = (int) pd[FDDI_P_FC];
+ fc = (int) pd[FDDI_P_FC+FDDI_PADDING];
switch (fc) {
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++;
dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
gboolean bitswapped)
{
- int fc;
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];
+ static guchar src[6], dst[6];
+ guchar src_swapped[6], dst_swapped[6];
tvbuff_t *next_tvb;
+ static fddi_hdr fddihdrs[4];
+ static int fddihdr_num=0;
+ fddi_hdr *fddihdr;
+
+ fddihdr_num++;
+ if(fddihdr_num>=4){
+ fddihdr_num=0;
+ }
+ fddihdr=&fddihdrs[fddihdr_num];
- 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);
+ fddihdr->fc = tvb_get_guint8(tvb, FDDI_P_FC + FDDI_PADDING);
+ fc_str = fddifc_to_str(fddihdr->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,
+ ti = proto_tree_add_protocol_format(tree, proto_fddi, tvb, 0, FDDI_HEADER_SIZE+FDDI_PADDING,
"Fiber Distributed Data Interface, %s", fc_str);
fh_tree = proto_item_add_subtree(ti, ett_fddi);
- 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);
+ ti = proto_tree_add_uint_format(fh_tree, hf_fddi_fc, tvb, FDDI_P_FC + FDDI_PADDING, 1, fddihdr->fc,
+ "Frame Control: 0x%02x (%s)", fddihdr->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) {
+ proto_tree_add_uint(fc_tree, hf_fddi_fc_clf, tvb, FDDI_P_FC + FDDI_PADDING, 1, fddihdr->fc);
+ switch ((fddihdr->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);
+ proto_tree_add_uint(fc_tree, hf_fddi_fc_smt_subtype, tvb, FDDI_P_FC + FDDI_PADDING, 1, fddihdr->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);
+ if (fddihdr->fc != FDDI_FC_RT)
+ proto_tree_add_uint(fc_tree, hf_fddi_fc_mac_subtype, tvb, FDDI_P_FC + FDDI_PADDING, 1, fddihdr->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);
+ if (!((fddihdr->fc) & FDDI_FC_ASYNC_R))
+ proto_tree_add_uint(fc_tree, hf_fddi_fc_prio, tvb, FDDI_P_FC + FDDI_PADDING, 1, fddihdr->fc);
break;
}
}
/* Extract the destination address, possibly bit-swapping it. */
if (bitswapped)
- swap_mac_addr(dst, (u_char *) tvb_get_ptr(tvb, FDDI_P_DHOST, 6));
+ swap_mac_addr(dst, tvb_get_ptr(tvb, FDDI_P_DHOST + FDDI_PADDING, 6));
else
- memcpy(dst, (u_char *) tvb_get_ptr(tvb, FDDI_P_DHOST, 6), sizeof dst);
- swap_mac_addr(dst_swapped, (u_char*) tvb_get_ptr(tvb, FDDI_P_DHOST, 6));
+ memcpy(dst, tvb_get_ptr(tvb, FDDI_P_DHOST + FDDI_PADDING, 6), sizeof dst);
+ swap_mac_addr(dst_swapped, tvb_get_ptr(tvb, FDDI_P_DHOST + FDDI_PADDING, 6));
/* XXX - copy them to some buffer associated with "pi", rather than
just making "dst" static? */
SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, &dst[0]);
SET_ADDRESS(&pinfo->dst, AT_ETHER, 6, &dst[0]);
+ SET_ADDRESS(&fddihdr->dst, AT_ETHER, 6, &dst[0]);
if (fh_tree) {
- proto_tree_add_ether(fh_tree, hf_fddi_dst, tvb, FDDI_P_DHOST, 6, dst);
- proto_tree_add_ether_hidden(fh_tree, hf_fddi_addr, tvb, FDDI_P_DHOST, 6, dst);
+ proto_tree_add_ether(fh_tree, hf_fddi_dst, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst);
+ proto_tree_add_ether_hidden(fh_tree, hf_fddi_addr, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst);
/* hide some bit-swapped mac address fields in the proto_tree, just in case */
- proto_tree_add_ether_hidden(fh_tree, hf_fddi_dst, tvb, FDDI_P_DHOST, 6, dst_swapped);
- proto_tree_add_ether_hidden(fh_tree, hf_fddi_addr, tvb, FDDI_P_DHOST, 6, dst_swapped);
+ proto_tree_add_ether_hidden(fh_tree, hf_fddi_dst, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst_swapped);
+ proto_tree_add_ether_hidden(fh_tree, hf_fddi_addr, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst_swapped);
}
/* Extract the source address, possibly bit-swapping it. */
if (bitswapped)
- swap_mac_addr(src, (u_char *) tvb_get_ptr(tvb, FDDI_P_SHOST, 6));
+ swap_mac_addr(src, tvb_get_ptr(tvb, FDDI_P_SHOST + FDDI_PADDING, 6));
else
- memcpy(src, (u_char *) tvb_get_ptr(tvb, FDDI_P_SHOST, 6), sizeof src);
- swap_mac_addr(src_swapped, (u_char*) tvb_get_ptr(tvb, FDDI_P_SHOST, 6));
+ memcpy(src, tvb_get_ptr(tvb, FDDI_P_SHOST + FDDI_PADDING, 6), sizeof src);
+ swap_mac_addr(src_swapped, tvb_get_ptr(tvb, FDDI_P_SHOST + FDDI_PADDING, 6));
/* XXX - copy them to some buffer associated with "pi", rather than
just making "src" static? */
SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, &src[0]);
SET_ADDRESS(&pinfo->src, AT_ETHER, 6, &src[0]);
+ SET_ADDRESS(&fddihdr->src, AT_ETHER, 6, &src[0]);
if (fh_tree) {
- proto_tree_add_ether(fh_tree, hf_fddi_src, tvb, FDDI_P_SHOST, 6, src);
- proto_tree_add_ether_hidden(fh_tree, hf_fddi_addr, tvb, FDDI_P_SHOST, 6, src);
+ proto_tree_add_ether(fh_tree, hf_fddi_src, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src);
+ proto_tree_add_ether_hidden(fh_tree, hf_fddi_addr, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src);
/* hide some bit-swapped mac address fields in the proto_tree, just in case */
- proto_tree_add_ether_hidden(fh_tree, hf_fddi_src, tvb, FDDI_P_SHOST, 6, src_swapped);
- proto_tree_add_ether_hidden(fh_tree, hf_fddi_addr, tvb, FDDI_P_SHOST, 6, src_swapped);
+ proto_tree_add_ether_hidden(fh_tree, hf_fddi_src, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src_swapped);
+ proto_tree_add_ether_hidden(fh_tree, hf_fddi_addr, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src_swapped);
}
- next_tvb = tvb_new_subset(tvb, FDDI_HEADER_SIZE, -1, -1);
+ next_tvb = tvb_new_subset(tvb, FDDI_HEADER_SIZE + FDDI_PADDING, -1, -1);
- switch (fc) {
+
+ tap_queue_packet(fddi_tap, pinfo, fddihdr);
+
+ switch (fddihdr->fc) {
/* From now, only 802.2 SNAP (Async. LCC frame) is supported */
case FDDI_FC_LLC_ASYNC + 15 :
call_dissector(llc_handle, next_tvb, pinfo, tree);
return;
-
+
default :
- dissect_data(next_tvb, 0, pinfo, tree);
+ call_dissector(data_handle,next_tvb, pinfo, tree);
return;
} /* fc */
} /* dissect_fddi */
-
+
static void
dissect_fddi_bitswapped(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
&ett_fddi_fc,
};
+ module_t *fddi_module;
+
proto_fddi = proto_register_protocol("Fiber Distributed Data Interface",
"FDDI", "fddi");
proto_register_field_array(proto_fddi, hf, array_length(hf));
* We assume the MAC addresses in them aren't bitswapped.
*/
register_dissector("fddi", dissect_fddi_not_bitswapped, proto_fddi);
+
+ fddi_module = prefs_register_protocol(proto_fddi, NULL);
+ prefs_register_bool_preference(fddi_module, "padding",
+ "Add 3-byte padding to all FDDI packets",
+ "Whether the FDDI dissector should add 3-byte padding to all "
+ "captured FDDI packets (useful with e.g. Tru64 UNIX tcpdump)",
+ &fddi_padding);
+
+ fddi_tap = register_tap("fddi");
}
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