From a383e692c8774c2451a55d8b3f8ef9db5d037329 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Sun, 19 Jun 2016 11:01:56 +0200 Subject: Revert "tap: change glib functions to wmem." This reverts commit 2e9f3c5d366eaa7139fc877b5301392166b3f985. It breaks the registration of codec, dissector and libwiretap plugins. Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de Reviewed-on: https://code.wireshark.org/review/16012 Petri-Dish: Pascal Quantin Reviewed-by: Pascal Quantin --- dftest.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'dftest.c') diff --git a/dftest.c b/dftest.c index 1bd146ee7e..9b4276ecac 100644 --- a/dftest.c +++ b/dftest.c @@ -82,6 +82,15 @@ main(int argc, char **argv) timestamp_set_type(TS_RELATIVE); timestamp_set_seconds_type(TS_SECONDS_DEFAULT); +#ifdef HAVE_PLUGINS + /* Register all the plugin types we have. */ + epan_register_plugin_types(); /* Types known to libwireshark */ + + /* Scan for plugins. This does *not* call their registration routines; + that's done later. */ + scan_plugins(); +#endif + /* Register all dissectors; we must do this before checking for the "-g" flag, as the "-g" flag dumps a list of fields registered by the dissectors, and we must do it before we read the preferences, -- cgit v1.2.1