1998-09-16 02:39:15 +00:00
|
|
|
/* packet-eth.c
|
|
|
|
* Routines for ethernet packet disassembly
|
|
|
|
*
|
2001-03-22 23:22:23 +00:00
|
|
|
* $Id: packet-eth.c,v 1.62 2001/03/22 23:22:23 gram Exp $
|
1998-09-16 03:22:19 +00:00
|
|
|
*
|
1998-09-16 02:39:15 +00:00
|
|
|
* 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
|
|
|
|
|
1998-10-10 03:32:20 +00:00
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
|
|
# include <sys/types.h>
|
|
|
|
#endif
|
|
|
|
|
1999-03-23 03:14:46 +00:00
|
|
|
#include <glib.h>
|
1998-09-27 22:12:47 +00:00
|
|
|
#include "packet.h"
|
1998-09-16 02:39:15 +00:00
|
|
|
#include "etypes.h"
|
1998-09-25 23:24:07 +00:00
|
|
|
#include "resolv.h"
|
2000-05-19 05:29:44 +00:00
|
|
|
#include "packet-eth.h"
|
2001-02-08 07:08:05 +00:00
|
|
|
#include "packet-ieee8023.h"
|
2000-02-15 21:06:58 +00:00
|
|
|
#include "packet-ipx.h"
|
|
|
|
#include "packet-isl.h"
|
|
|
|
#include "packet-llc.h"
|
1998-09-16 02:39:15 +00:00
|
|
|
|
1999-07-07 22:52:57 +00:00
|
|
|
extern const value_string etype_vals[];
|
|
|
|
|
|
|
|
/* protocols and header fields */
|
1999-07-29 05:47:07 +00:00
|
|
|
static int proto_eth = -1;
|
|
|
|
static int hf_eth_dst = -1;
|
|
|
|
static int hf_eth_src = -1;
|
|
|
|
static int hf_eth_len = -1;
|
|
|
|
static int hf_eth_type = -1;
|
2000-03-20 21:21:33 +00:00
|
|
|
static int hf_eth_addr = -1;
|
2000-05-17 03:05:39 +00:00
|
|
|
static int hf_eth_trailer = -1;
|
1999-07-07 22:52:57 +00:00
|
|
|
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint ett_ieee8023 = -1;
|
|
|
|
static gint ett_ether2 = -1;
|
|
|
|
|
Tvbuffify the CDP, CGMP, ISL, and VTP dissectors.
Add a new subdissector table in the LLC dissector for protocol IDs with
a Cisco OUI, and register the CDP, CGMP, and VTMP dissectors in that
table, rather than calling them via a switch statement.
Register the ISL dissector by name, and have the Ethernet dissector call
it via a handle.
Fix the handling of the checksum field in the CDP dissector.
The strings in CDP are counted, not null-terminated; treat them as such.
Fix the handling of the encapsulated frame CRC, and the encapsulated
frame, in the ISL dissector, at least for Ethernet frames; it may not be
correct for encapsulated Token Ring frames.
svn path=/trunk/; revision=2792
2000-12-28 09:49:09 +00:00
|
|
|
static dissector_handle_t isl_handle;
|
|
|
|
|
1999-08-18 00:57:54 +00:00
|
|
|
#define ETH_HEADER_SIZE 14
|
|
|
|
|
1998-09-16 02:39:15 +00:00
|
|
|
/* These are the Netware-ish names for the different Ethernet frame types.
|
|
|
|
EthernetII: The ethernet with a Type field instead of a length field
|
2000-05-16 06:21:33 +00:00
|
|
|
Ethernet802.2: An 802.3 header followed by an 802.2 header
|
1998-09-16 02:39:15 +00:00
|
|
|
Ethernet802.3: A raw 802.3 packet. IPX/SPX can be the only payload.
|
2001-01-03 10:34:42 +00:00
|
|
|
There's no 802.2 hdr in this.
|
1998-09-16 02:39:15 +00:00
|
|
|
EthernetSNAP: Basically 802.2, just with 802.2SNAP. For our purposes,
|
|
|
|
there's no difference between 802.2 and 802.2SNAP, since we just
|
2001-01-03 10:34:42 +00:00
|
|
|
pass it down to the LLC dissector. -- Gilbert
|
1998-09-16 02:39:15 +00:00
|
|
|
*/
|
|
|
|
#define ETHERNET_II 0
|
|
|
|
#define ETHERNET_802_2 1
|
|
|
|
#define ETHERNET_802_3 2
|
|
|
|
#define ETHERNET_SNAP 3
|
|
|
|
|
1999-02-09 00:35:38 +00:00
|
|
|
void
|
2000-01-23 08:55:37 +00:00
|
|
|
capture_eth(const u_char *pd, int offset, packet_counts *ld)
|
|
|
|
{
|
|
|
|
guint16 etype, length;
|
1999-08-18 00:57:54 +00:00
|
|
|
int ethhdr_type; /* the type of ethernet frame */
|
1999-09-15 06:26:42 +00:00
|
|
|
|
2000-01-23 08:55:37 +00:00
|
|
|
if (!BYTES_ARE_IN_FRAME(offset, ETH_HEADER_SIZE)) {
|
1999-09-15 06:26:42 +00:00
|
|
|
ld->other++;
|
|
|
|
return;
|
|
|
|
}
|
1999-02-09 00:35:38 +00:00
|
|
|
|
2000-01-23 08:55:37 +00:00
|
|
|
etype = pntohs(&pd[offset+12]);
|
1999-02-09 00:35:38 +00:00
|
|
|
|
|
|
|
/* either ethernet802.3 or ethernet802.2 */
|
|
|
|
if (etype <= IEEE_802_3_MAX_LEN) {
|
2000-01-23 08:55:37 +00:00
|
|
|
length = etype;
|
1999-02-09 00:35:38 +00:00
|
|
|
|
2000-01-23 08:55:37 +00:00
|
|
|
/* Is there an 802.2 layer? I can tell by looking at the first 2
|
|
|
|
bytes after the 802.3 header. If they are 0xffff, then what
|
|
|
|
follows the 802.3 header is an IPX payload, meaning no 802.2.
|
|
|
|
(IPX/SPX is they only thing that can be contained inside a
|
|
|
|
straight 802.3 packet). A non-0xffff value means that there's an
|
|
|
|
802.2 layer inside the 802.3 layer */
|
|
|
|
if (pd[offset+14] == 0xff && pd[offset+15] == 0xff) {
|
1999-02-09 00:35:38 +00:00
|
|
|
ethhdr_type = ETHERNET_802_3;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ethhdr_type = ETHERNET_802_2;
|
|
|
|
}
|
2000-01-23 08:55:37 +00:00
|
|
|
|
2000-01-24 18:46:45 +00:00
|
|
|
/* Oh, yuck. Cisco ISL frames require special interpretation of the
|
|
|
|
destination address field; fortunately, they can be recognized by
|
|
|
|
checking the first 5 octets of the destination address, which are
|
|
|
|
01-00-0C-00-00 for ISL frames. */
|
|
|
|
if (pd[offset] == 0x01 && pd[offset+1] == 0x00 && pd[offset+2] == 0x0C
|
|
|
|
&& pd[offset+3] == 0x00 && pd[offset+4] == 0x00) {
|
|
|
|
capture_isl(pd, offset, ld);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2000-01-23 08:55:37 +00:00
|
|
|
/* Convert the LLC length from the 802.3 header to a total
|
2000-01-24 01:15:37 +00:00
|
|
|
frame length, by adding in the size of any data that preceded
|
|
|
|
the Ethernet header, and adding in the Ethernet header size,
|
|
|
|
and set the payload and captured-payload lengths to the minima
|
2000-01-23 08:55:37 +00:00
|
|
|
of the total length and the frame lengths. */
|
2000-01-24 01:15:37 +00:00
|
|
|
length += offset + ETH_HEADER_SIZE;
|
2000-01-23 08:55:37 +00:00
|
|
|
if (pi.len > length)
|
|
|
|
pi.len = length;
|
|
|
|
if (pi.captured_len > length)
|
|
|
|
pi.captured_len = length;
|
1999-02-09 00:35:38 +00:00
|
|
|
} else {
|
|
|
|
ethhdr_type = ETHERNET_II;
|
|
|
|
}
|
2000-01-23 08:55:37 +00:00
|
|
|
offset += ETH_HEADER_SIZE;
|
1999-02-09 00:35:38 +00:00
|
|
|
|
|
|
|
switch (ethhdr_type) {
|
|
|
|
case ETHERNET_802_3:
|
2000-01-23 08:55:37 +00:00
|
|
|
capture_ipx(pd, offset, ld);
|
1999-02-09 00:35:38 +00:00
|
|
|
break;
|
|
|
|
case ETHERNET_802_2:
|
2000-01-23 08:55:37 +00:00
|
|
|
capture_llc(pd, offset, ld);
|
1999-02-09 00:35:38 +00:00
|
|
|
break;
|
|
|
|
case ETHERNET_II:
|
2000-01-23 08:55:37 +00:00
|
|
|
capture_ethertype(etype, offset, pd, ld);
|
1999-02-09 00:35:38 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-01-21 20:16:01 +00:00
|
|
|
static void
|
2000-05-16 06:21:33 +00:00
|
|
|
dissect_eth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
2000-01-24 01:15:37 +00:00
|
|
|
{
|
2000-05-15 06:22:07 +00:00
|
|
|
int orig_captured_len;
|
|
|
|
proto_item *ti;
|
2001-03-13 21:34:28 +00:00
|
|
|
const guint8 *dst, *src;
|
2000-05-16 06:21:33 +00:00
|
|
|
const guint8 *pd;
|
2000-05-17 03:05:39 +00:00
|
|
|
|
2001-01-18 07:44:41 +00:00
|
|
|
guint16 etype;
|
2001-02-08 07:08:05 +00:00
|
|
|
volatile gboolean is_802_2;
|
2001-01-18 07:44:41 +00:00
|
|
|
int eth_offset;
|
2000-05-17 03:05:39 +00:00
|
|
|
volatile guint16 length;
|
2001-01-18 08:28:09 +00:00
|
|
|
proto_tree *volatile fh_tree = NULL;
|
2000-05-15 06:22:07 +00:00
|
|
|
|
2000-05-17 03:05:39 +00:00
|
|
|
tvb_compat(tvb, &pd, (int*)ð_offset);
|
|
|
|
|
2000-05-16 06:21:33 +00:00
|
|
|
orig_captured_len = pinfo->captured_len;
|
Add routines to:
register lists of "heuristic" dissectors, which are handed a
frame that may or may contain a payload for the protocol they
dissect, and that return FALSE if it's not or dissect the packet
and return TRUE if it is;
add a dissector to such a list;
go through such a list, calling each dissector until either a
dissector returns TRUE, in which case the routine returns TRUE,
or it runs out of entries in the list, in which case the routine
returns FALSE.
Have lists of heuristic dissectors for TCP and for COTP when used with
the Inactive Subset of CLNP, and add the GIOP and Yahoo Messenger
dissectors to the first list and the Sinec H1 dissector to the second
list.
Make the dissector name argument to "dissector_add()" and
"dissector_delete()" a "const char *" rarther than just a "char *".
Add "heur_dissector_add()", the routine to add a heuristic dissector to
a list of heuristic dissectors, to the set of routines we can export to
plugins through a table on platforms where dynamically-loaded code can't
call stuff in the main program, and initialize the element in the table
in question for "dissector_add()" (which we'd forgotten to do).
svn path=/trunk/; revision=1909
2000-05-05 09:32:36 +00:00
|
|
|
|
2000-05-16 06:21:33 +00:00
|
|
|
if (check_col(pinfo->fd, COL_PROTOCOL))
|
2000-11-19 08:54:37 +00:00
|
|
|
col_set_str(pinfo->fd, COL_PROTOCOL, "Ethernet");
|
Generalize the "ip_src" and "ip_dst" members of the "packet_info"
structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst"
addresses, where an address is an address type, an address length in
bytes, and a pointer to that many bytes.
"dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}"
are the network-layer source/destination; "{src,dst}" are the
source/destination from the highest of those two layers that we have in
the packet.
Add a port type to "packet_info" as well, specifying whether it's a TCP
or UDP port.
Don't set the address and port columns in the dissector functions; just
set the address and port members of the "packet_info" structure. Set
the columns in "fill_in_columns()"; this means that if we're showing
COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate
the string from "src" or "dst", we don't generate a string for the
link-layer address and then overwrite it with a string for the
network-layer address (generating those strings costs CPU).
Add support for "conversations", where a "conversation" is (at present)
a source and destination address and a source and destination port. (In
the future, we may support "conversations" above the transport layer,
e.g. a TFTP conversation, where the first packet goes from the client to
the TFTP server port, but the reply comes back from a different port,
and all subsequent packets go between the client address/port and the
server address/new port, or an NFS conversation, which might include
lock manager, status monitor, and mount packets, as well as NFS
packets.)
Currently, all we support is a call that takes the source and
destination address/port pairs, looks them up in a hash table, and:
if nothing is found, creates a new entry in the hash table, and
assigns it a unique 32-bit conversation ID, and returns that
conversation ID;
if an entry is found, returns its conversation ID.
Use that in the SMB and AFS code to keep track of individual SMB or AFS
conversations. We need to match up requests and replies, as, for
certain replies, the operation code for the request to which it's a
reply doesn't show up in the reply - you have to find the request with a
matching transaction ID. Transaction IDs are per-conversation, so the
hash table for requests should include a conversation ID and transaction
ID as the key.
This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses
transparently (and should allow the SMB decoder to handle NetBIOS atop
other protocols as well, if the source and destination address and port
values in the "packet_info" structure are set appropriately).
In the "Follow TCP Connection" code, check to make sure that the
addresses are IPv4 addressses; ultimately, that code should be changed
to use the conversation code instead, which will let it handle IPv6
transparently.
svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
|
|
|
|
2000-05-16 06:21:33 +00:00
|
|
|
src = tvb_get_ptr(tvb, 6, 6);
|
|
|
|
dst = tvb_get_ptr(tvb, 0, 6);
|
Allow either old-style (pre-tvbuff) or new-style (tvbuffified)
dissectors to be registered as dissectors for particular ports,
registered as heuristic dissectors, and registered as dissectors for
conversations, and have routines to be used both by old-style and
new-style dissectors to call registered dissectors.
Have the code that calls those dissectors translate the arguments as
necessary. (For conversation dissectors, replace
"find_conversation_dissector()", which just returns a pointer to the
dissector, with "old_try_conversation_dissector()" and
"try_conversation_dissector()", which actually call the dissector, so
that there's a single place at which we can do that translation. Also
make "dissector_lookup()" static and, instead of calling it and, if it
returns a non-null pointer, calling that dissector, just use
"old_dissector_try_port()" or "dissector_try_port()", for the same
reason.)
This allows some dissectors that took old-style arguments and
immediately translated them to new-style arguments to just take
new-style arguments; make them do so. It also allows some new-style
dissectors not to have to translate arguments before calling routines to
look up and call dissectors; make them not do so.
Get rid of checks for too-short frames in new-style dissectors - the
tvbuff code does those checks for you.
Give the routines to register old-style dissectors, and to call
dissectors from old-style dissectors, names beginning with "old_", with
the routines for new-style dissectors not having the "old_". Update the
dissectors that use those routines appropriately.
Rename "dissect_data()" to "old_dissect_data()", and
"dissect_data_tvb()" to "dissect_data()".
svn path=/trunk/; revision=2218
2000-08-07 03:21:25 +00:00
|
|
|
SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, src);
|
|
|
|
SET_ADDRESS(&pinfo->src, AT_ETHER, 6, src);
|
|
|
|
SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, dst);
|
|
|
|
SET_ADDRESS(&pinfo->dst, AT_ETHER, 6, dst);
|
1998-09-16 02:39:15 +00:00
|
|
|
|
2000-05-16 06:21:33 +00:00
|
|
|
etype = tvb_get_ntohs(tvb, 12);
|
1998-09-16 02:39:15 +00:00
|
|
|
|
|
|
|
/* either ethernet802.3 or ethernet802.2 */
|
|
|
|
if (etype <= IEEE_802_3_MAX_LEN) {
|
|
|
|
length = etype;
|
|
|
|
|
2001-02-08 07:08:05 +00:00
|
|
|
/* Oh, yuck. Cisco ISL frames require special interpretation of the
|
|
|
|
destination address field; fortunately, they can be recognized by
|
|
|
|
checking the first 5 octets of the destination address, which are
|
|
|
|
01-00-0C-00-00 for ISL frames. */
|
|
|
|
if ( tvb_get_guint8(tvb, 0) == 0x01 &&
|
|
|
|
tvb_get_guint8(tvb, 1) == 0x00 &&
|
|
|
|
tvb_get_guint8(tvb, 2) == 0x0C &&
|
|
|
|
tvb_get_guint8(tvb, 3) == 0x00 &&
|
|
|
|
tvb_get_guint8(tvb, 4) == 0x00 ) {
|
|
|
|
call_dissector(isl_handle, tvb, pinfo, tree);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1999-08-24 06:10:05 +00:00
|
|
|
/* Is there an 802.2 layer? I can tell by looking at the first 2
|
|
|
|
bytes after the 802.3 header. If they are 0xffff, then what
|
|
|
|
follows the 802.3 header is an IPX payload, meaning no 802.2.
|
|
|
|
(IPX/SPX is they only thing that can be contained inside a
|
|
|
|
straight 802.3 packet). A non-0xffff value means that there's an
|
|
|
|
802.2 layer inside the 802.3 layer */
|
2001-02-08 07:08:05 +00:00
|
|
|
is_802_2 = TRUE;
|
2000-05-16 06:21:33 +00:00
|
|
|
TRY {
|
|
|
|
if (tvb_get_ntohs(tvb, 14) == 0xffff) {
|
2001-02-08 07:08:05 +00:00
|
|
|
is_802_2 = FALSE;
|
2000-05-16 06:21:33 +00:00
|
|
|
}
|
1998-09-27 22:12:47 +00:00
|
|
|
}
|
2000-05-16 06:21:33 +00:00
|
|
|
CATCH2(BoundsError, ReportedBoundsError) {
|
|
|
|
; /* do nothing */
|
|
|
|
|
1998-09-27 22:12:47 +00:00
|
|
|
}
|
2000-05-16 06:21:33 +00:00
|
|
|
ENDTRY;
|
1998-09-27 22:12:47 +00:00
|
|
|
|
2000-05-16 06:21:33 +00:00
|
|
|
if (check_col(pinfo->fd, COL_INFO)) {
|
2001-03-22 23:22:23 +00:00
|
|
|
col_add_fstr(pinfo->fd, COL_INFO, "IEEE 802.3 Ethernet %s",
|
2001-02-08 07:08:05 +00:00
|
|
|
(is_802_2 ? "" : "Raw "));
|
1999-08-24 06:10:05 +00:00
|
|
|
}
|
1998-09-16 02:39:15 +00:00
|
|
|
if (tree) {
|
2001-01-18 07:44:41 +00:00
|
|
|
ti = proto_tree_add_protocol_format(tree, proto_eth, tvb, 0, ETH_HEADER_SIZE,
|
2001-03-22 23:22:23 +00:00
|
|
|
"IEEE 802.3 Ethernet %s", (is_802_2 ? "" : "Raw "));
|
1999-07-07 22:52:57 +00:00
|
|
|
|
2001-01-18 07:44:41 +00:00
|
|
|
fh_tree = proto_item_add_subtree(ti, ett_ieee8023);
|
1999-07-07 22:52:57 +00:00
|
|
|
|
2001-01-18 07:44:41 +00:00
|
|
|
proto_tree_add_ether(fh_tree, hf_eth_dst, tvb, 0, 6, dst);
|
|
|
|
proto_tree_add_ether(fh_tree, hf_eth_src, tvb, 6, 6, src);
|
2000-03-20 21:21:33 +00:00
|
|
|
|
|
|
|
/* add items for eth.addr filter */
|
2001-01-18 07:44:41 +00:00
|
|
|
proto_tree_add_ether_hidden(fh_tree, hf_eth_addr, tvb, 0, 6, dst);
|
|
|
|
proto_tree_add_ether_hidden(fh_tree, hf_eth_addr, tvb, 6, 6, src);
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
|
|
|
|
2000-01-23 08:55:37 +00:00
|
|
|
/* Convert the LLC length from the 802.3 header to a total
|
2000-01-24 01:15:37 +00:00
|
|
|
frame length, by adding in the size of any data that preceded
|
|
|
|
the Ethernet header, and adding in the Ethernet header size,
|
|
|
|
and set the payload and captured-payload lengths to the minima
|
Tvbuffify the CDP, CGMP, ISL, and VTP dissectors.
Add a new subdissector table in the LLC dissector for protocol IDs with
a Cisco OUI, and register the CDP, CGMP, and VTMP dissectors in that
table, rather than calling them via a switch statement.
Register the ISL dissector by name, and have the Ethernet dissector call
it via a handle.
Fix the handling of the checksum field in the CDP dissector.
The strings in CDP are counted, not null-terminated; treat them as such.
Fix the handling of the encapsulated frame CRC, and the encapsulated
frame, in the ISL dissector, at least for Ethernet frames; it may not be
correct for encapsulated Token Ring frames.
svn path=/trunk/; revision=2792
2000-12-28 09:49:09 +00:00
|
|
|
of the total length and the frame lengths.
|
|
|
|
|
|
|
|
XXX - when all dissectors are tvbuffified we shouldn't have to
|
|
|
|
do this any more. */
|
2000-05-15 06:22:07 +00:00
|
|
|
length += eth_offset + ETH_HEADER_SIZE;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
if (pinfo->len > length)
|
|
|
|
pinfo->len = length;
|
|
|
|
if (pinfo->captured_len > length)
|
|
|
|
pinfo->captured_len = length;
|
2001-01-18 07:44:41 +00:00
|
|
|
|
2001-02-08 07:08:05 +00:00
|
|
|
dissect_802_3(etype, is_802_2, tvb, ETH_HEADER_SIZE, pinfo, tree, fh_tree,
|
|
|
|
hf_eth_len, hf_eth_trailer);
|
1998-09-27 22:12:47 +00:00
|
|
|
} else {
|
2000-05-16 06:21:33 +00:00
|
|
|
if (check_col(pinfo->fd, COL_INFO))
|
2000-11-19 08:54:37 +00:00
|
|
|
col_set_str(pinfo->fd, COL_INFO, "Ethernet II");
|
1998-09-27 22:12:47 +00:00
|
|
|
if (tree) {
|
2001-01-18 07:44:41 +00:00
|
|
|
ti = proto_tree_add_protocol_format(tree, proto_eth, tvb, 0, ETH_HEADER_SIZE,
|
2000-03-12 04:48:32 +00:00
|
|
|
"Ethernet II");
|
1999-07-07 22:52:57 +00:00
|
|
|
|
2001-01-18 07:44:41 +00:00
|
|
|
fh_tree = proto_item_add_subtree(ti, ett_ether2);
|
1999-07-07 22:52:57 +00:00
|
|
|
|
2001-01-18 07:44:41 +00:00
|
|
|
proto_tree_add_ether(fh_tree, hf_eth_dst, tvb, 0, 6, dst);
|
|
|
|
proto_tree_add_ether(fh_tree, hf_eth_src, tvb, 6, 6, src);
|
2000-03-20 21:21:33 +00:00
|
|
|
/* add items for eth.addr filter */
|
2001-01-18 07:44:41 +00:00
|
|
|
proto_tree_add_ether_hidden(fh_tree, hf_eth_addr, tvb, 0, 6, dst);
|
|
|
|
proto_tree_add_ether_hidden(fh_tree, hf_eth_addr, tvb, 6, 6, src);
|
1998-09-27 22:12:47 +00:00
|
|
|
}
|
1998-09-16 02:39:15 +00:00
|
|
|
|
2001-01-18 07:44:41 +00:00
|
|
|
ethertype(etype, tvb, ETH_HEADER_SIZE, pinfo, tree, fh_tree, hf_eth_type,
|
|
|
|
hf_eth_trailer);
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-07-07 22:52:57 +00:00
|
|
|
void
|
|
|
|
proto_register_eth(void)
|
|
|
|
{
|
1999-07-15 15:33:52 +00:00
|
|
|
static hf_register_info hf[] = {
|
|
|
|
|
|
|
|
{ &hf_eth_dst,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Destination", "eth.dst", FT_ETHER, BASE_NONE, NULL, 0x0,
|
|
|
|
"Destination Hardware Address" }},
|
1999-07-15 15:33:52 +00:00
|
|
|
|
|
|
|
{ &hf_eth_src,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Source", "eth.src", FT_ETHER, BASE_NONE, NULL, 0x0,
|
|
|
|
"Source Hardware Address" }},
|
1999-07-15 15:33:52 +00:00
|
|
|
|
|
|
|
{ &hf_eth_len,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Length", "eth.len", FT_UINT16, BASE_DEC, NULL, 0x0,
|
|
|
|
"" }},
|
1999-07-15 15:33:52 +00:00
|
|
|
|
|
|
|
/* registered here but handled in ethertype.c */
|
|
|
|
{ &hf_eth_type,
|
1999-10-12 06:21:15 +00:00
|
|
|
{ "Type", "eth.type", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0,
|
2000-03-20 21:21:33 +00:00
|
|
|
"" }},
|
|
|
|
{ &hf_eth_addr,
|
|
|
|
{ "Source or Destination Address", "eth.addr", FT_ETHER, BASE_NONE, NULL, 0x0,
|
2000-05-17 03:05:39 +00:00
|
|
|
"Source or Destination Hardware Address" }},
|
|
|
|
|
|
|
|
{ &hf_eth_trailer,
|
|
|
|
{ "Trailer", "eth.trailer", FT_BYTES, BASE_NONE, NULL, 0x0,
|
|
|
|
"Ethernet Trailer or Checksum" }},
|
2000-03-20 21:21:33 +00:00
|
|
|
|
1999-07-08 03:18:20 +00:00
|
|
|
};
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_ieee8023,
|
|
|
|
&ett_ether2,
|
|
|
|
};
|
1999-07-08 03:18:20 +00:00
|
|
|
|
2001-01-03 06:56:03 +00:00
|
|
|
proto_eth = proto_register_protocol("Ethernet", "Ethernet", "eth");
|
1999-07-08 03:18:20 +00:00
|
|
|
proto_register_field_array(proto_eth, hf, array_length(hf));
|
1999-11-16 11:44:20 +00:00
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
2000-11-19 02:00:03 +00:00
|
|
|
|
2001-01-09 06:32:10 +00:00
|
|
|
register_dissector("eth", dissect_eth, proto_eth);
|
1999-07-07 22:52:57 +00:00
|
|
|
}
|
2000-11-29 05:16:15 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
proto_reg_handoff_eth(void)
|
|
|
|
{
|
Tvbuffify the CDP, CGMP, ISL, and VTP dissectors.
Add a new subdissector table in the LLC dissector for protocol IDs with
a Cisco OUI, and register the CDP, CGMP, and VTMP dissectors in that
table, rather than calling them via a switch statement.
Register the ISL dissector by name, and have the Ethernet dissector call
it via a handle.
Fix the handling of the checksum field in the CDP dissector.
The strings in CDP are counted, not null-terminated; treat them as such.
Fix the handling of the encapsulated frame CRC, and the encapsulated
frame, in the ISL dissector, at least for Ethernet frames; it may not be
correct for encapsulated Token Ring frames.
svn path=/trunk/; revision=2792
2000-12-28 09:49:09 +00:00
|
|
|
/*
|
2001-02-08 07:08:05 +00:00
|
|
|
* Get a handle for the ISL dissector.
|
Tvbuffify the CDP, CGMP, ISL, and VTP dissectors.
Add a new subdissector table in the LLC dissector for protocol IDs with
a Cisco OUI, and register the CDP, CGMP, and VTMP dissectors in that
table, rather than calling them via a switch statement.
Register the ISL dissector by name, and have the Ethernet dissector call
it via a handle.
Fix the handling of the checksum field in the CDP dissector.
The strings in CDP are counted, not null-terminated; treat them as such.
Fix the handling of the encapsulated frame CRC, and the encapsulated
frame, in the ISL dissector, at least for Ethernet frames; it may not be
correct for encapsulated Token Ring frames.
svn path=/trunk/; revision=2792
2000-12-28 09:49:09 +00:00
|
|
|
*/
|
|
|
|
isl_handle = find_dissector("isl");
|
|
|
|
|
2001-01-09 06:32:10 +00:00
|
|
|
dissector_add("wtap_encap", WTAP_ENCAP_ETHERNET, dissect_eth,
|
|
|
|
proto_eth);
|
2000-11-29 05:16:15 +00:00
|
|
|
}
|