Make sure that wiretap plugins are loaded before dissectors are (if a new encap type is registered the plugin probably needs it before reg_handoff)

svn path=/trunk/; revision=22461
This commit is contained in:
Luis Ontanon 2007-08-07 20:07:43 +00:00
parent 96f81d7eba
commit d8e818e9da
5 changed files with 1 additions and 4 deletions

View File

@ -283,7 +283,6 @@ int main(int argc, char *argv[])
} else {
init_report_err(failure_message,NULL,NULL);
init_plugins();
register_all_wiretap_modules();
}
#endif

View File

@ -396,7 +396,6 @@ int main(int argc, char *argv[])
} else {
init_report_err(failure_message,NULL,NULL);
init_plugins();
register_all_wiretap_modules();
}
#endif

View File

@ -431,6 +431,7 @@ init_plugins(void)
g_free(plugins_pers_dir);
}
}
register_all_wiretap_modules();
}
void

View File

@ -2407,7 +2407,6 @@ main(int argc, char *argv[])
#ifdef HAVE_PLUGINS
register_all_plugin_tap_listeners();
register_all_wiretap_modules();
#endif
register_all_tap_listeners();

View File

@ -792,7 +792,6 @@ main(int argc, char *argv[])
by stats_tree_stat.c and need to registered before that */
#ifdef HAVE_PLUGINS
register_all_plugin_tap_listeners();
register_all_wiretap_modules();
#endif
register_all_tap_listeners();