diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-11-16 23:17:27 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-11-16 23:17:27 +0000 |
| commit | 7bd2e232a9994756ba0f97d4d93ce64fe885e7df (patch) | |
| tree | 564e732958fa7b21a0ce2aaf6f0123b674ea3a71 /packet-smb-pipe.c | |
| parent | 21313199e4282797e5cbebb039c417cf8fca739f (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.
svn path=/trunk/; revision=8979
Diffstat (limited to 'packet-smb-pipe.c')
| -rw-r--r-- | packet-smb-pipe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c index a5946de45c..3062ce6db4 100644 --- a/packet-smb-pipe.c +++ b/packet-smb-pipe.c @@ -8,7 +8,7 @@ XXX Fixme : shouldnt show [malformed frame] for long packets * significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and * Guy Harris 2001 * - * $Id: packet-smb-pipe.c,v 1.96 2003/09/03 20:58:09 guy Exp $ + * $Id: packet-smb-pipe.c,v 1.97 2003/11/16 23:17:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -2598,7 +2598,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb, proto_item *data_item; proto_tree *data_tree; - if (!proto_is_protocol_enabled(proto_smb_lanman)) + if (!proto_is_protocol_enabled(find_protocol_by_id(proto_smb_lanman))) return FALSE; if (smb_info->request && p_tvb == NULL) { /* @@ -3494,7 +3494,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, int fid = -1; guint16 info_level; - if (!proto_is_protocol_enabled(proto_smb_pipe)) + if (!proto_is_protocol_enabled(find_protocol_by_id(proto_smb_pipe))) return FALSE; pinfo->current_proto = "SMB Pipe"; |