aboutsummaryrefslogtreecommitdiffstats
path: root/packet-llc.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2000-04-09 18:33:26 +0000
committerGuy Harris <guy@alum.mit.edu>2000-04-09 18:33:26 +0000
commitcd3eccbef8e046dfe6d3432e0704fa890236c4ca (patch)
treef174f1c84f0ff404cdfe17a9049a1efe43c62a47 /packet-llc.c
parentb1bf10bacb0ba3668c99812195dad873c7129255 (diff)
The "llc_ctrl_vals[]" value_string table isn't used to generate the
protocol tree text for the control field - that protocol tree entry is added by "dissect_xdlc_control()", which uses "proto_tree_add_uint_format()" - and it's not a simple enumerated field (which is why "proto_tree_add_uint_format()" is used, to show all the various bits of the field). Eliminate it. svn path=/trunk/; revision=1825
Diffstat (limited to 'packet-llc.c')
-rw-r--r--packet-llc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/packet-llc.c b/packet-llc.c
index 59760b95d9..9baff41bf6 100644
--- a/packet-llc.c
+++ b/packet-llc.c
@@ -2,7 +2,7 @@
* Routines for IEEE 802.2 LLC layer
* Gilbert Ramirez <gramirez@tivoli.com>
*
- * $Id: packet-llc.c,v 1.50 2000/04/08 07:55:11 guy Exp $
+ * $Id: packet-llc.c,v 1.51 2000/04/09 18:33:26 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -445,7 +445,7 @@ dissect_llc(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
"Group" : "Individual",
val_to_str(pd[offset+1] & SAP_MASK, sap_vals, "%02x"),
pd[offset+1] & SSAP_CR_BIT ?
- "Command" : "Response"
+ "Response" : "Command"
);
}
@@ -461,8 +461,10 @@ dissect_llc(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
else {
dissect_data(pd, offset, fd, tree);
}
- } else
+ } else {
+ offset += llc_header_len;
dissect_data(pd, offset, fd, tree);
+ }
}
}