Refactor plugin registration and loading

Put different types of plugins (libwiretap, libwireshark) in different
subdirectories, give libwiretap and libwireshark init routines that
load the plugins, and have them scan the appropriate subdirectories
so that we don't even *try* to, for example, load libwireshark plugins
in programs that only use libwiretap.

Compiled plugins are stored in subfolders of the plugin folders, with
the subfolder name being the Wireshark minor version number (X.Y). There is
another hierarchical level for each Wireshark library (libwireshark, libwscodecs
and libwiretap).

The folder names are respectively plugins/X.Y/{epan,codecs,wiretap}.

Currently we only distribute "epan" (libwireshark) plugins.

Change-Id: I3438787a6f45820d64ba4ca91cbe3c8864708acb
Reviewed-on: https://code.wireshark.org/review/23983
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>

5 files changed, 8 insertions, 8 deletions

diff --git a/debian/libwireshark0.install b/debian/libwireshark0.install
index 087cd229da..ce0509437c 100644
--- a/debian/libwireshark0.install
+++ b/debian/libwireshark0.install
@@ -1,2 +1,2 @@
 usr/lib/*/libwireshark.so.*
-usr/lib/*/wireshark/plugins/*/*.so
+usr/lib/*/wireshark/plugins/*/epan/*.so
diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols
index e9a3dc5e94..320cbbae79 100644
--- a/debian/libwireshark0.symbols
+++ b/debian/libwireshark0.symbols
@@ -533,7 +533,6 @@ libwireshark.so.0 libwireshark0 #MINVER#
  epan_load_settings@Base 2.3.0
  epan_memmem@Base 1.9.1
  epan_new@Base 1.12.0~rc1
- epan_register_plugin_types@Base 1.12.0~rc1
  epan_strcasestr@Base 1.9.1
  escape_string@Base 1.9.1
  escape_string_len@Base 1.9.1
@@ -1116,6 +1115,7 @@ libwireshark.so.0 libwireshark0 #MINVER#
  proto_register_field_array@Base 1.9.1
  proto_register_fields_manual@Base 1.12.0~rc1
  proto_register_fields_section@Base 1.12.0~rc1
+ proto_register_plugin@Base 2.5.0
  proto_register_prefix@Base 1.9.1
  proto_register_protocol@Base 1.9.1
  proto_register_protocol_in_name_only@Base 2.3.0
@@ -1283,7 +1283,6 @@ libwireshark.so.0 libwireshark0 #MINVER#
  reassembly_table_register@Base 2.3.0
  reassembly_table_destroy@Base 1.9.1
  reassembly_table_init@Base 1.9.1
- register_all_plugin_tap_listeners@Base 1.9.1
  register_all_protocol_handoffs@Base 1.9.1
  register_all_protocols@Base 1.9.1
  register_ber_oid_dissector@Base 2.1.0
@@ -1498,6 +1497,7 @@ libwireshark.so.0 libwireshark0 #MINVER#
  tap_listeners_dfilter_recompile@Base 2.0.0
  tap_listeners_require_dissection@Base 1.9.1
  tap_queue_packet@Base 1.9.1
+ tap_register_plugin@Base 2.5.0
  tcp_dissect_pdus@Base 1.9.1
  tcp_port_to_display@Base 1.99.2
  tfs_accept_reject@Base 1.9.1
diff --git a/debian/libwiretap0.symbols b/debian/libwiretap0.symbols
index 9bd1a34b8e..b6a25d9008 100644
--- a/debian/libwiretap0.symbols
+++ b/debian/libwiretap0.symbols
@@ -16,7 +16,6 @@ libwiretap.so.0 libwiretap0 #MINVER#
  merge_string_to_idb_merge_mode@Base 1.99.9
  open_info_name_to_type@Base 1.12.0~rc1
  open_routines@Base 1.12.0~rc1
- register_all_wiretap_modules@Base 1.12.0~rc1
  register_pcapng_block_type_handler@Base 1.99.0
  register_pcapng_option_handler@Base 1.99.2
  wtap_block_add_custom_option@Base 2.1.2
@@ -127,6 +126,7 @@ libwiretap.so.0 libwiretap0 #MINVER#
  wtap_register_file_type_extension@Base 1.12.0~rc1
  wtap_register_file_type_subtypes@Base 1.12.0~rc1
  wtap_register_open_info@Base 1.12.0~rc1
+ wtap_register_plugin@Base 2.5.0
  wtap_seek_read@Base 1.9.1
  wtap_sequential_close@Base 1.9.1
  wtap_set_bytes_dumped@Base 1.9.1
diff --git a/debian/libwscodecs0.symbols b/debian/libwscodecs0.symbols
index 522525c5e3..b83aa5f1b5 100644
--- a/debian/libwscodecs0.symbols
+++ b/debian/libwscodecs0.symbols
@@ -3,11 +3,12 @@ libwscodecs.so.0 libwscodecs0 #MINVER#
  codec_get_channels@Base 2.1.0
  codec_get_frequency@Base 2.1.0
  codec_init@Base 2.1.0
- codec_register_plugin_types@Base 2.1.0
  codec_release@Base 2.1.0
  deregister_codec@Base 2.1.0
  find_codec@Base 2.1.0
- register_all_codecs@Base 2.1.0
+ codecs_init@Base 2.5.0
+ codecs_cleanup@Base 2.5.0
+ codecs_register_plugin@Base 2.5.0
  codec_get_compiled_version_info@Base 2.3.0
  register_codec@Base 2.1.0
  ws_codec_resampler_destroy@Base 2.1.0
diff --git a/debian/libwsutil0.symbols b/debian/libwsutil0.symbols
index e3fc6d4e85..dec3b35c7e 100644
--- a/debian/libwsutil0.symbols
+++ b/debian/libwsutil0.symbols
@@ -1,7 +1,6 @@
 libwsutil.so.0 libwsutil0 #MINVER#
  AirPDcapWepDecrypt@Base 1.10.0
  Eax_Decrypt@Base 1.12.0~rc1
- add_plugin_type@Base 1.12.0~rc1
  adler32_bytes@Base 1.12.0~rc1
  adler32_str@Base 1.12.0~rc1
  alaw2linear@Base 1.12.0~rc1
@@ -139,7 +138,7 @@ libwsutil.so.0 libwsutil0 #MINVER#
  rsa_privkey_to_sexp@Base 2.5.0
  running_in_build_directory@Base 1.12.0~rc1
  running_with_special_privs@Base 1.10.0
- scan_plugins@Base 1.12.0~rc1
+ plugins_init@Base 2.5.0
  set_persconffile_dir@Base 1.12.0~rc1
  set_persdatafile_dir@Base 1.12.0~rc1
  set_profile_name@Base 1.12.0~rc1