diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-11-16 23:17:27 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-11-16 23:17:27 +0000 |
commit | e1d4ae571f1026d344d9364e16bd6628af6d4bb2 (patch) | |
tree | 564e732958fa7b21a0ce2aaf6f0123b674ea3a71 /disabled_protos.c | |
parent | e28479bb2dbc17a6547812767e82c24bb6ec1ad2 (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 'disabled_protos.c')
-rw-r--r-- | disabled_protos.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/disabled_protos.c b/disabled_protos.c index f2cb3ce9ec..bb3c68e840 100644 --- a/disabled_protos.c +++ b/disabled_protos.c @@ -1,7 +1,7 @@ /* disabled_protos.c * Code for reading and writing the disabled protocols file. * - * $Id: disabled_protos.c,v 1.2 2003/08/07 01:05:06 guy Exp $ + * $Id: disabled_protos.c,v 1.3 2003/11/16 23:17:15 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -272,6 +272,7 @@ save_disabled_protos_list(char **pref_path_return, int *errno_return) gchar *ff_path, *ff_path_new, *ff_name; FILE *ff; gint i; + protocol_t *protocol; void *cookie; *pref_path_return = NULL; /* assume no error */ @@ -302,7 +303,8 @@ save_disabled_protos_list(char **pref_path_return, int *errno_return) continue; } - if (proto_is_protocol_enabled(i)) { + protocol = find_protocol_by_id(i); + if (proto_is_protocol_enabled(protocol)) { continue; } |