aboutsummaryrefslogtreecommitdiffstats
path: root/packet-v120.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-v120.c
parent4e702f2b8d3fef7a8e80def7d15e2574d1f9a02b (diff)
downloadwireshark-5a751f6811f1d73656bf3f10c1c951726013f5f1.tar.gz
wireshark-5a751f6811f1d73656bf3f10c1c951726013f5f1.tar.bz2
wireshark-5a751f6811f1d73656bf3f10c1c951726013f5f1.zip
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-v120.c')
-rw-r--r--packet-v120.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-v120.c b/packet-v120.c
index 610ea7eab0..9512a66de7 100644
--- a/packet-v120.c
+++ b/packet-v120.c
@@ -2,7 +2,7 @@
* Routines for v120 frame disassembly
* Bert Driehuis <driehuis@playbeing.org>
*
- * $Id: packet-v120.c,v 1.32 2004/01/03 03:49:22 guy Exp $
+ * $Id: packet-v120.c,v 1.33 2004/01/18 08:32:46 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -165,7 +165,7 @@ dissect_v120(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
control = dissect_xdlc_control(tvb, 2, pinfo, v120_tree, hf_v120_control,
ett_v120_control, &v120_cf_items, &v120_cf_items_ext,
- is_response, TRUE, FALSE);
+ NULL, NULL, is_response, TRUE, FALSE);
if (tree) {
v120len = 2 + XDLC_CONTROL_LEN(control, TRUE);
if (tvb_bytes_exist(tvb, v120len, 1))