From f8783ef2faf90cd0a2d4c98608afc70ebd2b58ca Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 27 Nov 2001 07:13:32 +0000 Subject: 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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4281 f5534014-38df-0310-8fa8-9805f1628bb7 --- packet-ipp.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'packet-ipp.c') 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 * - * $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 + * By Gerald Combs * 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)) { -- cgit v1.2.3