diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-12 04:21:21 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-12 04:21:21 +0000 |
| commit | 742cb69433082121f92e8db94dc9202ad7ec35f2 (patch) | |
| tree | d5f7597e8377d49ddb0dceb99439c7291c6ef622 /packet-llc.c | |
| parent | af9016663dcc74c929654d57f3ab605cc2b37560 (diff) | |
| download | wireshark-742cb69433082121f92e8db94dc9202ad7ec35f2.tar.gz wireshark-742cb69433082121f92e8db94dc9202ad7ec35f2.tar.bz2 wireshark-742cb69433082121f92e8db94dc9202ad7ec35f2.zip | |
<sheepish grin>
Fix error in my conversion to tvbuff routines.
Because offset was calculated based on next_tvb, which already knew to
skip 8 bytes, I don't have to use "offset+8" in calls to the next non-tvbuff
dissectors.
</sheepish grin>
svn path=/trunk/; revision=1945
Diffstat (limited to 'packet-llc.c')
| -rw-r--r-- | packet-llc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/packet-llc.c b/packet-llc.c index ae7c452414..9b35a00914 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.57 2000/05/11 22:04:16 gram Exp $ + * $Id: packet-llc.c,v 1.58 2000/05/12 04:21:21 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -357,7 +357,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) OUI_ENCAP_ETHER and an Ethernet packet type for AARP packets. */ if (XDLC_IS_INFORMATION(control)) { - ethertype(etype, offset+8, pd, + ethertype(etype, offset, pd, pinfo->fd, tree, llc_tree, hf_llc_type); } else dissect_data_tvb(next_tvb, pinfo, tree); @@ -378,20 +378,20 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) #if 0 case 0x0102: - dissect_drip(pd, offset+8, pinfo->fd, tree); + dissect_drip(pd, offset, pinfo->fd, tree); break; #endif case 0x2000: - dissect_cdp(pd, offset+8, pinfo->fd, tree); + dissect_cdp(pd, offset, pinfo->fd, tree); break; case 0x2001: - dissect_cgmp(pd, offset+8, pinfo->fd, tree); + dissect_cgmp(pd, offset, pinfo->fd, tree); break; case 0x2003: - dissect_vtp(pd, offset+8, pinfo->fd, tree); + dissect_vtp(pd, offset, pinfo->fd, tree); break; default: @@ -407,7 +407,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(llc_tree, hf_llc_pid, tvb, 6, 2, etype); } - dissect_bpdu(pd, offset+8, pinfo->fd, tree); + dissect_bpdu(pd, offset, pinfo->fd, tree); break; default: |