aboutsummaryrefslogtreecommitdiffstats
path: root/packet-giop.h
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2003-11-16 23:17:27 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2003-11-16 23:17:27 +0000
commite1d4ae571f1026d344d9364e16bd6628af6d4bb2 (patch)
tree564e732958fa7b21a0ce2aaf6f0123b674ea3a71 /packet-giop.h
parente28479bb2dbc17a6547812767e82c24bb6ec1ad2 (diff)
Export "protocol_t" as an opaque type.
Make "proto_is_protocol_enabled()" and "proto_get_protocol_short_name()" take a "protocol_t *" as an argument, so they don't have to look up the "protocol_t" - this will probably speed them up considerably, and they're called on almost every dissector handoff. Get rid of a number of "proto_is_protocol_enabled()" calls that aren't necessary (dissectors called through handles, including those called through dissector tables, or called as heuristic dissectors, aren't even called if their protocol isn't enabled). Change some direct dissector calls to go through handles. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8979 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-giop.h')
-rw-r--r--packet-giop.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-giop.h b/packet-giop.h
index ad4d67eaee..96a63a5aff 100644
--- a/packet-giop.h
+++ b/packet-giop.h
@@ -4,7 +4,7 @@
*
* Based on CORBAv2.4.2 Chapter 15 GIOP Description.
*
- * $Id: packet-giop.h,v 1.10 2002/08/28 21:00:13 jmayer Exp $
+ * $Id: packet-giop.h,v 1.11 2003/11/16 23:17:18 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -106,7 +106,7 @@ typedef gboolean (giop_sub_dissector_t)(tvbuff_t *, packet_info *, proto_tree *,
typedef struct giop_sub_handle {
giop_sub_dissector_t *sub_fn; /* ptr to sub dissector function */
gchar *sub_name; /* subdissector string name */
- int sub_proto; /* proto_XXX value from proto_register_protocol() */
+ protocol_t *sub_proto; /* protocol_t for subprotocol */
} giop_sub_handle_t;
/* Main GIOP entry point */