diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-31 03:58:56 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-31 03:58:56 +0000 |
| commit | aa553f63ecc7b9e310a05b743502c50f6dffb800 (patch) | |
| tree | 51fbaf8816a6c74cd38581bc4c2eda79a91f9246 /packet-llc.c | |
| parent | fa8b1d4e8b3882975514518232e429eaa5e41659 (diff) | |
| download | wireshark-aa553f63ecc7b9e310a05b743502c50f6dffb800.tar.gz | |
Convert LAPD and V.120 dissector to use tvbuff. Convert xdlc dissector-helper,
too.
svn path=/trunk/; revision=2030
Diffstat (limited to 'packet-llc.c')
| -rw-r--r-- | packet-llc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/packet-llc.c b/packet-llc.c index 8ea2942d69..b18544c68d 100644 --- a/packet-llc.c +++ b/packet-llc.c @@ -2,7 +2,7 @@ * Routines for IEEE 802.2 LLC layer * Gilbert Ramirez <gram@xiexie.org> * - * $Id: packet-llc.c,v 1.63 2000/05/28 22:02:17 guy Exp $ + * $Id: packet-llc.c,v 1.64 2000/05/31 03:58:54 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -313,10 +313,9 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * uses extended operation, so we don't need to determine * whether it's basic or extended operation; is that the case? */ - tvb_compat(tvb, &pd, &offset); - control = dissect_xdlc_control(pd, offset+2, pinfo->fd, llc_tree, + control = dissect_xdlc_control(tvb, 2, pinfo, llc_tree, hf_llc_ctrl, ett_llc_ctrl, - pd[offset+1] & SSAP_CR_BIT, TRUE); + tvb_get_guint8(tvb, 1) & SSAP_CR_BIT, TRUE); llc_header_len += XDLC_CONTROL_LEN(control, TRUE); if (is_snap) llc_header_len += 5; /* 3 bytes of OUI, 2 bytes of protocol ID */ |