diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-03-21 15:51:12 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-03-22 03:19:10 +0000 |
| commit | c362dc7a52c595237223938c0ad20304a5528017 (patch) | |
| tree | 2ac8e6e6f2b8c65ab467d6d7a31cc2f7a79d5707 /randpkt.c | |
| parent | 51984de040b804ca6614830acc62c641cd6d8959 (diff) | |
Fix randpkt and reordercap.
Copy over recent wiretap plugin changes from mergecap, otherwise
randpkt and reordercap will crash.
Change-Id: I70111ded3d9a5c4380b964b2c5b626599eebc327
Reviewed-on: https://code.wireshark.org/review/14546
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'randpkt.c')
| -rw-r--r-- | randpkt.c | 50 |
1 files changed, 50 insertions, 0 deletions
@@ -27,7 +27,14 @@ #include <wsutil/ws_diag_control.h> #include <wsutil/unicode-utils.h> #include <wsutil/file_util.h> +#include <wsutil/filesystem.h> +#include <wsutil/privileges.h> +#ifdef HAVE_PLUGINS +#include <wsutil/plugins.h> +#endif + +#include <wsutil/report_err.h> #ifdef HAVE_GETOPT_H #include <getopt.h> #endif @@ -38,6 +45,19 @@ #include "randpkt_core/randpkt_core.h" +#ifdef HAVE_PLUGINS +/* + * Don't report failures to load plugins because most (non-wiretap) plugins + * *should* fail to load (because we're not linked against libwireshark and + * dissector plugins need libwireshark). + */ +static void +failure_message(const char *msg_format _U_, va_list ap _U_) +{ + return; +} +#endif + /* Print usage statement and exit program */ static void usage(gboolean is_error) @@ -91,11 +111,41 @@ main(int argc, char **argv) {0, 0, 0, 0 } }; +#ifdef HAVE_PLUGINS + char *init_progfile_dir_error; +#endif + + /* + * Get credential information for later use. + */ + init_process_policies(); + init_open_routines(); + #ifdef _WIN32 arg_list_utf_16to8(argc, argv); create_app_running_mutex(); #endif /* _WIN32 */ +#ifdef HAVE_PLUGINS + /* Register wiretap plugins */ + if ((init_progfile_dir_error = init_progfile_dir(argv[0], main))) { + g_warning("randpkt: init_progfile_dir(): %s", init_progfile_dir_error); + g_free(init_progfile_dir_error); + } else { + /* Register all the plugin types we have. */ + wtap_register_plugin_types(); /* Types known to libwiretap */ + + init_report_err(failure_message,NULL,NULL,NULL); + + /* Scan for plugins. This does *not* call their registration routines; + that's done later. */ + scan_plugins(); + + /* Register all libwiretap plugin modules. */ + register_all_wiretap_modules(); + } +#endif + while ((opt = getopt_long(argc, argv, "b:c:ht:r", long_options, NULL)) != -1) { switch (opt) { case 'b': /* max bytes */ |