osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Move the warning "...SercosIII heuristic dissector cannot be registered.." to the handoff routine as sercosIII most probably will 

not have registered it's name when opensafty's register routine is executed e.g the warning will always be printed.

svn path=/trunk/; revision=37615
This commit is contained in:
Anders Broman 2011-06-08 12:02:38 +00:00
parent 65b2467999
commit 30a3988111
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
epan/dissectors/packet-opensafety.c
View File

@ -1589,14 +1589,6 @@ proto_register_opensafety(void)
new_register_dissector("opensafety", dissect_opensafety, proto_opensafety);
/* For SercosIII we have check if the plugin is available, and throw a warning if not.
* Here we do not abort, as the UDP part of SercosIII can still be dissected. If the
* user asked for termination of the program by WIRESHARK_ABORT_ON_DISSECTOR_BUG we
* report the dissector bug, which will lead to an abort() call. */
if ( find_dissector("sercosiii") == NULL )
{
g_warning ( "openSAFETY - SercosIII heuristic dissector cannot be registered, openSAFETY/SercosIII native dissection." );
}
new_register_dissector("opensafety_siii", dissect_opensafety_siii, proto_opensafety);
}
@ -1632,6 +1624,7 @@ proto_reg_handoff_opensafety(void)
* the ethernet subdissector list. No SercosIII specific data will be dissected
* and a warning will be displayed, recognizing the missing dissector plugin.
*/
g_warning ( "openSAFETY - SercosIII heuristic dissector cannot be registered, openSAFETY/SercosIII native dissection." );
dissector_add_uint("ethertype", ETHERTYPE_SERCOS, find_dissector("opensafety_siii"));
}
}