From 0c39c03bf544a6968d896818561fd591fdc659e7 Mon Sep 17 00:00:00 2001 From: Gilbert Ramirez Date: Thu, 11 May 2000 22:04:18 +0000 Subject: Convert LLC dissector to use tvbuffs. Non-tvbuff dissectors create a tvbuff when calling dissect_llc() Changed name of current_proto to match string in COL_PROTO ("FDDI" instead of "fddi") Changed short text to be: [Short Frame: %s] where %s is current_proto. svn path=/trunk/; revision=1943 --- packet-eth.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'packet-eth.c') diff --git a/packet-eth.c b/packet-eth.c index 3ac60dde14..895e443220 100644 --- a/packet-eth.c +++ b/packet-eth.c @@ -1,7 +1,7 @@ /* packet-eth.c * Routines for ethernet packet disassembly * - * $Id: packet-eth.c,v 1.33 2000/05/11 08:15:08 gram Exp $ + * $Id: packet-eth.c,v 1.34 2000/05/11 22:04:16 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -144,6 +144,7 @@ dissect_eth(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) proto_tree *fh_tree = NULL; proto_item *ti; int ethhdr_type; /* the type of ethernet frame */ + tvbuff_t *next_tvb; if (!BYTES_ARE_IN_FRAME(offset, ETH_HEADER_SIZE)) { dissect_data(pd, offset, fd, tree); @@ -245,7 +246,8 @@ dissect_eth(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) dissect_ipx(pd, offset, fd, tree); break; case ETHERNET_802_2: - dissect_llc(pd, offset, fd, tree); + next_tvb = tvb_new_subset(pi.compat_top_tvb, offset, -1); + dissect_llc(next_tvb, &pi, tree); break; case ETHERNET_II: ethertype(etype, offset, pd, fd, tree, fh_tree, hf_eth_type); -- cgit v1.2.3