diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2009-07-13 22:29:59 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2009-07-13 22:29:59 +0000 |
| commit | 668e9b693a187e381b75253b72d274e84fdb8eee (patch) | |
| tree | 2091370d1da5f12b21e4bde1d9f1a9de20e21e2f /epan/dissectors/packet-llc.c | |
| parent | e3be7b8b2534127cfa72c268a92effd49130c624 (diff) | |
Fix for bug 3710:
Use the derived length of the control field i.s.o. assuming its size.
svn path=/trunk/; revision=29087
Diffstat (limited to 'epan/dissectors/packet-llc.c')
| -rw-r--r-- | epan/dissectors/packet-llc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index 11c5c8a3ac..8e743e541e 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -307,7 +307,7 @@ capture_llc(const guchar *pd, int offset, int len, packet_counts *ld) { return; } if (is_snap) - capture_snap(pd, offset+3, len, ld); + capture_snap(pd, offset+llc_header_len, len, ld); else { /* non-SNAP */ switch (pd[offset]) { @@ -518,7 +518,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item_set_len(ti, llc_header_len); if (is_snap) { - dissect_snap(tvb, 3, pinfo, tree, llc_tree, control, + dissect_snap(tvb, 2+XDLC_CONTROL_LEN(control, TRUE), pinfo, tree, llc_tree, control, hf_llc_oui, hf_llc_type, hf_llc_pid, 2); } else { |