diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-11-27 07:13:32 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-11-27 07:13:32 +0000 |
| commit | 07b2709f8a32951cc2503d2e048d662a01cb472c (patch) | |
| tree | 21d265bf7402a2739905bd87227383ae0a9f78ab /packet-ipp.c | |
| parent | fd456eaf0b5af46449882983b95529e073fd989f (diff) | |
Change "conversation_set_dissector()" to take a dissector handle, rather
than a pointer to a dissector function, as an argument.
This means that the conversation dissector is called through
"call_dissector()", so the dissector itself doesn't have to worry about
checking whether the protocol is enabled or setting
"pinfo->current_proto", so get rid of the code that does that in
conversation dissectors. Also, make the conversation dissectors static.
Get rid of some direct calls to dissectors; replace them with calls
through handles, and, again, get rid of code to check whether a protocol
is enabled and set "pinfo->current_proto" where that code isn't needed.
Make those dissectors static if they aren't already static.
Add a routine "create_dissector_handle()" to create a dissector handle
without registering it by name, if the dissector isn't used outside the
module in which it's defined.
svn path=/trunk/; revision=4281
Diffstat (limited to 'packet-ipp.c')
| -rw-r--r-- | packet-ipp.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/packet-ipp.c b/packet-ipp.c index 1854990b63..faf7b57572 100644 --- a/packet-ipp.c +++ b/packet-ipp.c @@ -3,12 +3,11 @@ * * Guy Harris <guy@alum.mit.edu> * - * $Id: packet-ipp.c,v 1.24 2001/11/26 05:13:11 hagbard Exp $ + * $Id: packet-ipp.c,v 1.25 2001/11/27 07:13:25 guy Exp $ * * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> + * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -171,10 +170,6 @@ dissect_ipp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 status_code; gchar *status_fmt; - CHECK_DISPLAY_AS_X(data_handle,proto_ipp, tvb, pinfo, tree); - - pinfo->current_proto = "IPP"; - if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "IPP"); if (check_col(pinfo->fd, COL_INFO)) { |