osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Guy Harris 2000-04-03 09:37:39 +00:00
parent c7d11f582d
commit 7678c401dd
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packet-tcp.c
View File

@ -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;
{
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;
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);
}