forked from osmocom/wireshark
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:
parent
96f81d7eba
commit
d8e818e9da
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -431,6 +431,7 @@ init_plugins(void)
|
|||
g_free(plugins_pers_dir);
|
||||
}
|
||||
}
|
||||
register_all_wiretap_modules();
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue