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-bpdu.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-bpdu.c')
-rw-r--r-- | packet-bpdu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-bpdu.c b/packet-bpdu.c index 316238646e..8256ba737a 100644 --- a/packet-bpdu.c +++ b/packet-bpdu.c @@ -1,7 +1,7 @@ /* packet-bpdu.c * Routines for BPDU (Spanning Tree Protocol) disassembly * - * $Id: packet-bpdu.c,v 1.11 2000/05/31 05:06:56 guy Exp $ + * $Id: packet-bpdu.c,v 1.12 2000/08/07 03:20:25 guy Exp $ * * Copyright 1999 Christophe Tronche <ch.tronche@computer.org> * @@ -146,7 +146,7 @@ void dissect_bpdu(const u_char *pd, int offset, frame_data *fd, proto_tree *tree bpdu_type == 0x80 ? "Topology Change Notification" : "Unknown"); if (bpdu_type != 0) { - dissect_data(pd, offset + BPDU_TYPE + 1, fd, tree); + old_dissect_data(pd, offset + BPDU_TYPE + 1, fd, tree); return; } @@ -267,5 +267,5 @@ proto_register_bpdu(void) void proto_reg_handoff_bpdu(void) { - dissector_add("llc.dsap", SAP_BPDU, dissect_bpdu); + old_dissector_add("llc.dsap", SAP_BPDU, dissect_bpdu); } |