![Guy Harris](/assets/img/avatar_default.png)
"pinfo->current_proto", in dissectors always called through dissector tables and handles. Make the IEEE 802.11 dissector static, as it's not called externally. Clear the Info column in the Linux cooked capture and 802.1q VLAN dissectors, before extracting anything from the packet, so that if an exception is thrown, the Info column doesn't reflect the previous protocol. Don't extract the encapsulated protocol in the VLAN dissector until you use it, so that if the frame contains the VLAN ID but not the encapsulated protocol, we at least put the VLAN ID into the protocol tree. svn path=/trunk/; revision=2927
289 lines
7.4 KiB
C
289 lines
7.4 KiB
C
/* packet-sll.c
|
|
* Routines for disassembly of packets from Linux "cooked mode" captures
|
|
*
|
|
* $Id: packet-sll.c,v 1.7 2001/01/21 22:51:46 guy Exp $
|
|
*
|
|
* Ethereal - Network traffic analyzer
|
|
* By Gerald Combs <gerald@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
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <glib.h>
|
|
#include "packet.h"
|
|
#include "packet-ipx.h"
|
|
#include "packet-llc.h"
|
|
#include "resolv.h"
|
|
|
|
static int proto_sll = -1;
|
|
static int hf_sll_pkttype = -1;
|
|
static int hf_sll_hatype = -1;
|
|
static int hf_sll_halen = -1;
|
|
static int hf_sll_src_eth = -1;
|
|
static int hf_sll_src_other = -1;
|
|
static int hf_sll_ltype = -1;
|
|
static int hf_sll_etype = -1;
|
|
static int hf_sll_trailer = -1;
|
|
|
|
static gint ett_sll = -1;
|
|
|
|
/*
|
|
* A DLT_LINUX_SLL fake link-layer header.
|
|
*/
|
|
#define SLL_HEADER_SIZE 16 /* total header length */
|
|
#define SLL_ADDRLEN 8 /* length of address field */
|
|
|
|
/*
|
|
* The LINUX_SLL_ values for "sll_pkttype".
|
|
*/
|
|
#define LINUX_SLL_HOST 0
|
|
#define LINUX_SLL_BROADCAST 1
|
|
#define LINUX_SLL_MULTICAST 2
|
|
#define LINUX_SLL_OTHERHOST 3
|
|
#define LINUX_SLL_OUTGOING 4
|
|
|
|
static const value_string packet_type_vals[] = {
|
|
{ LINUX_SLL_HOST, "Unicast to us" },
|
|
{ LINUX_SLL_BROADCAST, "Broadcast" },
|
|
{ LINUX_SLL_MULTICAST, "Multicast" },
|
|
{ LINUX_SLL_OTHERHOST, "Unicast to another host" },
|
|
{ LINUX_SLL_OUTGOING, "Sent by us" },
|
|
{ 0, NULL }
|
|
};
|
|
|
|
/*
|
|
* The LINUX_SLL_ values for "sll_protocol".
|
|
*/
|
|
#define LINUX_SLL_P_802_3 0x0001 /* Novell 802.3 frames without 802.2 LLC header */
|
|
#define LINUX_SLL_P_802_2 0x0004 /* 802.2 frames (not D/I/X Ethernet) */
|
|
|
|
static const value_string ltype_vals[] = {
|
|
{ LINUX_SLL_P_802_3, "Raw 802.3" },
|
|
{ LINUX_SLL_P_802_2, "802.2 LLC" },
|
|
{ 0, NULL }
|
|
};
|
|
|
|
static dissector_handle_t ipx_handle;
|
|
static dissector_handle_t llc_handle;
|
|
|
|
void
|
|
capture_sll(const u_char *pd, packet_counts *ld)
|
|
{
|
|
guint16 protocol;
|
|
|
|
if (!BYTES_ARE_IN_FRAME(0, SLL_HEADER_SIZE)) {
|
|
ld->other++;
|
|
return;
|
|
}
|
|
protocol = pntohs(&pd[14]);
|
|
if (protocol <= 1536) { /* yes, 1536 - that's how Linux does it */
|
|
/*
|
|
* "proto" is *not* a length field, it's a Linux internal
|
|
* protocol type.
|
|
*/
|
|
switch (protocol) {
|
|
|
|
case LINUX_SLL_P_802_2:
|
|
/*
|
|
* 802.2 LLC.
|
|
*/
|
|
capture_llc(pd, SLL_HEADER_SIZE, ld);
|
|
break;
|
|
|
|
case LINUX_SLL_P_802_3:
|
|
/*
|
|
* Novell IPX inside 802.3 with no 802.2 LLC
|
|
* header.
|
|
*/
|
|
capture_ipx(pd, SLL_HEADER_SIZE, ld);
|
|
break;
|
|
|
|
default:
|
|
ld->other++;
|
|
break;
|
|
}
|
|
} else
|
|
capture_ethertype(protocol, SLL_HEADER_SIZE, pd, ld);
|
|
}
|
|
|
|
static void
|
|
dissect_sll(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
{
|
|
guint16 pkttype;
|
|
guint16 protocol;
|
|
guint16 hatype, halen;
|
|
guint8 *src;
|
|
proto_item *ti;
|
|
tvbuff_t *next_tvb;
|
|
proto_tree *fh_tree = NULL;
|
|
|
|
if (check_col(pinfo->fd, COL_PROTOCOL))
|
|
col_set_str(pinfo->fd, COL_PROTOCOL, "SLL");
|
|
if (check_col(pinfo->fd, COL_INFO))
|
|
col_clear(pinfo->fd, COL_INFO);
|
|
|
|
pkttype = tvb_get_ntohs(tvb, 0);
|
|
|
|
if (check_col(pinfo->fd, COL_INFO))
|
|
col_add_str(pinfo->fd, COL_INFO,
|
|
val_to_str(pkttype, packet_type_vals, "Unknown (%u)"));
|
|
|
|
if (tree) {
|
|
ti = proto_tree_add_protocol_format(tree, proto_sll, tvb, 0,
|
|
SLL_HEADER_SIZE, "Linux cooked capture");
|
|
fh_tree = proto_item_add_subtree(ti, ett_sll);
|
|
proto_tree_add_item(fh_tree, hf_sll_pkttype, tvb, 0, 2, FALSE);
|
|
}
|
|
|
|
/*
|
|
* XXX - check the link-layer address type value?
|
|
* For now, we just assume 6 means Ethernet.
|
|
*/
|
|
hatype = tvb_get_ntohs(tvb, 2);
|
|
halen = tvb_get_ntohs(tvb, 4);
|
|
if (tree) {
|
|
proto_tree_add_uint(fh_tree, hf_sll_hatype, tvb, 2, 2, hatype);
|
|
proto_tree_add_uint(fh_tree, hf_sll_halen, tvb, 4, 2, halen);
|
|
}
|
|
if (halen == 6) {
|
|
src = tvb_get_ptr(tvb, 6, 6);
|
|
SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, src);
|
|
SET_ADDRESS(&pinfo->src, AT_ETHER, 6, src);
|
|
if (tree) {
|
|
proto_tree_add_ether(fh_tree, hf_sll_src_eth, tvb,
|
|
6, 6, src);
|
|
}
|
|
} else {
|
|
if (tree) {
|
|
proto_tree_add_bytes(fh_tree, hf_sll_src_other, tvb,
|
|
6, halen, tvb_get_ptr(tvb, 6, halen));
|
|
}
|
|
}
|
|
|
|
protocol = tvb_get_ntohs(tvb, 14);
|
|
if (protocol <= 1536) { /* yes, 1536 - that's how Linux does it */
|
|
/*
|
|
* "proto" is *not* a length field, it's a Linux internal
|
|
* protocol type.
|
|
* We therefore cannot say how much of the packet will
|
|
* be trailer data.
|
|
* XXX - do the same thing we do for packets with Ethertypes?
|
|
*/
|
|
proto_tree_add_uint(fh_tree, hf_sll_ltype, tvb, 14, 2,
|
|
protocol);
|
|
|
|
next_tvb = tvb_new_subset(tvb, SLL_HEADER_SIZE, -1, -1);
|
|
switch (protocol) {
|
|
|
|
case LINUX_SLL_P_802_2:
|
|
/*
|
|
* 802.2 LLC.
|
|
*/
|
|
call_dissector(llc_handle, next_tvb, pinfo, tree);
|
|
break;
|
|
|
|
case LINUX_SLL_P_802_3:
|
|
/*
|
|
* Novell IPX inside 802.3 with no 802.2 LLC
|
|
* header.
|
|
*/
|
|
call_dissector(ipx_handle, next_tvb, pinfo, tree);
|
|
break;
|
|
|
|
default:
|
|
dissect_data(next_tvb, 0, pinfo, tree);
|
|
break;
|
|
}
|
|
} else {
|
|
ethertype(protocol, tvb, SLL_HEADER_SIZE, pinfo, tree,
|
|
fh_tree, hf_sll_etype, hf_sll_trailer);
|
|
}
|
|
}
|
|
|
|
void
|
|
proto_register_sll(void)
|
|
{
|
|
static hf_register_info hf[] = {
|
|
{ &hf_sll_pkttype,
|
|
{ "Packet type", "sll.pkttype", FT_UINT16, BASE_DEC,
|
|
VALS(packet_type_vals), 0x0, "Packet type" }},
|
|
|
|
/* ARP hardware type? With Linux extensions? */
|
|
{ &hf_sll_hatype,
|
|
{ "Link-layer address type", "sll.hatype", FT_UINT16, BASE_DEC,
|
|
NULL, 0x0, "Link-layer address type" }},
|
|
|
|
{ &hf_sll_halen,
|
|
{ "Link-layer address length", "sll.halen", FT_UINT16, BASE_DEC,
|
|
NULL, 0x0, "Link-layer address length" }},
|
|
|
|
/* Source address if it's an Ethernet-type address */
|
|
{ &hf_sll_src_eth,
|
|
{ "Source", "sll.src.eth", FT_ETHER, BASE_NONE, NULL, 0x0,
|
|
"Source link-layer address" }},
|
|
|
|
/* Source address if it's not an Ethernet-type address */
|
|
{ &hf_sll_src_other,
|
|
{ "Source", "sll.src.other", FT_BYTES, BASE_HEX, NULL, 0x0,
|
|
"Source link-layer address" }},
|
|
|
|
/* if the protocol field is an internal Linux protocol type */
|
|
{ &hf_sll_ltype,
|
|
{ "Protocol", "sll.ltype", FT_UINT16, BASE_HEX,
|
|
VALS(ltype_vals), 0x0, "Linux protocol type" }},
|
|
|
|
/* registered here but handled in ethertype.c */
|
|
{ &hf_sll_etype,
|
|
{ "Protocol", "sll.etype", FT_UINT16, BASE_HEX,
|
|
VALS(etype_vals), 0x0, "Ethernet protocol type" }},
|
|
|
|
{ &hf_sll_trailer,
|
|
{ "Trailer", "sll.trailer", FT_BYTES, BASE_NONE, NULL, 0x0,
|
|
"Trailer" }},
|
|
};
|
|
static gint *ett[] = {
|
|
&ett_sll,
|
|
};
|
|
|
|
proto_sll = proto_register_protocol("Linux cooked-mode capture",
|
|
"SLL", "sll" );
|
|
proto_register_field_array(proto_sll, hf, array_length(hf));
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
}
|
|
|
|
void
|
|
proto_reg_handoff_sll(void)
|
|
{
|
|
/*
|
|
* Get handles for the IPX and LLC dissectors.
|
|
*/
|
|
llc_handle = find_dissector("llc");
|
|
ipx_handle = find_dissector("ipx");
|
|
|
|
dissector_add("wtap_encap", WTAP_ENCAP_SLL, dissect_sll, proto_sll);
|
|
}
|