diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-08-07 03:21:25 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-08-07 03:21:25 +0000 |
commit | d0b97c7d7f4ef5fd35c566a79f20afff08aabcd6 (patch) | |
tree | 33bbe4cfb92d0ba70d2d9909cfe9763031f5c77c /packet-ipp.c | |
parent | 3d70b052d045de2fdf59185b1c1d744e54e63587 (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()".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2218 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-ipp.c')
-rw-r--r-- | packet-ipp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-ipp.c b/packet-ipp.c index 8bd685005a..7cfd73e90b 100644 --- a/packet-ipp.c +++ b/packet-ipp.c @@ -3,7 +3,7 @@ * * Guy Harris <guy@alum.mit.edu> * - * $Id: packet-ipp.c,v 1.10 2000/05/31 05:07:09 guy Exp $ + * $Id: packet-ipp.c,v 1.11 2000/08/07 03:20:41 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -228,7 +228,7 @@ void dissect_ipp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) offset = parse_attributes(pd, offset, fd, ipp_tree); if (IS_DATA_IN_FRAME(offset)) - dissect_data(pd, offset, fd, ipp_tree); + old_dissect_data(pd, offset, fd, ipp_tree); } } @@ -584,6 +584,6 @@ proto_reg_handoff_ipp(void) Or should the HTTP dissector decide that the payload is IPP based on the MIME headers? */ - dissector_add("tcp.port", 631, dissect_http); + old_dissector_add("tcp.port", 631, dissect_http); } |