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-fcip.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-fcip.c')
| -rw-r--r-- | packet-fcip.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/packet-fcip.c b/packet-fcip.c index 5cc7bef5bf..9406096717 100644 --- a/packet-fcip.c +++ b/packet-fcip.c @@ -2,7 +2,7 @@ * Routines for FCIP dissection * Copyright 2001, Dinesh G Dutt (ddutt@cisco.com) * - * $Id: packet-fcip.c,v 1.8 2003/10/30 02:06:11 guy Exp $ + * $Id: packet-fcip.c,v 1.9 2003/11/16 23:17:17 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -388,9 +388,6 @@ dissect_fcip (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *fcip_tree = NULL; tvbuff_t *next_tvb; - if (!proto_is_protocol_enabled(proto_fcip)) - return FALSE; /* iSCSI has been disabled */ - if (bytes_remaining < FCIP_ENCAP_HEADER_LEN) { return FALSE; } |