diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-08-07 03:21:25 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-08-07 03:21:25 +0000 |
| commit | 56b989e0adbbbdb7b5f0e9edeb47dc7ebd44ced0 (patch) | |
| tree | 33bbe4cfb92d0ba70d2d9909cfe9763031f5c77c /packet-llc.c | |
| parent | a60203b3c6656798f1be051910a997091b734c2d (diff) | |
Allow either old-style (pre-tvbuff) or new-style (tvbuffified)
dissectors to be registered as dissectors for particular ports,
registered as heuristic dissectors, and registered as dissectors for
conversations, and have routines to be used both by old-style and
new-style dissectors to call registered dissectors.
Have the code that calls those dissectors translate the arguments as
necessary. (For conversation dissectors, replace
"find_conversation_dissector()", which just returns a pointer to the
dissector, with "old_try_conversation_dissector()" and
"try_conversation_dissector()", which actually call the dissector, so
that there's a single place at which we can do that translation. Also
make "dissector_lookup()" static and, instead of calling it and, if it
returns a non-null pointer, calling that dissector, just use
"old_dissector_try_port()" or "dissector_try_port()", for the same
reason.)
This allows some dissectors that took old-style arguments and
immediately translated them to new-style arguments to just take
new-style arguments; make them do so. It also allows some new-style
dissectors not to have to translate arguments before calling routines to
look up and call dissectors; make them not do so.
Get rid of checks for too-short frames in new-style dissectors - the
tvbuff code does those checks for you.
Give the routines to register old-style dissectors, and to call
dissectors from old-style dissectors, names beginning with "old_", with
the routines for new-style dissectors not having the "old_". Update the
dissectors that use those routines appropriately.
Rename "dissect_data()" to "old_dissect_data()", and
"dissect_data_tvb()" to "dissect_data()".
svn path=/trunk/; revision=2218
Diffstat (limited to 'packet-llc.c')
| -rw-r--r-- | packet-llc.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/packet-llc.c b/packet-llc.c index 1f060a9b7d..3373c77420 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.65 2000/05/31 05:07:17 guy Exp $ + * $Id: packet-llc.c,v 1.66 2000/08/07 03:20:48 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -360,7 +360,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ethertype(etype, tvb, 8, pinfo, tree, llc_tree, hf_llc_type); } else - dissect_data_tvb(next_tvb, pinfo, tree); + dissect_data(next_tvb, pinfo, tree); break; case OUI_CISCO: @@ -395,11 +395,11 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: - dissect_data_tvb(next_tvb, pinfo, tree); + dissect_data(next_tvb, pinfo, tree); break; } } else - dissect_data_tvb(next_tvb, pinfo, tree); + dissect_data(next_tvb, pinfo, tree); break; case OUI_CABLE_BPDU: /* DOCSIS cable modem spanning tree BPDU */ @@ -415,7 +415,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(llc_tree, hf_llc_pid, tvb, 6, 2, etype); } - dissect_data_tvb(next_tvb, pinfo, tree); + dissect_data(next_tvb, pinfo, tree); break; } } @@ -434,17 +434,16 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) next_tvb = tvb_new_subset(tvb, llc_header_len, -1, -1); if (XDLC_IS_INFORMATION(control)) { - tvb_compat(tvb, &pd, &offset); /* non-SNAP */ offset += llc_header_len; /* do lookup with the subdissector table */ if (!dissector_try_port(subdissector_table, dsap, - pd, offset, pinfo->fd, tree)) { - dissect_data_tvb(next_tvb, pinfo, tree); + next_tvb, pinfo, tree)) { + dissect_data(next_tvb, pinfo, tree); } } else { - dissect_data_tvb(next_tvb, pinfo, tree); + dissect_data(next_tvb, pinfo, tree); } } } |