diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-19 11:01:56 +0200 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-19 10:47:10 +0000 |
commit | a383e692c8774c2451a55d8b3f8ef9db5d037329 (patch) | |
tree | ab6223527915ab1127a50563981816adc18b971f /tshark.c | |
parent | ff845123f1f1ecef0d8e0d8980e6e9d7267e5f6b (diff) | |
download | wireshark-a383e692c8774c2451a55d8b3f8ef9db5d037329.tar.gz |
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 <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'tshark.c')
-rw-r--r-- | tshark.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1196,8 +1196,14 @@ main(int argc, char *argv[]) init_open_routines(); #ifdef HAVE_PLUGINS + /* Register all the plugin types we have. */ + epan_register_plugin_types(); /* Types known to libwireshark */ wtap_register_plugin_types(); /* Types known to libwiretap */ + /* 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 |