summaryrefslogtreecommitdiff
path: root/packet-llc.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-01-18 08:32:46 +0000
committerGuy Harris <guy@alum.mit.edu>2004-01-18 08:32:46 +0000
commit5a751f6811f1d73656bf3f10c1c951726013f5f1 (patch)
tree5f69dc150eac8233eefdbc1d4aa153060afd2b32 /packet-llc.c
parent4e702f2b8d3fef7a8e80def7d15e2574d1f9a02b (diff)
downloadwireshark-5a751f6811f1d73656bf3f10c1c951726013f5f1.tar.gz
Add arguments to "dissect_xdlc_control()" to specify value_string
tables, for use in the top-level item for the control field, for unnumbered frame function codes for commands and responses. If the argument is null, default to the standard tables. Use "dissect_xdlc_control()" and the #defines from "xdlc.h" for IrDA. Use the reported length rather than the data length in the IrDA dissector when iterating over the data in an IrDA packet. Make "dissect_xid()" update the column information as well as the protocol tree. Put the slot number into the protocol tree only for command frames - "the slot number field is undefined in discovery XID response frames", to quote the IrLAP spec. svn path=/trunk/; revision=9713
Diffstat (limited to 'packet-llc.c')
-rw-r--r--packet-llc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-llc.c b/packet-llc.c
index 59e5c12470..61932494f5 100644
--- a/packet-llc.c
+++ b/packet-llc.c
@@ -2,7 +2,7 @@
* Routines for IEEE 802.2 LLC layer
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-llc.c,v 1.117 2004/01/03 03:49:22 guy Exp $
+ * $Id: packet-llc.c,v 1.118 2004/01/18 08:32:45 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -386,7 +386,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
control = dissect_xdlc_control(tvb, 2, pinfo, llc_tree,
hf_llc_ctrl, ett_llc_ctrl,
&llc_cf_items, &llc_cf_items_ext,
- ssap & SSAP_CR_BIT, TRUE, FALSE);
+ NULL, NULL, ssap & SSAP_CR_BIT, TRUE, FALSE);
llc_header_len += XDLC_CONTROL_LEN(control, TRUE);
if (is_snap)
llc_header_len += 5; /* 3 bytes of OUI, 2 bytes of protocol ID */