diff options
Diffstat (limited to 'plugins')
31 files changed, 53 insertions, 103 deletions
diff --git a/plugins/Makefile.am.inc b/plugins/Makefile.am.inc index e3731c1039..62c8ae1002 100644 --- a/plugins/Makefile.am.inc +++ b/plugins/Makefile.am.inc @@ -28,6 +28,12 @@ PLUGIN_CFLAGS = PLUGIN_LDFLAGS = -module -avoid-version +epan_plugindir = $(plugindir)/epan + +wiretap_plugindir = $(plugindir)/wiretap + +codecs_plugindir = $(plugindir)/codecs + # # Source files are divided up along several axes: # diff --git a/plugins/docsis/CMakeLists.txt b/plugins/docsis/CMakeLists.txt index 3c43e8723c..190a6491eb 100644 --- a/plugins/docsis/CMakeLists.txt +++ b/plugins/docsis/CMakeLists.txt @@ -54,13 +54,9 @@ register_plugin_files(plugin.c ${DISSECTOR_SRC} ) -add_plugin_library(docsis) +add_plugin_library(docsis epan) -install(TARGETS docsis - LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR} NAMELINK_SKIP - RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR} -) +install_plugin(docsis epan) file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") CHECKAPI( diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am index 30462edb11..03c9e9b55a 100644 --- a/plugins/docsis/Makefile.am +++ b/plugins/docsis/Makefile.am @@ -46,7 +46,7 @@ HEADER_FILES = \ $(FLEX_GENERATED_HEADER_FILES) \ $(CLEAN_HEADER_FILES) -plugin_LTLIBRARIES = docsis.la +epan_plugin_LTLIBRARIES = docsis.la docsis_la_SOURCES = \ moduleinfo.h \ diff --git a/plugins/ethercat/CMakeLists.txt b/plugins/ethercat/CMakeLists.txt index 540e103c35..6c227b46ec 100644 --- a/plugins/ethercat/CMakeLists.txt +++ b/plugins/ethercat/CMakeLists.txt @@ -56,13 +56,9 @@ register_plugin_files(plugin.c ${DISSECTOR_SRC} ) -add_plugin_library(ethercat) +add_plugin_library(ethercat epan) -install(TARGETS ethercat - LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR} NAMELINK_SKIP - RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR} -) +install_plugin(ethercat epan) file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") CHECKAPI( diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am index d05cb72b11..a9c470714b 100644 --- a/plugins/ethercat/Makefile.am +++ b/plugins/ethercat/Makefile.am @@ -53,7 +53,7 @@ CLEAN_HEADER_FILES = \ HEADER_FILES = \ $(CLEAN_HEADER_FILES) -plugin_LTLIBRARIES = ethercat.la +epan_plugin_LTLIBRARIES = ethercat.la ethercat_la_SOURCES = \ moduleinfo.h \ diff --git a/plugins/gryphon/CMakeLists.txt b/plugins/gryphon/CMakeLists.txt index 5ed378d9cc..d6ecb662f4 100644 --- a/plugins/gryphon/CMakeLists.txt +++ b/plugins/gryphon/CMakeLists.txt @@ -50,13 +50,9 @@ register_plugin_files(plugin.c ${DISSECTOR_SRC} ) -add_plugin_library(gryphon) +add_plugin_library(gryphon epan) -install(TARGETS gryphon - LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR} NAMELINK_SKIP - RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR} -) +install_plugin(gryphon epan) file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") CHECKAPI( diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am index b114653f40..b794d14d5d 100644 --- a/plugins/gryphon/Makefile.am +++ b/plugins/gryphon/Makefile.am @@ -42,7 +42,7 @@ CLEAN_HEADER_FILES = \ HEADER_FILES = \ $(CLEAN_HEADER_FILES) -plugin_LTLIBRARIES = gryphon.la +epan_plugin_LTLIBRARIES = gryphon.la gryphon_la_SOURCES = \ moduleinfo.h \ diff --git a/plugins/irda/CMakeLists.txt b/plugins/irda/CMakeLists.txt index 26ddaa288e..c30026b91d 100644 --- a/plugins/irda/CMakeLists.txt +++ b/plugins/irda/CMakeLists.txt @@ -52,13 +52,9 @@ register_plugin_files(plugin.c ${DISSECTOR_SRC} ) -add_plugin_library(irda) +add_plugin_library(irda epan) -install(TARGETS irda - LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR} NAMELINK_SKIP - RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR} -) +install_plugin(irda epan) file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") CHECKAPI( diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am index 0435845931..fe24fdfd02 100644 --- a/plugins/irda/Makefile.am +++ b/plugins/irda/Makefile.am @@ -44,7 +44,7 @@ CLEAN_HEADER_FILES = \ HEADER_FILES = \ $(CLEAN_HEADER_FILES) -plugin_LTLIBRARIES = irda.la +epan_plugin_LTLIBRARIES = irda.la irda_la_SOURCES = \ moduleinfo.h \ diff --git a/plugins/mate/CMakeLists.txt b/plugins/mate/CMakeLists.txt index 4ff179c396..509145447f 100644 --- a/plugins/mate/CMakeLists.txt +++ b/plugins/mate/CMakeLists.txt @@ -72,13 +72,9 @@ register_plugin_files(plugin.c ${DISSECTOR_SUPPORT_SRC} ) -add_plugin_library(mate) +add_plugin_library(mate epan) -install(TARGETS mate - LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR} NAMELINK_SKIP - RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR} -) +install_plugin(mate epan) file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") CHECKAPI( diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index f894233d8b..171701a3de 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/Makefile.am @@ -74,7 +74,7 @@ HEADER_FILES = \ #AM_CFLAGS += -Werror #endif -plugin_LTLIBRARIES = mate.la +epan_plugin_LTLIBRARIES = mate.la mate_la_SOURCES = \ moduleinfo.h \ diff --git a/plugins/opcua/CMakeLists.txt b/plugins/opcua/CMakeLists.txt index a05ed4da01..ca1dc9e34e 100644 --- a/plugins/opcua/CMakeLists.txt +++ b/plugins/opcua/CMakeLists.txt @@ -66,13 +66,9 @@ register_plugin_files(plugin.c ${DISSECTOR_SUPPORT_SRC} ) -add_plugin_library(opcua) +add_plugin_library(opcua epan) -install(TARGETS opcua - LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR} NAMELINK_SKIP - RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR} -) +install_plugin(opcua epan) file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") CHECKAPI( diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am index bc2d383486..6617da7d79 100644 --- a/plugins/opcua/Makefile.am +++ b/plugins/opcua/Makefile.am @@ -66,7 +66,7 @@ CLEAN_HEADER_FILES = \ HEADER_FILES = \ $(CLEAN_HEADER_FILES) -plugin_LTLIBRARIES = opcua.la +epan_plugin_LTLIBRARIES = opcua.la opcua_la_SOURCES = \ moduleinfo.h \ diff --git a/plugins/pluginifdemo/CMakeLists.txt b/plugins/pluginifdemo/CMakeLists.txt index cc1b3a1eb1..2125a1e9b3 100644 --- a/plugins/pluginifdemo/CMakeLists.txt +++ b/plugins/pluginifdemo/CMakeLists.txt @@ -65,15 +65,11 @@ register_plugin_files(plugin.c ${DISSECTOR_SRC} ) -add_plugin_library(pluginifdemo) +add_plugin_library(pluginifdemo epan) target_link_libraries(pluginifdemo Qt5::Core Qt5::Widgets Qt5::PrintSupport) -install(TARGETS pluginifdemo - LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR} NAMELINK_SKIP - RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR} -) +install_plugin(pluginifdemo epan) file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") CHECKAPI( diff --git a/plugins/pluginifdemo/Makefile.am b/plugins/pluginifdemo/Makefile.am index efe26b8642..c91d380305 100644 --- a/plugins/pluginifdemo/Makefile.am +++ b/plugins/pluginifdemo/Makefile.am @@ -42,7 +42,7 @@ CLEAN_HEADER_FILES = \ HEADER_FILES = \ $(CLEAN_HEADER_FILES) -plugin_LTLIBRARIES = pluginifdemo.la +epan_plugin_LTLIBRARIES = pluginifdemo.la pluginifdemo_la_SOURCES = \ moduleinfo.h \ diff --git a/plugins/profinet/CMakeLists.txt b/plugins/profinet/CMakeLists.txt index cc5d228e1e..86798676f1 100644 --- a/plugins/profinet/CMakeLists.txt +++ b/plugins/profinet/CMakeLists.txt @@ -64,13 +64,9 @@ register_plugin_files(plugin.c ${DISSECTOR_SUPPORT_SRC} ) -add_plugin_library(profinet) +add_plugin_library(profinet epan) -install(TARGETS profinet - LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR} NAMELINK_SKIP - RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR} -) +install_plugin(profinet epan) file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") CHECKAPI( diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am index ef59001ca8..6e636d7c19 100644 --- a/plugins/profinet/Makefile.am +++ b/plugins/profinet/Makefile.am @@ -52,7 +52,7 @@ CLEAN_HEADER_FILES = \ HEADER_FILES = \ $(CLEAN_HEADER_FILES) -plugin_LTLIBRARIES = profinet.la +epan_plugin_LTLIBRARIES = profinet.la profinet_la_SOURCES = \ moduleinfo.h \ diff --git a/plugins/stats_tree/CMakeLists.txt b/plugins/stats_tree/CMakeLists.txt index dff44ee105..92172c72d3 100644 --- a/plugins/stats_tree/CMakeLists.txt +++ b/plugins/stats_tree/CMakeLists.txt @@ -39,13 +39,9 @@ set_source_files_properties( COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) -add_plugin_library(stats_tree) +add_plugin_library(stats_tree epan) -install(TARGETS stats_tree - LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR} NAMELINK_SKIP - RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR} -) +install_plugin(stats_tree epan) file(GLOB PLUGIN_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") CHECKAPI( diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am index 91f4bd7bc7..513cd2b7fa 100644 --- a/plugins/stats_tree/Makefile.am +++ b/plugins/stats_tree/Makefile.am @@ -37,7 +37,7 @@ CLEAN_HEADER_FILES = \ HEADER_FILES = \ $(CLEAN_HEADER_FILES) -plugin_LTLIBRARIES = stats_tree.la +epan_plugin_LTLIBRARIES = stats_tree.la stats_tree_la_SOURCES = \ $(SRC_FILES) \ diff --git a/plugins/stats_tree/pinfo_stats_tree.h b/plugins/stats_tree/pinfo_stats_tree.h index a2bc0a1ce4..ef8952ca5a 100644 --- a/plugins/stats_tree/pinfo_stats_tree.h +++ b/plugins/stats_tree/pinfo_stats_tree.h @@ -23,5 +23,3 @@ */ extern void register_pinfo_stat_trees(void); - -WS_DLL_PUBLIC void plugin_register_tap_listener(void); diff --git a/plugins/stats_tree/stats_tree_plugin.c b/plugins/stats_tree/stats_tree_plugin.c index b2d685e332..ad82f105c9 100644 --- a/plugins/stats_tree/stats_tree_plugin.c +++ b/plugins/stats_tree/stats_tree_plugin.c @@ -30,15 +30,17 @@ #include "ws_symbol_export.h" #include <epan/stats_tree.h> - #include "pinfo_stats_tree.h" WS_DLL_PUBLIC_DEF const gchar plugin_version[] = "0.0.1"; WS_DLL_PUBLIC_DEF const gchar plugin_release[] = VERSION_RELEASE; -WS_DLL_PUBLIC_DEF void plugin_register_tap_listener(void) +WS_DLL_PUBLIC_DEF void plugin_register(void) { - register_pinfo_stat_trees(); + static tap_plugin plug; + + plug.register_tap_listener = register_pinfo_stat_trees; + tap_register_plugin(&plug); } /* diff --git a/plugins/transum/CMakeLists.txt b/plugins/transum/CMakeLists.txt index bf3ca9057c..c814704da8 100644 --- a/plugins/transum/CMakeLists.txt +++ b/plugins/transum/CMakeLists.txt @@ -57,13 +57,9 @@ register_plugin_files(plugin.c ${DISSECTOR_SUPPORT_SRC} ) -add_plugin_library(transum) +add_plugin_library(transum epan) -install(TARGETS transum - LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR} NAMELINK_SKIP - RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR} -) +install_plugin(transum epan) file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") CHECKAPI( diff --git a/plugins/transum/Makefile.am b/plugins/transum/Makefile.am index c058b98467..c277eec746 100644 --- a/plugins/transum/Makefile.am +++ b/plugins/transum/Makefile.am @@ -47,7 +47,7 @@ CLEAN_HEADER_FILES = \ HEADER_FILES = \ $(CLEAN_HEADER_FILES) -plugin_LTLIBRARIES = transum.la +epan_plugin_LTLIBRARIES = transum.la transum_la_SOURCES = \ moduleinfo.h \ diff --git a/plugins/unistim/CMakeLists.txt b/plugins/unistim/CMakeLists.txt index c6c01abeff..e9472df64e 100644 --- a/plugins/unistim/CMakeLists.txt +++ b/plugins/unistim/CMakeLists.txt @@ -50,13 +50,9 @@ register_plugin_files(plugin.c ${DISSECTOR_SRC} ) -add_plugin_library(unistim) +add_plugin_library(unistim epan) -install(TARGETS unistim - LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR} NAMELINK_SKIP - RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR} -) +install_plugin(unistim epan) file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") CHECKAPI( diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am index 13f6655b52..db3cf331f4 100644 --- a/plugins/unistim/Makefile.am +++ b/plugins/unistim/Makefile.am @@ -51,7 +51,7 @@ CLEAN_HEADER_FILES = \ HEADER_FILES = \ $(CLEAN_HEADER_FILES) -plugin_LTLIBRARIES = unistim.la +epan_plugin_LTLIBRARIES = unistim.la unistim_la_SOURCES = \ moduleinfo.h \ diff --git a/plugins/wimax/CMakeLists.txt b/plugins/wimax/CMakeLists.txt index dd52bdfede..8d7d201060 100644 --- a/plugins/wimax/CMakeLists.txt +++ b/plugins/wimax/CMakeLists.txt @@ -97,13 +97,9 @@ register_plugin_files(plugin.c ${DISSECTOR_SUPPORT_SRC} ) -add_plugin_library(wimax) +add_plugin_library(wimax epan) -install(TARGETS wimax - LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR} NAMELINK_SKIP - RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR} -) +install_plugin(wimax epan) file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") CHECKAPI( diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am index 0dc0d90d02..33ee4897e2 100644 --- a/plugins/wimax/Makefile.am +++ b/plugins/wimax/Makefile.am @@ -91,7 +91,7 @@ CLEAN_HEADER_FILES = \ HEADER_FILES = \ $(CLEAN_HEADER_FILES) -plugin_LTLIBRARIES = wimax.la +epan_plugin_LTLIBRARIES = wimax.la wimax_la_SOURCES = \ moduleinfo.h \ diff --git a/plugins/wimaxasncp/CMakeLists.txt b/plugins/wimaxasncp/CMakeLists.txt index 65bb7c3c3b..b2abc0ca31 100644 --- a/plugins/wimaxasncp/CMakeLists.txt +++ b/plugins/wimaxasncp/CMakeLists.txt @@ -55,13 +55,9 @@ register_plugin_files(plugin.c ${DISSECTOR_SRC} ) -add_plugin_library(wimaxasncp) +add_plugin_library(wimaxasncp epan) -install(TARGETS wimaxasncp - LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR} NAMELINK_SKIP - RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR} -) +install_plugin(wimaxasncp epan) file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") CHECKAPI( diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am index 001fd4b86f..1780926429 100644 --- a/plugins/wimaxasncp/Makefile.am +++ b/plugins/wimaxasncp/Makefile.am @@ -61,7 +61,7 @@ HEADER_FILES = \ #AM_CFLAGS += -Werror #endif -plugin_LTLIBRARIES = wimaxasncp.la +epan_plugin_LTLIBRARIES = wimaxasncp.la wimaxasncp_la_SOURCES = \ moduleinfo.h \ diff --git a/plugins/wimaxmacphy/CMakeLists.txt b/plugins/wimaxmacphy/CMakeLists.txt index 22cd50ad82..62040932c6 100644 --- a/plugins/wimaxmacphy/CMakeLists.txt +++ b/plugins/wimaxmacphy/CMakeLists.txt @@ -50,13 +50,9 @@ register_plugin_files(plugin.c ${DISSECTOR_SRC} ) -add_plugin_library(wimaxmacphy) +add_plugin_library(wimaxmacphy epan) -install(TARGETS wimaxmacphy - LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR} NAMELINK_SKIP - RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR} -) +install_plugin(wimaxmacphy epan) file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") CHECKAPI( diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/wimaxmacphy/Makefile.am index b145943dc4..27750a8ca6 100644 --- a/plugins/wimaxmacphy/Makefile.am +++ b/plugins/wimaxmacphy/Makefile.am @@ -42,7 +42,7 @@ CLEAN_HEADER_FILES = \ HEADER_FILES = \ $(CLEAN_HEADER_FILES) -plugin_LTLIBRARIES = wimaxmacphy.la +epan_plugin_LTLIBRARIES = wimaxmacphy.la wimaxmacphy_la_SOURCES = \ moduleinfo.h \ |