diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-04-03 09:37:39 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-04-03 09:37:39 +0000 |
| commit | 7678c401dd54acfa4b7efed39276a3a1b08e3968 (patch) | |
| tree | 5d9dcaad646365b31e0254e9fae35574c26cb0ad /packet-tcp.c | |
| parent | c7d11f582d5f9acbb790e4f060a84e96b9238239 (diff) | |
| download | wireshark-7678c401dd54acfa4b7efed39276a3a1b08e3968.tar.gz wireshark-7678c401dd54acfa4b7efed39276a3a1b08e3968.tar.bz2 wireshark-7678c401dd54acfa4b7efed39276a3a1b08e3968.zip | |
Fix a compile error introduced by the previous checkin, which also moved
the check for plugins after the check for ONC RPC protocols, so that we
do the checks in the same order for TCP and UDP (ONC RPC first, as we
expect the RPC heuristics not to get false hits, and ONC RPC protocols
could well use ports that are nominally assigned to other protocols).
svn path=/trunk/; revision=1780
Diffstat (limited to 'packet-tcp.c')
| -rw-r--r-- | packet-tcp.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/packet-tcp.c b/packet-tcp.c index af79c45247..11cacec0a5 100644 --- a/packet-tcp.c +++ b/packet-tcp.c @@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c,v 1.61 2000/04/03 09:24:07 guy Exp $ + * $Id: packet-tcp.c,v 1.62 2000/04/03 09:37:39 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -517,16 +517,18 @@ dissect_tcp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { /* try to apply the plugins */ #ifdef HAVE_PLUGINS - plugin *pt_plug = plugin_list; - - if (pt_plug) { - while (pt_plug) { - if (pt_plug->enabled && !strcmp(pt_plug->protocol, "tcp") && - tree && dfilter_apply(pt_plug->filter, tree, pd)) { - pt_plug->dissector(pd, offset, fd, tree); - goto reas; + { + plugin *pt_plug = plugin_list; + + if (pt_plug) { + while (pt_plug) { + if (pt_plug->enabled && !strcmp(pt_plug->protocol, "tcp") && + tree && dfilter_apply(pt_plug->filter, tree, pd)) { + pt_plug->dissector(pd, offset, fd, tree); + goto reas; + } + pt_plug = pt_plug->next; } - pt_plug = pt_plug->next; } } #endif @@ -690,4 +692,3 @@ proto_register_tcp(void) dissector_add( "tcp.port", TCP_PORT_SRVLOC, &dissect_srvloc); dissector_add( "tcp.port", TCP_PORT_NCP, &dissect_ncp); } - |