From 5352ef42f94b5c14a24eb2e5559440c71fdcae8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Mon, 15 Jan 2018 12:40:55 +0000 Subject: [PATCH] plugins: Add source tree subfolder for plugin library MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows some simplification and makes things more consistent, particularly for loading plugins from the build dir. Also fixes the issue reported here: https://www.wireshark.org/lists/wireshark-dev/201801/msg00061.html Change-Id: I0d8a000ee679172bccad546a3b0c47a79486f44d Reviewed-on: https://code.wireshark.org/review/25329 Petri-Dish: João Valverde Reviewed-by: João Valverde --- CMakeLists.txt | 26 ++-- cmake/modules/WiresharkPlugin.cmake | 12 +- configure.ac | 26 ++-- plugins/Custom.m4.example | 2 +- plugins/Custom.make.example | 2 +- plugins/Makefile.am | 26 ++-- plugins/{ => epan}/docsis/AUTHORS | 0 plugins/{ => epan}/docsis/CMakeLists.txt | 0 plugins/{ => epan}/docsis/ChangeLog | 0 plugins/{ => epan}/docsis/Makefile.am | 2 +- plugins/{ => epan}/docsis/README | 0 plugins/{ => epan}/docsis/packet-docsis.c | 0 plugins/{ => epan}/docsis/packet-macmgmt.c | 0 plugins/{ => epan}/docsis/packet-tlv.c | 0 plugins/{ => epan}/docsis/packet-tlv.h | 0 plugins/{ => epan}/docsis/packet-vendor.c | 0 plugins/{ => epan}/ethercat/AUTHORS | 0 plugins/{ => epan}/ethercat/CMakeLists.txt | 0 plugins/{ => epan}/ethercat/Makefile.am | 2 +- plugins/{ => epan}/ethercat/packet-ams.c | 0 plugins/{ => epan}/ethercat/packet-ams.h | 0 plugins/{ => epan}/ethercat/packet-ecatmb.c | 0 plugins/{ => epan}/ethercat/packet-ecatmb.h | 0 plugins/{ => epan}/ethercat/packet-esl.c | 0 .../ethercat/packet-ethercat-datagram.c | 0 .../ethercat/packet-ethercat-datagram.h | 0 .../ethercat/packet-ethercat-frame.c | 0 .../ethercat/packet-ethercat-frame.h | 0 plugins/{ => epan}/ethercat/packet-ioraw.c | 0 plugins/{ => epan}/ethercat/packet-ioraw.h | 0 plugins/{ => epan}/ethercat/packet-nv.c | 0 plugins/{ => epan}/ethercat/packet-nv.h | 0 plugins/{ => epan}/gryphon/AUTHORS | 0 plugins/{ => epan}/gryphon/CMakeLists.txt | 0 plugins/{ => epan}/gryphon/Makefile.am | 2 +- plugins/{ => epan}/gryphon/README | 0 plugins/{ => epan}/gryphon/packet-gryphon.c | 0 plugins/{ => epan}/gryphon/packet-gryphon.h | 0 plugins/{ => epan}/irda/CMakeLists.txt | 0 plugins/{ => epan}/irda/Makefile.am | 2 +- plugins/{ => epan}/irda/irda-appl.h | 0 plugins/{ => epan}/irda/packet-ircomm.c | 0 plugins/{ => epan}/irda/packet-irda.c | 0 plugins/{ => epan}/irda/packet-sir.c | 0 plugins/{ => epan}/mate/AUTHORS | 0 plugins/{ => epan}/mate/CMakeLists.txt | 0 plugins/{ => epan}/mate/Makefile.am | 2 +- plugins/{ => epan}/mate/examples/call.mate | 0 plugins/{ => epan}/mate/examples/mms.mate | 0 .../{ => epan}/mate/examples/pasv_ftp.mate | 0 plugins/{ => epan}/mate/examples/tcp.mate | 0 plugins/{ => epan}/mate/examples/web.mate | 0 plugins/{ => epan}/mate/mate.h | 0 plugins/{ => epan}/mate/mate_grammar.lemon | 0 plugins/{ => epan}/mate/mate_parser.l | 0 plugins/{ => epan}/mate/mate_runtime.c | 0 plugins/{ => epan}/mate/mate_setup.c | 0 plugins/{ => epan}/mate/mate_util.c | 0 plugins/{ => epan}/mate/mate_util.h | 0 plugins/{ => epan}/mate/matelib/dns.mate | 0 plugins/{ => epan}/mate/matelib/h225_ras.mate | 0 plugins/{ => epan}/mate/matelib/isup.mate | 0 plugins/{ => epan}/mate/matelib/megaco.mate | 0 plugins/{ => epan}/mate/matelib/q931.mate | 0 plugins/{ => epan}/mate/matelib/radius.mate | 0 plugins/{ => epan}/mate/matelib/rtsp.mate | 0 plugins/{ => epan}/mate/matelib/sip.mate | 0 plugins/{ => epan}/mate/packet-mate.c | 0 plugins/{ => epan}/opcua/AUTHORS | 0 plugins/{ => epan}/opcua/CMakeLists.txt | 0 plugins/{ => epan}/opcua/ChangeLog | 0 plugins/{ => epan}/opcua/Doxyfile | 0 plugins/{ => epan}/opcua/Makefile.am | 2 +- plugins/{ => epan}/opcua/README | 0 plugins/{ => epan}/opcua/opcua.c | 0 .../opcua/opcua_application_layer.c | 0 .../opcua/opcua_application_layer.h | 0 .../opcua/opcua_complextypeparser.c | 0 .../opcua/opcua_complextypeparser.h | 0 plugins/{ => epan}/opcua/opcua_enumparser.c | 0 plugins/{ => epan}/opcua/opcua_enumparser.h | 0 .../opcua/opcua_extensionobjectids.h | 0 .../opcua/opcua_extensionobjecttable.c | 0 plugins/{ => epan}/opcua/opcua_hfindeces.c | 0 plugins/{ => epan}/opcua/opcua_hfindeces.h | 0 plugins/{ => epan}/opcua/opcua_identifiers.h | 0 .../{ => epan}/opcua/opcua_security_layer.c | 0 .../{ => epan}/opcua/opcua_security_layer.h | 0 plugins/{ => epan}/opcua/opcua_serviceids.h | 0 .../{ => epan}/opcua/opcua_serviceparser.c | 0 .../{ => epan}/opcua/opcua_serviceparser.h | 0 plugins/{ => epan}/opcua/opcua_servicetable.c | 0 plugins/{ => epan}/opcua/opcua_servicetable.h | 0 plugins/{ => epan}/opcua/opcua_simpletypes.c | 0 plugins/{ => epan}/opcua/opcua_simpletypes.h | 0 plugins/{ => epan}/opcua/opcua_statuscode.c | 0 plugins/{ => epan}/opcua/opcua_statuscode.h | 0 .../{ => epan}/opcua/opcua_transport_layer.c | 0 .../{ => epan}/opcua/opcua_transport_layer.h | 0 plugins/{ => epan}/pluginifdemo/AUTHORS | 0 .../{ => epan}/pluginifdemo/CMakeLists.txt | 0 plugins/{ => epan}/pluginifdemo/Makefile.am | 2 +- plugins/{ => epan}/pluginifdemo/README | 0 .../{ => epan}/pluginifdemo/pluginifdemo.c | 0 .../{ => epan}/pluginifdemo/pluginifdemo.h | 0 .../pluginifdemo/ui/pluginifdemo_about.cpp | 0 .../pluginifdemo/ui/pluginifdemo_about.h | 0 .../pluginifdemo/ui/pluginifdemo_about.ui | 0 .../pluginifdemo/ui/pluginifdemo_main.cpp | 0 .../pluginifdemo/ui/pluginifdemo_main.h | 0 .../pluginifdemo/ui/pluginifdemo_main.ui | 0 .../pluginifdemo/ui/uiclasshandler.cpp | 0 .../{ => epan}/pluginifdemo/ui/uihandler.cpp | 0 .../{ => epan}/pluginifdemo/ui/uihandler.h | 0 plugins/{ => epan}/profinet/AUTHORS | 0 plugins/{ => epan}/profinet/CMakeLists.txt | 0 plugins/{ => epan}/profinet/ChangeLog | 0 plugins/{ => epan}/profinet/Makefile.am | 2 +- .../{ => epan}/profinet/packet-dcerpc-pn-io.c | 0 .../profinet/packet-dcom-cba-acco.c | 0 .../profinet/packet-dcom-cba-acco.h | 0 plugins/{ => epan}/profinet/packet-dcom-cba.c | 0 plugins/{ => epan}/profinet/packet-pn-dcp.c | 0 plugins/{ => epan}/profinet/packet-pn-mrp.c | 0 plugins/{ => epan}/profinet/packet-pn-mrrt.c | 0 plugins/{ => epan}/profinet/packet-pn-ptcp.c | 0 plugins/{ => epan}/profinet/packet-pn-rt.c | 0 .../{ => epan}/profinet/packet-pn-rtc-one.c | 0 plugins/{ => epan}/profinet/packet-pn.c | 0 plugins/{ => epan}/profinet/packet-pn.h | 0 plugins/{ => epan}/stats_tree/AUTHORS | 0 plugins/{ => epan}/stats_tree/CMakeLists.txt | 0 plugins/{ => epan}/stats_tree/Makefile.am | 2 +- .../{ => epan}/stats_tree/pinfo_stats_tree.c | 0 .../{ => epan}/stats_tree/pinfo_stats_tree.h | 0 .../{ => epan}/stats_tree/stats_tree_plugin.c | 0 plugins/{ => epan}/transum/AUTHORS | 0 plugins/{ => epan}/transum/CMakeLists.txt | 0 plugins/{ => epan}/transum/Makefile.am | 2 +- plugins/{ => epan}/transum/README | 0 plugins/{ => epan}/transum/decoders.c | 0 plugins/{ => epan}/transum/decoders.h | 0 plugins/{ => epan}/transum/extractors.c | 0 plugins/{ => epan}/transum/extractors.h | 0 plugins/{ => epan}/transum/packet-transum.c | 0 plugins/{ => epan}/transum/packet-transum.h | 0 plugins/{ => epan}/transum/preferences.h | 0 plugins/{ => epan}/unistim/AUTHORS | 0 plugins/{ => epan}/unistim/CMakeLists.txt | 0 plugins/{ => epan}/unistim/ChangeLog | 0 plugins/{ => epan}/unistim/Makefile.am | 2 +- plugins/{ => epan}/unistim/TODO | 0 plugins/{ => epan}/unistim/audio.h | 0 plugins/{ => epan}/unistim/basic.h | 0 plugins/{ => epan}/unistim/broadcast.h | 0 plugins/{ => epan}/unistim/defines.h | 0 plugins/{ => epan}/unistim/display.h | 0 plugins/{ => epan}/unistim/expansion.h | 0 plugins/{ => epan}/unistim/key.h | 0 plugins/{ => epan}/unistim/network.h | 0 plugins/{ => epan}/unistim/packet-unistim.c | 0 plugins/{ => epan}/unistim/packet-unistim.h | 0 plugins/{ => epan}/unistim/uftp.h | 0 plugins/{ => epan}/wimax/AUTHORS | 0 plugins/{ => epan}/wimax/CMakeLists.txt | 0 plugins/{ => epan}/wimax/Makefile.am | 2 +- plugins/{ => epan}/wimax/README.wimax | 0 plugins/{ => epan}/wimax/crc.c | 0 plugins/{ => epan}/wimax/crc.h | 0 plugins/{ => epan}/wimax/crc_data.c | 0 .../{ => epan}/wimax/mac_hd_generic_decoder.c | 0 .../{ => epan}/wimax/mac_hd_type1_decoder.c | 0 .../{ => epan}/wimax/mac_hd_type2_decoder.c | 0 .../{ => epan}/wimax/mac_mgmt_msg_decoder.c | 0 plugins/{ => epan}/wimax/msg_aas_beam.c | 0 plugins/{ => epan}/wimax/msg_aas_fbck.c | 0 plugins/{ => epan}/wimax/msg_arq.c | 0 plugins/{ => epan}/wimax/msg_clk_cmp.c | 0 plugins/{ => epan}/wimax/msg_dcd.c | 0 plugins/{ => epan}/wimax/msg_dlmap.c | 0 plugins/{ => epan}/wimax/msg_dreg.c | 0 plugins/{ => epan}/wimax/msg_dsa.c | 0 plugins/{ => epan}/wimax/msg_dsc.c | 0 plugins/{ => epan}/wimax/msg_dsd.c | 0 plugins/{ => epan}/wimax/msg_dsx_rvd.c | 0 plugins/{ => epan}/wimax/msg_fpc.c | 0 plugins/{ => epan}/wimax/msg_pkm.c | 0 plugins/{ => epan}/wimax/msg_pmc.c | 0 plugins/{ => epan}/wimax/msg_prc_lt_ctrl.c | 0 plugins/{ => epan}/wimax/msg_reg_req.c | 0 plugins/{ => epan}/wimax/msg_reg_rsp.c | 0 plugins/{ => epan}/wimax/msg_rep.c | 0 plugins/{ => epan}/wimax/msg_res_cmd.c | 0 plugins/{ => epan}/wimax/msg_rng_req.c | 0 plugins/{ => epan}/wimax/msg_rng_rsp.c | 0 plugins/{ => epan}/wimax/msg_sbc.c | 0 plugins/{ => epan}/wimax/msg_ucd.c | 0 plugins/{ => epan}/wimax/msg_ulmap.c | 0 plugins/{ => epan}/wimax/packet-m2m.c | 0 plugins/{ => epan}/wimax/packet-wmx.c | 0 plugins/{ => epan}/wimax/wimax-int.h | 0 plugins/{ => epan}/wimax/wimax_bits.h | 0 .../wimax/wimax_cdma_code_decoder.c | 0 .../wimax/wimax_compact_dlmap_ie_decoder.c | 0 .../wimax/wimax_compact_dlmap_ie_decoder.h | 0 .../wimax/wimax_compact_ulmap_ie_decoder.c | 0 .../wimax/wimax_compact_ulmap_ie_decoder.h | 0 plugins/{ => epan}/wimax/wimax_fch_decoder.c | 0 plugins/{ => epan}/wimax/wimax_ffb_decoder.c | 0 plugins/{ => epan}/wimax/wimax_hack_decoder.c | 0 .../{ => epan}/wimax/wimax_harq_map_decoder.c | 0 plugins/{ => epan}/wimax/wimax_mac.h | 0 plugins/{ => epan}/wimax/wimax_pdu_decoder.c | 0 .../wimax/wimax_phy_attributes_decoder.c | 0 plugins/{ => epan}/wimax/wimax_tlv.c | 0 plugins/{ => epan}/wimax/wimax_tlv.h | 0 plugins/{ => epan}/wimax/wimax_utils.c | 0 plugins/{ => epan}/wimax/wimax_utils.h | 0 plugins/{ => epan}/wimaxasncp/AUTHORS | 0 plugins/{ => epan}/wimaxasncp/CMakeLists.txt | 0 plugins/{ => epan}/wimaxasncp/ChangeLog | 0 plugins/{ => epan}/wimaxasncp/Makefile.am | 2 +- .../{ => epan}/wimaxasncp/packet-wimaxasncp.c | 0 .../{ => epan}/wimaxasncp/wimaxasncp_dict.h | 0 .../{ => epan}/wimaxasncp/wimaxasncp_dict.l | 0 plugins/{ => epan}/wimaxmacphy/AUTHORS | 0 plugins/{ => epan}/wimaxmacphy/CMakeLists.txt | 0 plugins/{ => epan}/wimaxmacphy/ChangeLog | 0 plugins/{ => epan}/wimaxmacphy/Makefile.am | 2 +- .../wimaxmacphy/packet-wimaxmacphy.c | 0 .../wimaxmacphy/packet-wimaxmacphy.h | 0 ui/voip_calls.c | 2 +- wsutil/plugins.c | 146 +++++++++--------- 233 files changed, 132 insertions(+), 138 deletions(-) rename plugins/{ => epan}/docsis/AUTHORS (100%) rename plugins/{ => epan}/docsis/CMakeLists.txt (100%) rename plugins/{ => epan}/docsis/ChangeLog (100%) rename plugins/{ => epan}/docsis/Makefile.am (97%) rename plugins/{ => epan}/docsis/README (100%) rename plugins/{ => epan}/docsis/packet-docsis.c (100%) rename plugins/{ => epan}/docsis/packet-macmgmt.c (100%) rename plugins/{ => epan}/docsis/packet-tlv.c (100%) rename plugins/{ => epan}/docsis/packet-tlv.h (100%) rename plugins/{ => epan}/docsis/packet-vendor.c (100%) rename plugins/{ => epan}/ethercat/AUTHORS (100%) rename plugins/{ => epan}/ethercat/CMakeLists.txt (100%) rename plugins/{ => epan}/ethercat/Makefile.am (97%) rename plugins/{ => epan}/ethercat/packet-ams.c (100%) rename plugins/{ => epan}/ethercat/packet-ams.h (100%) rename plugins/{ => epan}/ethercat/packet-ecatmb.c (100%) rename plugins/{ => epan}/ethercat/packet-ecatmb.h (100%) rename plugins/{ => epan}/ethercat/packet-esl.c (100%) rename plugins/{ => epan}/ethercat/packet-ethercat-datagram.c (100%) rename plugins/{ => epan}/ethercat/packet-ethercat-datagram.h (100%) rename plugins/{ => epan}/ethercat/packet-ethercat-frame.c (100%) rename plugins/{ => epan}/ethercat/packet-ethercat-frame.h (100%) rename plugins/{ => epan}/ethercat/packet-ioraw.c (100%) rename plugins/{ => epan}/ethercat/packet-ioraw.h (100%) rename plugins/{ => epan}/ethercat/packet-nv.c (100%) rename plugins/{ => epan}/ethercat/packet-nv.h (100%) rename plugins/{ => epan}/gryphon/AUTHORS (100%) rename plugins/{ => epan}/gryphon/CMakeLists.txt (100%) rename plugins/{ => epan}/gryphon/Makefile.am (97%) rename plugins/{ => epan}/gryphon/README (100%) rename plugins/{ => epan}/gryphon/packet-gryphon.c (100%) rename plugins/{ => epan}/gryphon/packet-gryphon.h (100%) rename plugins/{ => epan}/irda/CMakeLists.txt (100%) rename plugins/{ => epan}/irda/Makefile.am (97%) rename plugins/{ => epan}/irda/irda-appl.h (100%) rename plugins/{ => epan}/irda/packet-ircomm.c (100%) rename plugins/{ => epan}/irda/packet-irda.c (100%) rename plugins/{ => epan}/irda/packet-sir.c (100%) rename plugins/{ => epan}/mate/AUTHORS (100%) rename plugins/{ => epan}/mate/CMakeLists.txt (100%) rename plugins/{ => epan}/mate/Makefile.am (98%) rename plugins/{ => epan}/mate/examples/call.mate (100%) rename plugins/{ => epan}/mate/examples/mms.mate (100%) rename plugins/{ => epan}/mate/examples/pasv_ftp.mate (100%) rename plugins/{ => epan}/mate/examples/tcp.mate (100%) rename plugins/{ => epan}/mate/examples/web.mate (100%) rename plugins/{ => epan}/mate/mate.h (100%) rename plugins/{ => epan}/mate/mate_grammar.lemon (100%) rename plugins/{ => epan}/mate/mate_parser.l (100%) rename plugins/{ => epan}/mate/mate_runtime.c (100%) rename plugins/{ => epan}/mate/mate_setup.c (100%) rename plugins/{ => epan}/mate/mate_util.c (100%) rename plugins/{ => epan}/mate/mate_util.h (100%) rename plugins/{ => epan}/mate/matelib/dns.mate (100%) rename plugins/{ => epan}/mate/matelib/h225_ras.mate (100%) rename plugins/{ => epan}/mate/matelib/isup.mate (100%) rename plugins/{ => epan}/mate/matelib/megaco.mate (100%) rename plugins/{ => epan}/mate/matelib/q931.mate (100%) rename plugins/{ => epan}/mate/matelib/radius.mate (100%) rename plugins/{ => epan}/mate/matelib/rtsp.mate (100%) rename plugins/{ => epan}/mate/matelib/sip.mate (100%) rename plugins/{ => epan}/mate/packet-mate.c (100%) rename plugins/{ => epan}/opcua/AUTHORS (100%) rename plugins/{ => epan}/opcua/CMakeLists.txt (100%) rename plugins/{ => epan}/opcua/ChangeLog (100%) rename plugins/{ => epan}/opcua/Doxyfile (100%) rename plugins/{ => epan}/opcua/Makefile.am (97%) rename plugins/{ => epan}/opcua/README (100%) rename plugins/{ => epan}/opcua/opcua.c (100%) rename plugins/{ => epan}/opcua/opcua_application_layer.c (100%) rename plugins/{ => epan}/opcua/opcua_application_layer.h (100%) rename plugins/{ => epan}/opcua/opcua_complextypeparser.c (100%) rename plugins/{ => epan}/opcua/opcua_complextypeparser.h (100%) rename plugins/{ => epan}/opcua/opcua_enumparser.c (100%) rename plugins/{ => epan}/opcua/opcua_enumparser.h (100%) rename plugins/{ => epan}/opcua/opcua_extensionobjectids.h (100%) rename plugins/{ => epan}/opcua/opcua_extensionobjecttable.c (100%) rename plugins/{ => epan}/opcua/opcua_hfindeces.c (100%) rename plugins/{ => epan}/opcua/opcua_hfindeces.h (100%) rename plugins/{ => epan}/opcua/opcua_identifiers.h (100%) rename plugins/{ => epan}/opcua/opcua_security_layer.c (100%) rename plugins/{ => epan}/opcua/opcua_security_layer.h (100%) rename plugins/{ => epan}/opcua/opcua_serviceids.h (100%) rename plugins/{ => epan}/opcua/opcua_serviceparser.c (100%) rename plugins/{ => epan}/opcua/opcua_serviceparser.h (100%) rename plugins/{ => epan}/opcua/opcua_servicetable.c (100%) rename plugins/{ => epan}/opcua/opcua_servicetable.h (100%) rename plugins/{ => epan}/opcua/opcua_simpletypes.c (100%) rename plugins/{ => epan}/opcua/opcua_simpletypes.h (100%) rename plugins/{ => epan}/opcua/opcua_statuscode.c (100%) rename plugins/{ => epan}/opcua/opcua_statuscode.h (100%) rename plugins/{ => epan}/opcua/opcua_transport_layer.c (100%) rename plugins/{ => epan}/opcua/opcua_transport_layer.h (100%) rename plugins/{ => epan}/pluginifdemo/AUTHORS (100%) rename plugins/{ => epan}/pluginifdemo/CMakeLists.txt (100%) rename plugins/{ => epan}/pluginifdemo/Makefile.am (97%) rename plugins/{ => epan}/pluginifdemo/README (100%) rename plugins/{ => epan}/pluginifdemo/pluginifdemo.c (100%) rename plugins/{ => epan}/pluginifdemo/pluginifdemo.h (100%) rename plugins/{ => epan}/pluginifdemo/ui/pluginifdemo_about.cpp (100%) rename plugins/{ => epan}/pluginifdemo/ui/pluginifdemo_about.h (100%) rename plugins/{ => epan}/pluginifdemo/ui/pluginifdemo_about.ui (100%) rename plugins/{ => epan}/pluginifdemo/ui/pluginifdemo_main.cpp (100%) rename plugins/{ => epan}/pluginifdemo/ui/pluginifdemo_main.h (100%) rename plugins/{ => epan}/pluginifdemo/ui/pluginifdemo_main.ui (100%) rename plugins/{ => epan}/pluginifdemo/ui/uiclasshandler.cpp (100%) rename plugins/{ => epan}/pluginifdemo/ui/uihandler.cpp (100%) rename plugins/{ => epan}/pluginifdemo/ui/uihandler.h (100%) rename plugins/{ => epan}/profinet/AUTHORS (100%) rename plugins/{ => epan}/profinet/CMakeLists.txt (100%) rename plugins/{ => epan}/profinet/ChangeLog (100%) rename plugins/{ => epan}/profinet/Makefile.am (97%) rename plugins/{ => epan}/profinet/packet-dcerpc-pn-io.c (100%) rename plugins/{ => epan}/profinet/packet-dcom-cba-acco.c (100%) rename plugins/{ => epan}/profinet/packet-dcom-cba-acco.h (100%) rename plugins/{ => epan}/profinet/packet-dcom-cba.c (100%) rename plugins/{ => epan}/profinet/packet-pn-dcp.c (100%) rename plugins/{ => epan}/profinet/packet-pn-mrp.c (100%) rename plugins/{ => epan}/profinet/packet-pn-mrrt.c (100%) rename plugins/{ => epan}/profinet/packet-pn-ptcp.c (100%) rename plugins/{ => epan}/profinet/packet-pn-rt.c (100%) rename plugins/{ => epan}/profinet/packet-pn-rtc-one.c (100%) rename plugins/{ => epan}/profinet/packet-pn.c (100%) rename plugins/{ => epan}/profinet/packet-pn.h (100%) rename plugins/{ => epan}/stats_tree/AUTHORS (100%) rename plugins/{ => epan}/stats_tree/CMakeLists.txt (100%) rename plugins/{ => epan}/stats_tree/Makefile.am (96%) rename plugins/{ => epan}/stats_tree/pinfo_stats_tree.c (100%) rename plugins/{ => epan}/stats_tree/pinfo_stats_tree.h (100%) rename plugins/{ => epan}/stats_tree/stats_tree_plugin.c (100%) rename plugins/{ => epan}/transum/AUTHORS (100%) rename plugins/{ => epan}/transum/CMakeLists.txt (100%) rename plugins/{ => epan}/transum/Makefile.am (97%) rename plugins/{ => epan}/transum/README (100%) rename plugins/{ => epan}/transum/decoders.c (100%) rename plugins/{ => epan}/transum/decoders.h (100%) rename plugins/{ => epan}/transum/extractors.c (100%) rename plugins/{ => epan}/transum/extractors.h (100%) rename plugins/{ => epan}/transum/packet-transum.c (100%) rename plugins/{ => epan}/transum/packet-transum.h (100%) rename plugins/{ => epan}/transum/preferences.h (100%) rename plugins/{ => epan}/unistim/AUTHORS (100%) rename plugins/{ => epan}/unistim/CMakeLists.txt (100%) rename plugins/{ => epan}/unistim/ChangeLog (100%) rename plugins/{ => epan}/unistim/Makefile.am (97%) rename plugins/{ => epan}/unistim/TODO (100%) rename plugins/{ => epan}/unistim/audio.h (100%) rename plugins/{ => epan}/unistim/basic.h (100%) rename plugins/{ => epan}/unistim/broadcast.h (100%) rename plugins/{ => epan}/unistim/defines.h (100%) rename plugins/{ => epan}/unistim/display.h (100%) rename plugins/{ => epan}/unistim/expansion.h (100%) rename plugins/{ => epan}/unistim/key.h (100%) rename plugins/{ => epan}/unistim/network.h (100%) rename plugins/{ => epan}/unistim/packet-unistim.c (100%) rename plugins/{ => epan}/unistim/packet-unistim.h (100%) rename plugins/{ => epan}/unistim/uftp.h (100%) rename plugins/{ => epan}/wimax/AUTHORS (100%) rename plugins/{ => epan}/wimax/CMakeLists.txt (100%) rename plugins/{ => epan}/wimax/Makefile.am (98%) rename plugins/{ => epan}/wimax/README.wimax (100%) rename plugins/{ => epan}/wimax/crc.c (100%) rename plugins/{ => epan}/wimax/crc.h (100%) rename plugins/{ => epan}/wimax/crc_data.c (100%) rename plugins/{ => epan}/wimax/mac_hd_generic_decoder.c (100%) rename plugins/{ => epan}/wimax/mac_hd_type1_decoder.c (100%) rename plugins/{ => epan}/wimax/mac_hd_type2_decoder.c (100%) rename plugins/{ => epan}/wimax/mac_mgmt_msg_decoder.c (100%) rename plugins/{ => epan}/wimax/msg_aas_beam.c (100%) rename plugins/{ => epan}/wimax/msg_aas_fbck.c (100%) rename plugins/{ => epan}/wimax/msg_arq.c (100%) rename plugins/{ => epan}/wimax/msg_clk_cmp.c (100%) rename plugins/{ => epan}/wimax/msg_dcd.c (100%) rename plugins/{ => epan}/wimax/msg_dlmap.c (100%) rename plugins/{ => epan}/wimax/msg_dreg.c (100%) rename plugins/{ => epan}/wimax/msg_dsa.c (100%) rename plugins/{ => epan}/wimax/msg_dsc.c (100%) rename plugins/{ => epan}/wimax/msg_dsd.c (100%) rename plugins/{ => epan}/wimax/msg_dsx_rvd.c (100%) rename plugins/{ => epan}/wimax/msg_fpc.c (100%) rename plugins/{ => epan}/wimax/msg_pkm.c (100%) rename plugins/{ => epan}/wimax/msg_pmc.c (100%) rename plugins/{ => epan}/wimax/msg_prc_lt_ctrl.c (100%) rename plugins/{ => epan}/wimax/msg_reg_req.c (100%) rename plugins/{ => epan}/wimax/msg_reg_rsp.c (100%) rename plugins/{ => epan}/wimax/msg_rep.c (100%) rename plugins/{ => epan}/wimax/msg_res_cmd.c (100%) rename plugins/{ => epan}/wimax/msg_rng_req.c (100%) rename plugins/{ => epan}/wimax/msg_rng_rsp.c (100%) rename plugins/{ => epan}/wimax/msg_sbc.c (100%) rename plugins/{ => epan}/wimax/msg_ucd.c (100%) rename plugins/{ => epan}/wimax/msg_ulmap.c (100%) rename plugins/{ => epan}/wimax/packet-m2m.c (100%) rename plugins/{ => epan}/wimax/packet-wmx.c (100%) rename plugins/{ => epan}/wimax/wimax-int.h (100%) rename plugins/{ => epan}/wimax/wimax_bits.h (100%) rename plugins/{ => epan}/wimax/wimax_cdma_code_decoder.c (100%) rename plugins/{ => epan}/wimax/wimax_compact_dlmap_ie_decoder.c (100%) rename plugins/{ => epan}/wimax/wimax_compact_dlmap_ie_decoder.h (100%) rename plugins/{ => epan}/wimax/wimax_compact_ulmap_ie_decoder.c (100%) rename plugins/{ => epan}/wimax/wimax_compact_ulmap_ie_decoder.h (100%) rename plugins/{ => epan}/wimax/wimax_fch_decoder.c (100%) rename plugins/{ => epan}/wimax/wimax_ffb_decoder.c (100%) rename plugins/{ => epan}/wimax/wimax_hack_decoder.c (100%) rename plugins/{ => epan}/wimax/wimax_harq_map_decoder.c (100%) rename plugins/{ => epan}/wimax/wimax_mac.h (100%) rename plugins/{ => epan}/wimax/wimax_pdu_decoder.c (100%) rename plugins/{ => epan}/wimax/wimax_phy_attributes_decoder.c (100%) rename plugins/{ => epan}/wimax/wimax_tlv.c (100%) rename plugins/{ => epan}/wimax/wimax_tlv.h (100%) rename plugins/{ => epan}/wimax/wimax_utils.c (100%) rename plugins/{ => epan}/wimax/wimax_utils.h (100%) rename plugins/{ => epan}/wimaxasncp/AUTHORS (100%) rename plugins/{ => epan}/wimaxasncp/CMakeLists.txt (100%) rename plugins/{ => epan}/wimaxasncp/ChangeLog (100%) rename plugins/{ => epan}/wimaxasncp/Makefile.am (98%) rename plugins/{ => epan}/wimaxasncp/packet-wimaxasncp.c (100%) rename plugins/{ => epan}/wimaxasncp/wimaxasncp_dict.h (100%) rename plugins/{ => epan}/wimaxasncp/wimaxasncp_dict.l (100%) rename plugins/{ => epan}/wimaxmacphy/AUTHORS (100%) rename plugins/{ => epan}/wimaxmacphy/CMakeLists.txt (100%) rename plugins/{ => epan}/wimaxmacphy/ChangeLog (100%) rename plugins/{ => epan}/wimaxmacphy/Makefile.am (97%) rename plugins/{ => epan}/wimaxmacphy/packet-wimaxmacphy.c (100%) rename plugins/{ => epan}/wimaxmacphy/packet-wimaxmacphy.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f6bbd59ce..ad3f4b9221 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1370,19 +1370,19 @@ if(ENABLE_PLUGINS) add_custom_target(plugins) set_target_properties(plugins PROPERTIES FOLDER "Plugins") set(PLUGIN_SRC_DIRS - plugins/docsis - plugins/ethercat - plugins/gryphon - plugins/irda - plugins/mate - plugins/opcua - plugins/profinet - plugins/stats_tree - plugins/transum - plugins/unistim - plugins/wimax - plugins/wimaxasncp - plugins/wimaxmacphy + plugins/epan/docsis + plugins/epan/ethercat + plugins/epan/gryphon + plugins/epan/irda + plugins/epan/mate + plugins/epan/opcua + plugins/epan/profinet + plugins/epan/stats_tree + plugins/epan/transum + plugins/epan/unistim + plugins/epan/wimax + plugins/epan/wimaxasncp + plugins/epan/wimaxmacphy ${CUSTOM_PLUGIN_SRC_DIR} ) diff --git a/cmake/modules/WiresharkPlugin.cmake b/cmake/modules/WiresharkPlugin.cmake index 23db9b30c7..0cf67debcd 100644 --- a/cmake/modules/WiresharkPlugin.cmake +++ b/cmake/modules/WiresharkPlugin.cmake @@ -40,17 +40,9 @@ macro(ADD_PLUGIN_LIBRARY _plugin _subfolder) FOLDER "Plugins" ) - if(ENABLE_APPLICATION_BUNDLE) - set_target_properties(${_plugin} PROPERTIES - LIBRARY_OUTPUT_DIRECTORY ${PLUGIN_DIR}/${_subfolder} - ) - else() - # Why don't we just write to ${PLUGIN_DIR}/${_subfolder} - # everywhere? - set_target_properties(${_plugin} PROPERTIES - LIBRARY_OUTPUT_DIRECTORY ${PLUGIN_DIR} + set_target_properties(${_plugin} PROPERTIES + LIBRARY_OUTPUT_DIRECTORY ${PLUGIN_DIR}/${_subfolder} ) -endif() # Try to force output to ${PLUGIN_DIR} without the configuration # type appended. Needed on Windows. diff --git a/configure.ac b/configure.ac index 7b0ecfddaf..07a03466fe 100644 --- a/configure.ac +++ b/configure.ac @@ -2809,19 +2809,19 @@ AC_CONFIG_FILES( packaging/rpm/SPECS/wireshark.spec packaging/wix/Makefile plugins/Makefile - plugins/docsis/Makefile - plugins/ethercat/Makefile - plugins/gryphon/Makefile - plugins/irda/Makefile - plugins/mate/Makefile - plugins/opcua/Makefile - plugins/profinet/Makefile - plugins/stats_tree/Makefile - plugins/transum/Makefile - plugins/unistim/Makefile - plugins/wimax/Makefile - plugins/wimaxasncp/Makefile - plugins/wimaxmacphy/Makefile + plugins/epan/docsis/Makefile + plugins/epan/ethercat/Makefile + plugins/epan/gryphon/Makefile + plugins/epan/irda/Makefile + plugins/epan/mate/Makefile + plugins/epan/opcua/Makefile + plugins/epan/profinet/Makefile + plugins/epan/stats_tree/Makefile + plugins/epan/transum/Makefile + plugins/epan/unistim/Makefile + plugins/epan/wimax/Makefile + plugins/epan/wimaxasncp/Makefile + plugins/epan/wimaxmacphy/Makefile _CUSTOM_PLUGIN_CONFIG_FILES_ randpkt_core/doxygen.cfg randpkt_core/Makefile diff --git a/plugins/Custom.m4.example b/plugins/Custom.m4.example index 34bb80a4c3..adbf02fa16 100644 --- a/plugins/Custom.m4.example +++ b/plugins/Custom.m4.example @@ -1,3 +1,3 @@ # -m4_define([_CUSTOM_PLUGIN_CONFIG_FILES_], [plugins/foo/Makefile]) +m4_define([_CUSTOM_PLUGIN_CONFIG_FILES_], [plugins/epan/foo/Makefile]) diff --git a/plugins/Custom.make.example b/plugins/Custom.make.example index d17d062bc5..d3020ae430 100644 --- a/plugins/Custom.make.example +++ b/plugins/Custom.make.example @@ -1,7 +1,7 @@ # _CUSTOM_SUBDIRS_ = \ - foo + epan/foo _CUSTOM_EXTRA_DIST_ = \ Custom.m4 \ diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 481cc29f17..267e8873ae 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -23,19 +23,19 @@ SUBDIRS = \ $(_CUSTOM_SUBDIRS_) \ - docsis \ - ethercat \ - gryphon \ - irda \ - mate \ - opcua \ - profinet \ - stats_tree \ - transum \ - unistim \ - wimax \ - wimaxasncp \ - wimaxmacphy + epan/docsis \ + epan/ethercat \ + epan/gryphon \ + epan/irda \ + epan/mate \ + epan/opcua \ + epan/profinet \ + epan/stats_tree \ + epan/transum \ + epan/unistim \ + epan/wimax \ + epan/wimaxasncp \ + epan/wimaxmacphy EXTRA_DIST = \ $(_CUSTOM_EXTRA_DIST_) \ diff --git a/plugins/docsis/AUTHORS b/plugins/epan/docsis/AUTHORS similarity index 100% rename from plugins/docsis/AUTHORS rename to plugins/epan/docsis/AUTHORS diff --git a/plugins/docsis/CMakeLists.txt b/plugins/epan/docsis/CMakeLists.txt similarity index 100% rename from plugins/docsis/CMakeLists.txt rename to plugins/epan/docsis/CMakeLists.txt diff --git a/plugins/docsis/ChangeLog b/plugins/epan/docsis/ChangeLog similarity index 100% rename from plugins/docsis/ChangeLog rename to plugins/epan/docsis/ChangeLog diff --git a/plugins/docsis/Makefile.am b/plugins/epan/docsis/Makefile.am similarity index 97% rename from plugins/docsis/Makefile.am rename to plugins/epan/docsis/Makefile.am index d81ed2e767..3137cbab87 100644 --- a/plugins/docsis/Makefile.am +++ b/plugins/epan/docsis/Makefile.am @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include $(top_srcdir)/Makefile.am.inc -include ../Makefile.am.inc +include $(top_srcdir)/plugins/Makefile.am.inc # the name of the plugin PLUGIN_NAME = docsis diff --git a/plugins/docsis/README b/plugins/epan/docsis/README similarity index 100% rename from plugins/docsis/README rename to plugins/epan/docsis/README diff --git a/plugins/docsis/packet-docsis.c b/plugins/epan/docsis/packet-docsis.c similarity index 100% rename from plugins/docsis/packet-docsis.c rename to plugins/epan/docsis/packet-docsis.c diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/epan/docsis/packet-macmgmt.c similarity index 100% rename from plugins/docsis/packet-macmgmt.c rename to plugins/epan/docsis/packet-macmgmt.c diff --git a/plugins/docsis/packet-tlv.c b/plugins/epan/docsis/packet-tlv.c similarity index 100% rename from plugins/docsis/packet-tlv.c rename to plugins/epan/docsis/packet-tlv.c diff --git a/plugins/docsis/packet-tlv.h b/plugins/epan/docsis/packet-tlv.h similarity index 100% rename from plugins/docsis/packet-tlv.h rename to plugins/epan/docsis/packet-tlv.h diff --git a/plugins/docsis/packet-vendor.c b/plugins/epan/docsis/packet-vendor.c similarity index 100% rename from plugins/docsis/packet-vendor.c rename to plugins/epan/docsis/packet-vendor.c diff --git a/plugins/ethercat/AUTHORS b/plugins/epan/ethercat/AUTHORS similarity index 100% rename from plugins/ethercat/AUTHORS rename to plugins/epan/ethercat/AUTHORS diff --git a/plugins/ethercat/CMakeLists.txt b/plugins/epan/ethercat/CMakeLists.txt similarity index 100% rename from plugins/ethercat/CMakeLists.txt rename to plugins/epan/ethercat/CMakeLists.txt diff --git a/plugins/ethercat/Makefile.am b/plugins/epan/ethercat/Makefile.am similarity index 97% rename from plugins/ethercat/Makefile.am rename to plugins/epan/ethercat/Makefile.am index a924abbdec..e9cde19249 100644 --- a/plugins/ethercat/Makefile.am +++ b/plugins/epan/ethercat/Makefile.am @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include $(top_srcdir)/Makefile.am.inc -include ../Makefile.am.inc +include $(top_srcdir)/plugins/Makefile.am.inc # the name of the plugin PLUGIN_NAME = ethercat diff --git a/plugins/ethercat/packet-ams.c b/plugins/epan/ethercat/packet-ams.c similarity index 100% rename from plugins/ethercat/packet-ams.c rename to plugins/epan/ethercat/packet-ams.c diff --git a/plugins/ethercat/packet-ams.h b/plugins/epan/ethercat/packet-ams.h similarity index 100% rename from plugins/ethercat/packet-ams.h rename to plugins/epan/ethercat/packet-ams.h diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/epan/ethercat/packet-ecatmb.c similarity index 100% rename from plugins/ethercat/packet-ecatmb.c rename to plugins/epan/ethercat/packet-ecatmb.c diff --git a/plugins/ethercat/packet-ecatmb.h b/plugins/epan/ethercat/packet-ecatmb.h similarity index 100% rename from plugins/ethercat/packet-ecatmb.h rename to plugins/epan/ethercat/packet-ecatmb.h diff --git a/plugins/ethercat/packet-esl.c b/plugins/epan/ethercat/packet-esl.c similarity index 100% rename from plugins/ethercat/packet-esl.c rename to plugins/epan/ethercat/packet-esl.c diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/epan/ethercat/packet-ethercat-datagram.c similarity index 100% rename from plugins/ethercat/packet-ethercat-datagram.c rename to plugins/epan/ethercat/packet-ethercat-datagram.c diff --git a/plugins/ethercat/packet-ethercat-datagram.h b/plugins/epan/ethercat/packet-ethercat-datagram.h similarity index 100% rename from plugins/ethercat/packet-ethercat-datagram.h rename to plugins/epan/ethercat/packet-ethercat-datagram.h diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/epan/ethercat/packet-ethercat-frame.c similarity index 100% rename from plugins/ethercat/packet-ethercat-frame.c rename to plugins/epan/ethercat/packet-ethercat-frame.c diff --git a/plugins/ethercat/packet-ethercat-frame.h b/plugins/epan/ethercat/packet-ethercat-frame.h similarity index 100% rename from plugins/ethercat/packet-ethercat-frame.h rename to plugins/epan/ethercat/packet-ethercat-frame.h diff --git a/plugins/ethercat/packet-ioraw.c b/plugins/epan/ethercat/packet-ioraw.c similarity index 100% rename from plugins/ethercat/packet-ioraw.c rename to plugins/epan/ethercat/packet-ioraw.c diff --git a/plugins/ethercat/packet-ioraw.h b/plugins/epan/ethercat/packet-ioraw.h similarity index 100% rename from plugins/ethercat/packet-ioraw.h rename to plugins/epan/ethercat/packet-ioraw.h diff --git a/plugins/ethercat/packet-nv.c b/plugins/epan/ethercat/packet-nv.c similarity index 100% rename from plugins/ethercat/packet-nv.c rename to plugins/epan/ethercat/packet-nv.c diff --git a/plugins/ethercat/packet-nv.h b/plugins/epan/ethercat/packet-nv.h similarity index 100% rename from plugins/ethercat/packet-nv.h rename to plugins/epan/ethercat/packet-nv.h diff --git a/plugins/gryphon/AUTHORS b/plugins/epan/gryphon/AUTHORS similarity index 100% rename from plugins/gryphon/AUTHORS rename to plugins/epan/gryphon/AUTHORS diff --git a/plugins/gryphon/CMakeLists.txt b/plugins/epan/gryphon/CMakeLists.txt similarity index 100% rename from plugins/gryphon/CMakeLists.txt rename to plugins/epan/gryphon/CMakeLists.txt diff --git a/plugins/gryphon/Makefile.am b/plugins/epan/gryphon/Makefile.am similarity index 97% rename from plugins/gryphon/Makefile.am rename to plugins/epan/gryphon/Makefile.am index c87bc8f915..81495fdd7c 100644 --- a/plugins/gryphon/Makefile.am +++ b/plugins/epan/gryphon/Makefile.am @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include $(top_srcdir)/Makefile.am.inc -include ../Makefile.am.inc +include $(top_srcdir)/plugins/Makefile.am.inc # the name of the plugin PLUGIN_NAME = gryphon diff --git a/plugins/gryphon/README b/plugins/epan/gryphon/README similarity index 100% rename from plugins/gryphon/README rename to plugins/epan/gryphon/README diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/epan/gryphon/packet-gryphon.c similarity index 100% rename from plugins/gryphon/packet-gryphon.c rename to plugins/epan/gryphon/packet-gryphon.c diff --git a/plugins/gryphon/packet-gryphon.h b/plugins/epan/gryphon/packet-gryphon.h similarity index 100% rename from plugins/gryphon/packet-gryphon.h rename to plugins/epan/gryphon/packet-gryphon.h diff --git a/plugins/irda/CMakeLists.txt b/plugins/epan/irda/CMakeLists.txt similarity index 100% rename from plugins/irda/CMakeLists.txt rename to plugins/epan/irda/CMakeLists.txt diff --git a/plugins/irda/Makefile.am b/plugins/epan/irda/Makefile.am similarity index 97% rename from plugins/irda/Makefile.am rename to plugins/epan/irda/Makefile.am index a2e499a871..1678d88874 100644 --- a/plugins/irda/Makefile.am +++ b/plugins/epan/irda/Makefile.am @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include $(top_srcdir)/Makefile.am.inc -include ../Makefile.am.inc +include $(top_srcdir)/plugins/Makefile.am.inc # the name of the plugin PLUGIN_NAME = irda diff --git a/plugins/irda/irda-appl.h b/plugins/epan/irda/irda-appl.h similarity index 100% rename from plugins/irda/irda-appl.h rename to plugins/epan/irda/irda-appl.h diff --git a/plugins/irda/packet-ircomm.c b/plugins/epan/irda/packet-ircomm.c similarity index 100% rename from plugins/irda/packet-ircomm.c rename to plugins/epan/irda/packet-ircomm.c diff --git a/plugins/irda/packet-irda.c b/plugins/epan/irda/packet-irda.c similarity index 100% rename from plugins/irda/packet-irda.c rename to plugins/epan/irda/packet-irda.c diff --git a/plugins/irda/packet-sir.c b/plugins/epan/irda/packet-sir.c similarity index 100% rename from plugins/irda/packet-sir.c rename to plugins/epan/irda/packet-sir.c diff --git a/plugins/mate/AUTHORS b/plugins/epan/mate/AUTHORS similarity index 100% rename from plugins/mate/AUTHORS rename to plugins/epan/mate/AUTHORS diff --git a/plugins/mate/CMakeLists.txt b/plugins/epan/mate/CMakeLists.txt similarity index 100% rename from plugins/mate/CMakeLists.txt rename to plugins/epan/mate/CMakeLists.txt diff --git a/plugins/mate/Makefile.am b/plugins/epan/mate/Makefile.am similarity index 98% rename from plugins/mate/Makefile.am rename to plugins/epan/mate/Makefile.am index 0d425aa293..bb1f576f74 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/epan/mate/Makefile.am @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include $(top_srcdir)/Makefile.am.inc -include ../Makefile.am.inc +include $(top_srcdir)/plugins/Makefile.am.inc # the name of the plugin PLUGIN_NAME = mate diff --git a/plugins/mate/examples/call.mate b/plugins/epan/mate/examples/call.mate similarity index 100% rename from plugins/mate/examples/call.mate rename to plugins/epan/mate/examples/call.mate diff --git a/plugins/mate/examples/mms.mate b/plugins/epan/mate/examples/mms.mate similarity index 100% rename from plugins/mate/examples/mms.mate rename to plugins/epan/mate/examples/mms.mate diff --git a/plugins/mate/examples/pasv_ftp.mate b/plugins/epan/mate/examples/pasv_ftp.mate similarity index 100% rename from plugins/mate/examples/pasv_ftp.mate rename to plugins/epan/mate/examples/pasv_ftp.mate diff --git a/plugins/mate/examples/tcp.mate b/plugins/epan/mate/examples/tcp.mate similarity index 100% rename from plugins/mate/examples/tcp.mate rename to plugins/epan/mate/examples/tcp.mate diff --git a/plugins/mate/examples/web.mate b/plugins/epan/mate/examples/web.mate similarity index 100% rename from plugins/mate/examples/web.mate rename to plugins/epan/mate/examples/web.mate diff --git a/plugins/mate/mate.h b/plugins/epan/mate/mate.h similarity index 100% rename from plugins/mate/mate.h rename to plugins/epan/mate/mate.h diff --git a/plugins/mate/mate_grammar.lemon b/plugins/epan/mate/mate_grammar.lemon similarity index 100% rename from plugins/mate/mate_grammar.lemon rename to plugins/epan/mate/mate_grammar.lemon diff --git a/plugins/mate/mate_parser.l b/plugins/epan/mate/mate_parser.l similarity index 100% rename from plugins/mate/mate_parser.l rename to plugins/epan/mate/mate_parser.l diff --git a/plugins/mate/mate_runtime.c b/plugins/epan/mate/mate_runtime.c similarity index 100% rename from plugins/mate/mate_runtime.c rename to plugins/epan/mate/mate_runtime.c diff --git a/plugins/mate/mate_setup.c b/plugins/epan/mate/mate_setup.c similarity index 100% rename from plugins/mate/mate_setup.c rename to plugins/epan/mate/mate_setup.c diff --git a/plugins/mate/mate_util.c b/plugins/epan/mate/mate_util.c similarity index 100% rename from plugins/mate/mate_util.c rename to plugins/epan/mate/mate_util.c diff --git a/plugins/mate/mate_util.h b/plugins/epan/mate/mate_util.h similarity index 100% rename from plugins/mate/mate_util.h rename to plugins/epan/mate/mate_util.h diff --git a/plugins/mate/matelib/dns.mate b/plugins/epan/mate/matelib/dns.mate similarity index 100% rename from plugins/mate/matelib/dns.mate rename to plugins/epan/mate/matelib/dns.mate diff --git a/plugins/mate/matelib/h225_ras.mate b/plugins/epan/mate/matelib/h225_ras.mate similarity index 100% rename from plugins/mate/matelib/h225_ras.mate rename to plugins/epan/mate/matelib/h225_ras.mate diff --git a/plugins/mate/matelib/isup.mate b/plugins/epan/mate/matelib/isup.mate similarity index 100% rename from plugins/mate/matelib/isup.mate rename to plugins/epan/mate/matelib/isup.mate diff --git a/plugins/mate/matelib/megaco.mate b/plugins/epan/mate/matelib/megaco.mate similarity index 100% rename from plugins/mate/matelib/megaco.mate rename to plugins/epan/mate/matelib/megaco.mate diff --git a/plugins/mate/matelib/q931.mate b/plugins/epan/mate/matelib/q931.mate similarity index 100% rename from plugins/mate/matelib/q931.mate rename to plugins/epan/mate/matelib/q931.mate diff --git a/plugins/mate/matelib/radius.mate b/plugins/epan/mate/matelib/radius.mate similarity index 100% rename from plugins/mate/matelib/radius.mate rename to plugins/epan/mate/matelib/radius.mate diff --git a/plugins/mate/matelib/rtsp.mate b/plugins/epan/mate/matelib/rtsp.mate similarity index 100% rename from plugins/mate/matelib/rtsp.mate rename to plugins/epan/mate/matelib/rtsp.mate diff --git a/plugins/mate/matelib/sip.mate b/plugins/epan/mate/matelib/sip.mate similarity index 100% rename from plugins/mate/matelib/sip.mate rename to plugins/epan/mate/matelib/sip.mate diff --git a/plugins/mate/packet-mate.c b/plugins/epan/mate/packet-mate.c similarity index 100% rename from plugins/mate/packet-mate.c rename to plugins/epan/mate/packet-mate.c diff --git a/plugins/opcua/AUTHORS b/plugins/epan/opcua/AUTHORS similarity index 100% rename from plugins/opcua/AUTHORS rename to plugins/epan/opcua/AUTHORS diff --git a/plugins/opcua/CMakeLists.txt b/plugins/epan/opcua/CMakeLists.txt similarity index 100% rename from plugins/opcua/CMakeLists.txt rename to plugins/epan/opcua/CMakeLists.txt diff --git a/plugins/opcua/ChangeLog b/plugins/epan/opcua/ChangeLog similarity index 100% rename from plugins/opcua/ChangeLog rename to plugins/epan/opcua/ChangeLog diff --git a/plugins/opcua/Doxyfile b/plugins/epan/opcua/Doxyfile similarity index 100% rename from plugins/opcua/Doxyfile rename to plugins/epan/opcua/Doxyfile diff --git a/plugins/opcua/Makefile.am b/plugins/epan/opcua/Makefile.am similarity index 97% rename from plugins/opcua/Makefile.am rename to plugins/epan/opcua/Makefile.am index bd88fd1c2b..1023747325 100644 --- a/plugins/opcua/Makefile.am +++ b/plugins/epan/opcua/Makefile.am @@ -20,7 +20,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include $(top_srcdir)/Makefile.am.inc -include ../Makefile.am.inc +include $(top_srcdir)/plugins/Makefile.am.inc # the name of the plugin PLUGIN_NAME = opcua diff --git a/plugins/opcua/README b/plugins/epan/opcua/README similarity index 100% rename from plugins/opcua/README rename to plugins/epan/opcua/README diff --git a/plugins/opcua/opcua.c b/plugins/epan/opcua/opcua.c similarity index 100% rename from plugins/opcua/opcua.c rename to plugins/epan/opcua/opcua.c diff --git a/plugins/opcua/opcua_application_layer.c b/plugins/epan/opcua/opcua_application_layer.c similarity index 100% rename from plugins/opcua/opcua_application_layer.c rename to plugins/epan/opcua/opcua_application_layer.c diff --git a/plugins/opcua/opcua_application_layer.h b/plugins/epan/opcua/opcua_application_layer.h similarity index 100% rename from plugins/opcua/opcua_application_layer.h rename to plugins/epan/opcua/opcua_application_layer.h diff --git a/plugins/opcua/opcua_complextypeparser.c b/plugins/epan/opcua/opcua_complextypeparser.c similarity index 100% rename from plugins/opcua/opcua_complextypeparser.c rename to plugins/epan/opcua/opcua_complextypeparser.c diff --git a/plugins/opcua/opcua_complextypeparser.h b/plugins/epan/opcua/opcua_complextypeparser.h similarity index 100% rename from plugins/opcua/opcua_complextypeparser.h rename to plugins/epan/opcua/opcua_complextypeparser.h diff --git a/plugins/opcua/opcua_enumparser.c b/plugins/epan/opcua/opcua_enumparser.c similarity index 100% rename from plugins/opcua/opcua_enumparser.c rename to plugins/epan/opcua/opcua_enumparser.c diff --git a/plugins/opcua/opcua_enumparser.h b/plugins/epan/opcua/opcua_enumparser.h similarity index 100% rename from plugins/opcua/opcua_enumparser.h rename to plugins/epan/opcua/opcua_enumparser.h diff --git a/plugins/opcua/opcua_extensionobjectids.h b/plugins/epan/opcua/opcua_extensionobjectids.h similarity index 100% rename from plugins/opcua/opcua_extensionobjectids.h rename to plugins/epan/opcua/opcua_extensionobjectids.h diff --git a/plugins/opcua/opcua_extensionobjecttable.c b/plugins/epan/opcua/opcua_extensionobjecttable.c similarity index 100% rename from plugins/opcua/opcua_extensionobjecttable.c rename to plugins/epan/opcua/opcua_extensionobjecttable.c diff --git a/plugins/opcua/opcua_hfindeces.c b/plugins/epan/opcua/opcua_hfindeces.c similarity index 100% rename from plugins/opcua/opcua_hfindeces.c rename to plugins/epan/opcua/opcua_hfindeces.c diff --git a/plugins/opcua/opcua_hfindeces.h b/plugins/epan/opcua/opcua_hfindeces.h similarity index 100% rename from plugins/opcua/opcua_hfindeces.h rename to plugins/epan/opcua/opcua_hfindeces.h diff --git a/plugins/opcua/opcua_identifiers.h b/plugins/epan/opcua/opcua_identifiers.h similarity index 100% rename from plugins/opcua/opcua_identifiers.h rename to plugins/epan/opcua/opcua_identifiers.h diff --git a/plugins/opcua/opcua_security_layer.c b/plugins/epan/opcua/opcua_security_layer.c similarity index 100% rename from plugins/opcua/opcua_security_layer.c rename to plugins/epan/opcua/opcua_security_layer.c diff --git a/plugins/opcua/opcua_security_layer.h b/plugins/epan/opcua/opcua_security_layer.h similarity index 100% rename from plugins/opcua/opcua_security_layer.h rename to plugins/epan/opcua/opcua_security_layer.h diff --git a/plugins/opcua/opcua_serviceids.h b/plugins/epan/opcua/opcua_serviceids.h similarity index 100% rename from plugins/opcua/opcua_serviceids.h rename to plugins/epan/opcua/opcua_serviceids.h diff --git a/plugins/opcua/opcua_serviceparser.c b/plugins/epan/opcua/opcua_serviceparser.c similarity index 100% rename from plugins/opcua/opcua_serviceparser.c rename to plugins/epan/opcua/opcua_serviceparser.c diff --git a/plugins/opcua/opcua_serviceparser.h b/plugins/epan/opcua/opcua_serviceparser.h similarity index 100% rename from plugins/opcua/opcua_serviceparser.h rename to plugins/epan/opcua/opcua_serviceparser.h diff --git a/plugins/opcua/opcua_servicetable.c b/plugins/epan/opcua/opcua_servicetable.c similarity index 100% rename from plugins/opcua/opcua_servicetable.c rename to plugins/epan/opcua/opcua_servicetable.c diff --git a/plugins/opcua/opcua_servicetable.h b/plugins/epan/opcua/opcua_servicetable.h similarity index 100% rename from plugins/opcua/opcua_servicetable.h rename to plugins/epan/opcua/opcua_servicetable.h diff --git a/plugins/opcua/opcua_simpletypes.c b/plugins/epan/opcua/opcua_simpletypes.c similarity index 100% rename from plugins/opcua/opcua_simpletypes.c rename to plugins/epan/opcua/opcua_simpletypes.c diff --git a/plugins/opcua/opcua_simpletypes.h b/plugins/epan/opcua/opcua_simpletypes.h similarity index 100% rename from plugins/opcua/opcua_simpletypes.h rename to plugins/epan/opcua/opcua_simpletypes.h diff --git a/plugins/opcua/opcua_statuscode.c b/plugins/epan/opcua/opcua_statuscode.c similarity index 100% rename from plugins/opcua/opcua_statuscode.c rename to plugins/epan/opcua/opcua_statuscode.c diff --git a/plugins/opcua/opcua_statuscode.h b/plugins/epan/opcua/opcua_statuscode.h similarity index 100% rename from plugins/opcua/opcua_statuscode.h rename to plugins/epan/opcua/opcua_statuscode.h diff --git a/plugins/opcua/opcua_transport_layer.c b/plugins/epan/opcua/opcua_transport_layer.c similarity index 100% rename from plugins/opcua/opcua_transport_layer.c rename to plugins/epan/opcua/opcua_transport_layer.c diff --git a/plugins/opcua/opcua_transport_layer.h b/plugins/epan/opcua/opcua_transport_layer.h similarity index 100% rename from plugins/opcua/opcua_transport_layer.h rename to plugins/epan/opcua/opcua_transport_layer.h diff --git a/plugins/pluginifdemo/AUTHORS b/plugins/epan/pluginifdemo/AUTHORS similarity index 100% rename from plugins/pluginifdemo/AUTHORS rename to plugins/epan/pluginifdemo/AUTHORS diff --git a/plugins/pluginifdemo/CMakeLists.txt b/plugins/epan/pluginifdemo/CMakeLists.txt similarity index 100% rename from plugins/pluginifdemo/CMakeLists.txt rename to plugins/epan/pluginifdemo/CMakeLists.txt diff --git a/plugins/pluginifdemo/Makefile.am b/plugins/epan/pluginifdemo/Makefile.am similarity index 97% rename from plugins/pluginifdemo/Makefile.am rename to plugins/epan/pluginifdemo/Makefile.am index f1e4edf608..aca6a56b94 100644 --- a/plugins/pluginifdemo/Makefile.am +++ b/plugins/epan/pluginifdemo/Makefile.am @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include $(top_srcdir)/Makefile.am.inc -include ../Makefile.am.inc +include $(top_srcdir)/plugins/Makefile.am.inc # the name of the plugin PLUGIN_NAME = pluginifdemo diff --git a/plugins/pluginifdemo/README b/plugins/epan/pluginifdemo/README similarity index 100% rename from plugins/pluginifdemo/README rename to plugins/epan/pluginifdemo/README diff --git a/plugins/pluginifdemo/pluginifdemo.c b/plugins/epan/pluginifdemo/pluginifdemo.c similarity index 100% rename from plugins/pluginifdemo/pluginifdemo.c rename to plugins/epan/pluginifdemo/pluginifdemo.c diff --git a/plugins/pluginifdemo/pluginifdemo.h b/plugins/epan/pluginifdemo/pluginifdemo.h similarity index 100% rename from plugins/pluginifdemo/pluginifdemo.h rename to plugins/epan/pluginifdemo/pluginifdemo.h diff --git a/plugins/pluginifdemo/ui/pluginifdemo_about.cpp b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.cpp similarity index 100% rename from plugins/pluginifdemo/ui/pluginifdemo_about.cpp rename to plugins/epan/pluginifdemo/ui/pluginifdemo_about.cpp diff --git a/plugins/pluginifdemo/ui/pluginifdemo_about.h b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.h similarity index 100% rename from plugins/pluginifdemo/ui/pluginifdemo_about.h rename to plugins/epan/pluginifdemo/ui/pluginifdemo_about.h diff --git a/plugins/pluginifdemo/ui/pluginifdemo_about.ui b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.ui similarity index 100% rename from plugins/pluginifdemo/ui/pluginifdemo_about.ui rename to plugins/epan/pluginifdemo/ui/pluginifdemo_about.ui diff --git a/plugins/pluginifdemo/ui/pluginifdemo_main.cpp b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.cpp similarity index 100% rename from plugins/pluginifdemo/ui/pluginifdemo_main.cpp rename to plugins/epan/pluginifdemo/ui/pluginifdemo_main.cpp diff --git a/plugins/pluginifdemo/ui/pluginifdemo_main.h b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.h similarity index 100% rename from plugins/pluginifdemo/ui/pluginifdemo_main.h rename to plugins/epan/pluginifdemo/ui/pluginifdemo_main.h diff --git a/plugins/pluginifdemo/ui/pluginifdemo_main.ui b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.ui similarity index 100% rename from plugins/pluginifdemo/ui/pluginifdemo_main.ui rename to plugins/epan/pluginifdemo/ui/pluginifdemo_main.ui diff --git a/plugins/pluginifdemo/ui/uiclasshandler.cpp b/plugins/epan/pluginifdemo/ui/uiclasshandler.cpp similarity index 100% rename from plugins/pluginifdemo/ui/uiclasshandler.cpp rename to plugins/epan/pluginifdemo/ui/uiclasshandler.cpp diff --git a/plugins/pluginifdemo/ui/uihandler.cpp b/plugins/epan/pluginifdemo/ui/uihandler.cpp similarity index 100% rename from plugins/pluginifdemo/ui/uihandler.cpp rename to plugins/epan/pluginifdemo/ui/uihandler.cpp diff --git a/plugins/pluginifdemo/ui/uihandler.h b/plugins/epan/pluginifdemo/ui/uihandler.h similarity index 100% rename from plugins/pluginifdemo/ui/uihandler.h rename to plugins/epan/pluginifdemo/ui/uihandler.h diff --git a/plugins/profinet/AUTHORS b/plugins/epan/profinet/AUTHORS similarity index 100% rename from plugins/profinet/AUTHORS rename to plugins/epan/profinet/AUTHORS diff --git a/plugins/profinet/CMakeLists.txt b/plugins/epan/profinet/CMakeLists.txt similarity index 100% rename from plugins/profinet/CMakeLists.txt rename to plugins/epan/profinet/CMakeLists.txt diff --git a/plugins/profinet/ChangeLog b/plugins/epan/profinet/ChangeLog similarity index 100% rename from plugins/profinet/ChangeLog rename to plugins/epan/profinet/ChangeLog diff --git a/plugins/profinet/Makefile.am b/plugins/epan/profinet/Makefile.am similarity index 97% rename from plugins/profinet/Makefile.am rename to plugins/epan/profinet/Makefile.am index e638ecedfd..ce0888690c 100644 --- a/plugins/profinet/Makefile.am +++ b/plugins/epan/profinet/Makefile.am @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include $(top_srcdir)/Makefile.am.inc -include ../Makefile.am.inc +include $(top_srcdir)/plugins/Makefile.am.inc # the name of the plugin PLUGIN_NAME = profinet diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/epan/profinet/packet-dcerpc-pn-io.c similarity index 100% rename from plugins/profinet/packet-dcerpc-pn-io.c rename to plugins/epan/profinet/packet-dcerpc-pn-io.c diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/epan/profinet/packet-dcom-cba-acco.c similarity index 100% rename from plugins/profinet/packet-dcom-cba-acco.c rename to plugins/epan/profinet/packet-dcom-cba-acco.c diff --git a/plugins/profinet/packet-dcom-cba-acco.h b/plugins/epan/profinet/packet-dcom-cba-acco.h similarity index 100% rename from plugins/profinet/packet-dcom-cba-acco.h rename to plugins/epan/profinet/packet-dcom-cba-acco.h diff --git a/plugins/profinet/packet-dcom-cba.c b/plugins/epan/profinet/packet-dcom-cba.c similarity index 100% rename from plugins/profinet/packet-dcom-cba.c rename to plugins/epan/profinet/packet-dcom-cba.c diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/epan/profinet/packet-pn-dcp.c similarity index 100% rename from plugins/profinet/packet-pn-dcp.c rename to plugins/epan/profinet/packet-pn-dcp.c diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/epan/profinet/packet-pn-mrp.c similarity index 100% rename from plugins/profinet/packet-pn-mrp.c rename to plugins/epan/profinet/packet-pn-mrp.c diff --git a/plugins/profinet/packet-pn-mrrt.c b/plugins/epan/profinet/packet-pn-mrrt.c similarity index 100% rename from plugins/profinet/packet-pn-mrrt.c rename to plugins/epan/profinet/packet-pn-mrrt.c diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/epan/profinet/packet-pn-ptcp.c similarity index 100% rename from plugins/profinet/packet-pn-ptcp.c rename to plugins/epan/profinet/packet-pn-ptcp.c diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/epan/profinet/packet-pn-rt.c similarity index 100% rename from plugins/profinet/packet-pn-rt.c rename to plugins/epan/profinet/packet-pn-rt.c diff --git a/plugins/profinet/packet-pn-rtc-one.c b/plugins/epan/profinet/packet-pn-rtc-one.c similarity index 100% rename from plugins/profinet/packet-pn-rtc-one.c rename to plugins/epan/profinet/packet-pn-rtc-one.c diff --git a/plugins/profinet/packet-pn.c b/plugins/epan/profinet/packet-pn.c similarity index 100% rename from plugins/profinet/packet-pn.c rename to plugins/epan/profinet/packet-pn.c diff --git a/plugins/profinet/packet-pn.h b/plugins/epan/profinet/packet-pn.h similarity index 100% rename from plugins/profinet/packet-pn.h rename to plugins/epan/profinet/packet-pn.h diff --git a/plugins/stats_tree/AUTHORS b/plugins/epan/stats_tree/AUTHORS similarity index 100% rename from plugins/stats_tree/AUTHORS rename to plugins/epan/stats_tree/AUTHORS diff --git a/plugins/stats_tree/CMakeLists.txt b/plugins/epan/stats_tree/CMakeLists.txt similarity index 100% rename from plugins/stats_tree/CMakeLists.txt rename to plugins/epan/stats_tree/CMakeLists.txt diff --git a/plugins/stats_tree/Makefile.am b/plugins/epan/stats_tree/Makefile.am similarity index 96% rename from plugins/stats_tree/Makefile.am rename to plugins/epan/stats_tree/Makefile.am index 7bb578b133..1b4c9326cf 100644 --- a/plugins/stats_tree/Makefile.am +++ b/plugins/epan/stats_tree/Makefile.am @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include $(top_srcdir)/Makefile.am.inc -include ../Makefile.am.inc +include $(top_srcdir)/plugins/Makefile.am.inc # the name of the plugin PLUGIN_NAME = stats_tree diff --git a/plugins/stats_tree/pinfo_stats_tree.c b/plugins/epan/stats_tree/pinfo_stats_tree.c similarity index 100% rename from plugins/stats_tree/pinfo_stats_tree.c rename to plugins/epan/stats_tree/pinfo_stats_tree.c diff --git a/plugins/stats_tree/pinfo_stats_tree.h b/plugins/epan/stats_tree/pinfo_stats_tree.h similarity index 100% rename from plugins/stats_tree/pinfo_stats_tree.h rename to plugins/epan/stats_tree/pinfo_stats_tree.h diff --git a/plugins/stats_tree/stats_tree_plugin.c b/plugins/epan/stats_tree/stats_tree_plugin.c similarity index 100% rename from plugins/stats_tree/stats_tree_plugin.c rename to plugins/epan/stats_tree/stats_tree_plugin.c diff --git a/plugins/transum/AUTHORS b/plugins/epan/transum/AUTHORS similarity index 100% rename from plugins/transum/AUTHORS rename to plugins/epan/transum/AUTHORS diff --git a/plugins/transum/CMakeLists.txt b/plugins/epan/transum/CMakeLists.txt similarity index 100% rename from plugins/transum/CMakeLists.txt rename to plugins/epan/transum/CMakeLists.txt diff --git a/plugins/transum/Makefile.am b/plugins/epan/transum/Makefile.am similarity index 97% rename from plugins/transum/Makefile.am rename to plugins/epan/transum/Makefile.am index cf787e6592..615255c66b 100644 --- a/plugins/transum/Makefile.am +++ b/plugins/epan/transum/Makefile.am @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include $(top_srcdir)/Makefile.am.inc -include ../Makefile.am.inc +include $(top_srcdir)/plugins/Makefile.am.inc # the name of the plugin PLUGIN_NAME = transum diff --git a/plugins/transum/README b/plugins/epan/transum/README similarity index 100% rename from plugins/transum/README rename to plugins/epan/transum/README diff --git a/plugins/transum/decoders.c b/plugins/epan/transum/decoders.c similarity index 100% rename from plugins/transum/decoders.c rename to plugins/epan/transum/decoders.c diff --git a/plugins/transum/decoders.h b/plugins/epan/transum/decoders.h similarity index 100% rename from plugins/transum/decoders.h rename to plugins/epan/transum/decoders.h diff --git a/plugins/transum/extractors.c b/plugins/epan/transum/extractors.c similarity index 100% rename from plugins/transum/extractors.c rename to plugins/epan/transum/extractors.c diff --git a/plugins/transum/extractors.h b/plugins/epan/transum/extractors.h similarity index 100% rename from plugins/transum/extractors.h rename to plugins/epan/transum/extractors.h diff --git a/plugins/transum/packet-transum.c b/plugins/epan/transum/packet-transum.c similarity index 100% rename from plugins/transum/packet-transum.c rename to plugins/epan/transum/packet-transum.c diff --git a/plugins/transum/packet-transum.h b/plugins/epan/transum/packet-transum.h similarity index 100% rename from plugins/transum/packet-transum.h rename to plugins/epan/transum/packet-transum.h diff --git a/plugins/transum/preferences.h b/plugins/epan/transum/preferences.h similarity index 100% rename from plugins/transum/preferences.h rename to plugins/epan/transum/preferences.h diff --git a/plugins/unistim/AUTHORS b/plugins/epan/unistim/AUTHORS similarity index 100% rename from plugins/unistim/AUTHORS rename to plugins/epan/unistim/AUTHORS diff --git a/plugins/unistim/CMakeLists.txt b/plugins/epan/unistim/CMakeLists.txt similarity index 100% rename from plugins/unistim/CMakeLists.txt rename to plugins/epan/unistim/CMakeLists.txt diff --git a/plugins/unistim/ChangeLog b/plugins/epan/unistim/ChangeLog similarity index 100% rename from plugins/unistim/ChangeLog rename to plugins/epan/unistim/ChangeLog diff --git a/plugins/unistim/Makefile.am b/plugins/epan/unistim/Makefile.am similarity index 97% rename from plugins/unistim/Makefile.am rename to plugins/epan/unistim/Makefile.am index 0142166151..8c1ea042f1 100644 --- a/plugins/unistim/Makefile.am +++ b/plugins/epan/unistim/Makefile.am @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include $(top_srcdir)/Makefile.am.inc -include ../Makefile.am.inc +include $(top_srcdir)/plugins/Makefile.am.inc # the name of the plugin PLUGIN_NAME = unistim diff --git a/plugins/unistim/TODO b/plugins/epan/unistim/TODO similarity index 100% rename from plugins/unistim/TODO rename to plugins/epan/unistim/TODO diff --git a/plugins/unistim/audio.h b/plugins/epan/unistim/audio.h similarity index 100% rename from plugins/unistim/audio.h rename to plugins/epan/unistim/audio.h diff --git a/plugins/unistim/basic.h b/plugins/epan/unistim/basic.h similarity index 100% rename from plugins/unistim/basic.h rename to plugins/epan/unistim/basic.h diff --git a/plugins/unistim/broadcast.h b/plugins/epan/unistim/broadcast.h similarity index 100% rename from plugins/unistim/broadcast.h rename to plugins/epan/unistim/broadcast.h diff --git a/plugins/unistim/defines.h b/plugins/epan/unistim/defines.h similarity index 100% rename from plugins/unistim/defines.h rename to plugins/epan/unistim/defines.h diff --git a/plugins/unistim/display.h b/plugins/epan/unistim/display.h similarity index 100% rename from plugins/unistim/display.h rename to plugins/epan/unistim/display.h diff --git a/plugins/unistim/expansion.h b/plugins/epan/unistim/expansion.h similarity index 100% rename from plugins/unistim/expansion.h rename to plugins/epan/unistim/expansion.h diff --git a/plugins/unistim/key.h b/plugins/epan/unistim/key.h similarity index 100% rename from plugins/unistim/key.h rename to plugins/epan/unistim/key.h diff --git a/plugins/unistim/network.h b/plugins/epan/unistim/network.h similarity index 100% rename from plugins/unistim/network.h rename to plugins/epan/unistim/network.h diff --git a/plugins/unistim/packet-unistim.c b/plugins/epan/unistim/packet-unistim.c similarity index 100% rename from plugins/unistim/packet-unistim.c rename to plugins/epan/unistim/packet-unistim.c diff --git a/plugins/unistim/packet-unistim.h b/plugins/epan/unistim/packet-unistim.h similarity index 100% rename from plugins/unistim/packet-unistim.h rename to plugins/epan/unistim/packet-unistim.h diff --git a/plugins/unistim/uftp.h b/plugins/epan/unistim/uftp.h similarity index 100% rename from plugins/unistim/uftp.h rename to plugins/epan/unistim/uftp.h diff --git a/plugins/wimax/AUTHORS b/plugins/epan/wimax/AUTHORS similarity index 100% rename from plugins/wimax/AUTHORS rename to plugins/epan/wimax/AUTHORS diff --git a/plugins/wimax/CMakeLists.txt b/plugins/epan/wimax/CMakeLists.txt similarity index 100% rename from plugins/wimax/CMakeLists.txt rename to plugins/epan/wimax/CMakeLists.txt diff --git a/plugins/wimax/Makefile.am b/plugins/epan/wimax/Makefile.am similarity index 98% rename from plugins/wimax/Makefile.am rename to plugins/epan/wimax/Makefile.am index 82474f0053..3074a525a5 100644 --- a/plugins/wimax/Makefile.am +++ b/plugins/epan/wimax/Makefile.am @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include $(top_srcdir)/Makefile.am.inc -include ../Makefile.am.inc +include $(top_srcdir)/plugins/Makefile.am.inc # the name of the plugin PLUGIN_NAME = wimax diff --git a/plugins/wimax/README.wimax b/plugins/epan/wimax/README.wimax similarity index 100% rename from plugins/wimax/README.wimax rename to plugins/epan/wimax/README.wimax diff --git a/plugins/wimax/crc.c b/plugins/epan/wimax/crc.c similarity index 100% rename from plugins/wimax/crc.c rename to plugins/epan/wimax/crc.c diff --git a/plugins/wimax/crc.h b/plugins/epan/wimax/crc.h similarity index 100% rename from plugins/wimax/crc.h rename to plugins/epan/wimax/crc.h diff --git a/plugins/wimax/crc_data.c b/plugins/epan/wimax/crc_data.c similarity index 100% rename from plugins/wimax/crc_data.c rename to plugins/epan/wimax/crc_data.c diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/epan/wimax/mac_hd_generic_decoder.c similarity index 100% rename from plugins/wimax/mac_hd_generic_decoder.c rename to plugins/epan/wimax/mac_hd_generic_decoder.c diff --git a/plugins/wimax/mac_hd_type1_decoder.c b/plugins/epan/wimax/mac_hd_type1_decoder.c similarity index 100% rename from plugins/wimax/mac_hd_type1_decoder.c rename to plugins/epan/wimax/mac_hd_type1_decoder.c diff --git a/plugins/wimax/mac_hd_type2_decoder.c b/plugins/epan/wimax/mac_hd_type2_decoder.c similarity index 100% rename from plugins/wimax/mac_hd_type2_decoder.c rename to plugins/epan/wimax/mac_hd_type2_decoder.c diff --git a/plugins/wimax/mac_mgmt_msg_decoder.c b/plugins/epan/wimax/mac_mgmt_msg_decoder.c similarity index 100% rename from plugins/wimax/mac_mgmt_msg_decoder.c rename to plugins/epan/wimax/mac_mgmt_msg_decoder.c diff --git a/plugins/wimax/msg_aas_beam.c b/plugins/epan/wimax/msg_aas_beam.c similarity index 100% rename from plugins/wimax/msg_aas_beam.c rename to plugins/epan/wimax/msg_aas_beam.c diff --git a/plugins/wimax/msg_aas_fbck.c b/plugins/epan/wimax/msg_aas_fbck.c similarity index 100% rename from plugins/wimax/msg_aas_fbck.c rename to plugins/epan/wimax/msg_aas_fbck.c diff --git a/plugins/wimax/msg_arq.c b/plugins/epan/wimax/msg_arq.c similarity index 100% rename from plugins/wimax/msg_arq.c rename to plugins/epan/wimax/msg_arq.c diff --git a/plugins/wimax/msg_clk_cmp.c b/plugins/epan/wimax/msg_clk_cmp.c similarity index 100% rename from plugins/wimax/msg_clk_cmp.c rename to plugins/epan/wimax/msg_clk_cmp.c diff --git a/plugins/wimax/msg_dcd.c b/plugins/epan/wimax/msg_dcd.c similarity index 100% rename from plugins/wimax/msg_dcd.c rename to plugins/epan/wimax/msg_dcd.c diff --git a/plugins/wimax/msg_dlmap.c b/plugins/epan/wimax/msg_dlmap.c similarity index 100% rename from plugins/wimax/msg_dlmap.c rename to plugins/epan/wimax/msg_dlmap.c diff --git a/plugins/wimax/msg_dreg.c b/plugins/epan/wimax/msg_dreg.c similarity index 100% rename from plugins/wimax/msg_dreg.c rename to plugins/epan/wimax/msg_dreg.c diff --git a/plugins/wimax/msg_dsa.c b/plugins/epan/wimax/msg_dsa.c similarity index 100% rename from plugins/wimax/msg_dsa.c rename to plugins/epan/wimax/msg_dsa.c diff --git a/plugins/wimax/msg_dsc.c b/plugins/epan/wimax/msg_dsc.c similarity index 100% rename from plugins/wimax/msg_dsc.c rename to plugins/epan/wimax/msg_dsc.c diff --git a/plugins/wimax/msg_dsd.c b/plugins/epan/wimax/msg_dsd.c similarity index 100% rename from plugins/wimax/msg_dsd.c rename to plugins/epan/wimax/msg_dsd.c diff --git a/plugins/wimax/msg_dsx_rvd.c b/plugins/epan/wimax/msg_dsx_rvd.c similarity index 100% rename from plugins/wimax/msg_dsx_rvd.c rename to plugins/epan/wimax/msg_dsx_rvd.c diff --git a/plugins/wimax/msg_fpc.c b/plugins/epan/wimax/msg_fpc.c similarity index 100% rename from plugins/wimax/msg_fpc.c rename to plugins/epan/wimax/msg_fpc.c diff --git a/plugins/wimax/msg_pkm.c b/plugins/epan/wimax/msg_pkm.c similarity index 100% rename from plugins/wimax/msg_pkm.c rename to plugins/epan/wimax/msg_pkm.c diff --git a/plugins/wimax/msg_pmc.c b/plugins/epan/wimax/msg_pmc.c similarity index 100% rename from plugins/wimax/msg_pmc.c rename to plugins/epan/wimax/msg_pmc.c diff --git a/plugins/wimax/msg_prc_lt_ctrl.c b/plugins/epan/wimax/msg_prc_lt_ctrl.c similarity index 100% rename from plugins/wimax/msg_prc_lt_ctrl.c rename to plugins/epan/wimax/msg_prc_lt_ctrl.c diff --git a/plugins/wimax/msg_reg_req.c b/plugins/epan/wimax/msg_reg_req.c similarity index 100% rename from plugins/wimax/msg_reg_req.c rename to plugins/epan/wimax/msg_reg_req.c diff --git a/plugins/wimax/msg_reg_rsp.c b/plugins/epan/wimax/msg_reg_rsp.c similarity index 100% rename from plugins/wimax/msg_reg_rsp.c rename to plugins/epan/wimax/msg_reg_rsp.c diff --git a/plugins/wimax/msg_rep.c b/plugins/epan/wimax/msg_rep.c similarity index 100% rename from plugins/wimax/msg_rep.c rename to plugins/epan/wimax/msg_rep.c diff --git a/plugins/wimax/msg_res_cmd.c b/plugins/epan/wimax/msg_res_cmd.c similarity index 100% rename from plugins/wimax/msg_res_cmd.c rename to plugins/epan/wimax/msg_res_cmd.c diff --git a/plugins/wimax/msg_rng_req.c b/plugins/epan/wimax/msg_rng_req.c similarity index 100% rename from plugins/wimax/msg_rng_req.c rename to plugins/epan/wimax/msg_rng_req.c diff --git a/plugins/wimax/msg_rng_rsp.c b/plugins/epan/wimax/msg_rng_rsp.c similarity index 100% rename from plugins/wimax/msg_rng_rsp.c rename to plugins/epan/wimax/msg_rng_rsp.c diff --git a/plugins/wimax/msg_sbc.c b/plugins/epan/wimax/msg_sbc.c similarity index 100% rename from plugins/wimax/msg_sbc.c rename to plugins/epan/wimax/msg_sbc.c diff --git a/plugins/wimax/msg_ucd.c b/plugins/epan/wimax/msg_ucd.c similarity index 100% rename from plugins/wimax/msg_ucd.c rename to plugins/epan/wimax/msg_ucd.c diff --git a/plugins/wimax/msg_ulmap.c b/plugins/epan/wimax/msg_ulmap.c similarity index 100% rename from plugins/wimax/msg_ulmap.c rename to plugins/epan/wimax/msg_ulmap.c diff --git a/plugins/wimax/packet-m2m.c b/plugins/epan/wimax/packet-m2m.c similarity index 100% rename from plugins/wimax/packet-m2m.c rename to plugins/epan/wimax/packet-m2m.c diff --git a/plugins/wimax/packet-wmx.c b/plugins/epan/wimax/packet-wmx.c similarity index 100% rename from plugins/wimax/packet-wmx.c rename to plugins/epan/wimax/packet-wmx.c diff --git a/plugins/wimax/wimax-int.h b/plugins/epan/wimax/wimax-int.h similarity index 100% rename from plugins/wimax/wimax-int.h rename to plugins/epan/wimax/wimax-int.h diff --git a/plugins/wimax/wimax_bits.h b/plugins/epan/wimax/wimax_bits.h similarity index 100% rename from plugins/wimax/wimax_bits.h rename to plugins/epan/wimax/wimax_bits.h diff --git a/plugins/wimax/wimax_cdma_code_decoder.c b/plugins/epan/wimax/wimax_cdma_code_decoder.c similarity index 100% rename from plugins/wimax/wimax_cdma_code_decoder.c rename to plugins/epan/wimax/wimax_cdma_code_decoder.c diff --git a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c b/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.c similarity index 100% rename from plugins/wimax/wimax_compact_dlmap_ie_decoder.c rename to plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.c diff --git a/plugins/wimax/wimax_compact_dlmap_ie_decoder.h b/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.h similarity index 100% rename from plugins/wimax/wimax_compact_dlmap_ie_decoder.h rename to plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.h diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c b/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.c similarity index 100% rename from plugins/wimax/wimax_compact_ulmap_ie_decoder.c rename to plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.c diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.h b/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.h similarity index 100% rename from plugins/wimax/wimax_compact_ulmap_ie_decoder.h rename to plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.h diff --git a/plugins/wimax/wimax_fch_decoder.c b/plugins/epan/wimax/wimax_fch_decoder.c similarity index 100% rename from plugins/wimax/wimax_fch_decoder.c rename to plugins/epan/wimax/wimax_fch_decoder.c diff --git a/plugins/wimax/wimax_ffb_decoder.c b/plugins/epan/wimax/wimax_ffb_decoder.c similarity index 100% rename from plugins/wimax/wimax_ffb_decoder.c rename to plugins/epan/wimax/wimax_ffb_decoder.c diff --git a/plugins/wimax/wimax_hack_decoder.c b/plugins/epan/wimax/wimax_hack_decoder.c similarity index 100% rename from plugins/wimax/wimax_hack_decoder.c rename to plugins/epan/wimax/wimax_hack_decoder.c diff --git a/plugins/wimax/wimax_harq_map_decoder.c b/plugins/epan/wimax/wimax_harq_map_decoder.c similarity index 100% rename from plugins/wimax/wimax_harq_map_decoder.c rename to plugins/epan/wimax/wimax_harq_map_decoder.c diff --git a/plugins/wimax/wimax_mac.h b/plugins/epan/wimax/wimax_mac.h similarity index 100% rename from plugins/wimax/wimax_mac.h rename to plugins/epan/wimax/wimax_mac.h diff --git a/plugins/wimax/wimax_pdu_decoder.c b/plugins/epan/wimax/wimax_pdu_decoder.c similarity index 100% rename from plugins/wimax/wimax_pdu_decoder.c rename to plugins/epan/wimax/wimax_pdu_decoder.c diff --git a/plugins/wimax/wimax_phy_attributes_decoder.c b/plugins/epan/wimax/wimax_phy_attributes_decoder.c similarity index 100% rename from plugins/wimax/wimax_phy_attributes_decoder.c rename to plugins/epan/wimax/wimax_phy_attributes_decoder.c diff --git a/plugins/wimax/wimax_tlv.c b/plugins/epan/wimax/wimax_tlv.c similarity index 100% rename from plugins/wimax/wimax_tlv.c rename to plugins/epan/wimax/wimax_tlv.c diff --git a/plugins/wimax/wimax_tlv.h b/plugins/epan/wimax/wimax_tlv.h similarity index 100% rename from plugins/wimax/wimax_tlv.h rename to plugins/epan/wimax/wimax_tlv.h diff --git a/plugins/wimax/wimax_utils.c b/plugins/epan/wimax/wimax_utils.c similarity index 100% rename from plugins/wimax/wimax_utils.c rename to plugins/epan/wimax/wimax_utils.c diff --git a/plugins/wimax/wimax_utils.h b/plugins/epan/wimax/wimax_utils.h similarity index 100% rename from plugins/wimax/wimax_utils.h rename to plugins/epan/wimax/wimax_utils.h diff --git a/plugins/wimaxasncp/AUTHORS b/plugins/epan/wimaxasncp/AUTHORS similarity index 100% rename from plugins/wimaxasncp/AUTHORS rename to plugins/epan/wimaxasncp/AUTHORS diff --git a/plugins/wimaxasncp/CMakeLists.txt b/plugins/epan/wimaxasncp/CMakeLists.txt similarity index 100% rename from plugins/wimaxasncp/CMakeLists.txt rename to plugins/epan/wimaxasncp/CMakeLists.txt diff --git a/plugins/wimaxasncp/ChangeLog b/plugins/epan/wimaxasncp/ChangeLog similarity index 100% rename from plugins/wimaxasncp/ChangeLog rename to plugins/epan/wimaxasncp/ChangeLog diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/epan/wimaxasncp/Makefile.am similarity index 98% rename from plugins/wimaxasncp/Makefile.am rename to plugins/epan/wimaxasncp/Makefile.am index e7216f5b4d..c2f122c3b0 100644 --- a/plugins/wimaxasncp/Makefile.am +++ b/plugins/epan/wimaxasncp/Makefile.am @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include $(top_srcdir)/Makefile.am.inc -include ../Makefile.am.inc +include $(top_srcdir)/plugins/Makefile.am.inc # the name of the plugin PLUGIN_NAME = wimaxasncp diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/epan/wimaxasncp/packet-wimaxasncp.c similarity index 100% rename from plugins/wimaxasncp/packet-wimaxasncp.c rename to plugins/epan/wimaxasncp/packet-wimaxasncp.c diff --git a/plugins/wimaxasncp/wimaxasncp_dict.h b/plugins/epan/wimaxasncp/wimaxasncp_dict.h similarity index 100% rename from plugins/wimaxasncp/wimaxasncp_dict.h rename to plugins/epan/wimaxasncp/wimaxasncp_dict.h diff --git a/plugins/wimaxasncp/wimaxasncp_dict.l b/plugins/epan/wimaxasncp/wimaxasncp_dict.l similarity index 100% rename from plugins/wimaxasncp/wimaxasncp_dict.l rename to plugins/epan/wimaxasncp/wimaxasncp_dict.l diff --git a/plugins/wimaxmacphy/AUTHORS b/plugins/epan/wimaxmacphy/AUTHORS similarity index 100% rename from plugins/wimaxmacphy/AUTHORS rename to plugins/epan/wimaxmacphy/AUTHORS diff --git a/plugins/wimaxmacphy/CMakeLists.txt b/plugins/epan/wimaxmacphy/CMakeLists.txt similarity index 100% rename from plugins/wimaxmacphy/CMakeLists.txt rename to plugins/epan/wimaxmacphy/CMakeLists.txt diff --git a/plugins/wimaxmacphy/ChangeLog b/plugins/epan/wimaxmacphy/ChangeLog similarity index 100% rename from plugins/wimaxmacphy/ChangeLog rename to plugins/epan/wimaxmacphy/ChangeLog diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/epan/wimaxmacphy/Makefile.am similarity index 97% rename from plugins/wimaxmacphy/Makefile.am rename to plugins/epan/wimaxmacphy/Makefile.am index d6208fea98..3edb07567a 100644 --- a/plugins/wimaxmacphy/Makefile.am +++ b/plugins/epan/wimaxmacphy/Makefile.am @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. include $(top_srcdir)/Makefile.am.inc -include ../Makefile.am.inc +include $(top_srcdir)/plugins/Makefile.am.inc # the name of the plugin PLUGIN_NAME = wimaxmacphy diff --git a/plugins/wimaxmacphy/packet-wimaxmacphy.c b/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c similarity index 100% rename from plugins/wimaxmacphy/packet-wimaxmacphy.c rename to plugins/epan/wimaxmacphy/packet-wimaxmacphy.c diff --git a/plugins/wimaxmacphy/packet-wimaxmacphy.h b/plugins/epan/wimaxmacphy/packet-wimaxmacphy.h similarity index 100% rename from plugins/wimaxmacphy/packet-wimaxmacphy.h rename to plugins/epan/wimaxmacphy/packet-wimaxmacphy.h diff --git a/ui/voip_calls.c b/ui/voip_calls.c index 6976091d48..371b5ebfb5 100644 --- a/ui/voip_calls.c +++ b/ui/voip_calls.c @@ -55,7 +55,7 @@ #include "epan/dissectors/packet-t30.h" #include "epan/dissectors/packet-h248.h" #include "epan/dissectors/packet-sccp.h" -#include "plugins/unistim/packet-unistim.h" +#include "plugins/epan/unistim/packet-unistim.h" #include "epan/dissectors/packet-skinny.h" #include "epan/dissectors/packet-iax2.h" #include "epan/rtp_pt.h" diff --git a/wsutil/plugins.c b/wsutil/plugins.c index 858edbe205..8c89f4657c 100644 --- a/wsutil/plugins.c +++ b/wsutil/plugins.c @@ -34,7 +34,6 @@ typedef struct _plugin { GModule *handle; /* handle returned by g_module_open */ gchar *name; /* plugin name */ const gchar *version; /* plugin version */ - const gchar *type_dir; /* filesystem name (where it resides). */ const gchar *type_name; /* user-facing name (what it does). Should these be capitalized? */ } plugin; @@ -51,6 +50,41 @@ static GPtrArray *plugins_array = NULL; /* map of names to plugin */ static GHashTable *plugins_table = NULL; + +static inline const char * +type_to_dir(plugin_type_e type) +{ + switch (type) { + case WS_PLUGIN_EPAN: + return TYPE_DIR_EPAN; + case WS_PLUGIN_WIRETAP: + return TYPE_DIR_WIRETAP; + case WS_PLUGIN_CODEC: + return TYPE_DIR_CODECS; + default: + g_error("Unknown plugin type: %u. Aborting.", (unsigned) type); + break; + } + g_assert_not_reached(); +} + +static inline const char * +type_to_name(plugin_type_e type) +{ + switch (type) { + case WS_PLUGIN_EPAN: + return TYPE_NAME_DISSECTOR; + case WS_PLUGIN_WIRETAP: + return TYPE_NAME_FILE_TYPE; + case WS_PLUGIN_CODEC: + return TYPE_NAME_CODEC; + default: + g_error("Unknown plugin type: %u. Aborting.", (unsigned) type); + break; + } + g_assert_not_reached(); +} + static void free_plugin(gpointer data) { @@ -67,20 +101,28 @@ compare_plugins(gconstpointer a, gconstpointer b) } static void -plugins_scan_dir(GPtrArray **plugins_ptr, const char *dirpath, plugin_type_e type, gboolean build_dir) +plugins_scan_dir(GPtrArray **plugins_ptr, const char *dirpath, plugin_type_e type, gboolean append_type) { GDir *dir; const char *name; /* current file name */ - gchar *path; /* current file full path */ + gchar *plugin_folder; + gchar *plugin_file; /* current file full path */ GModule *handle; /* handle returned by g_module_open */ gpointer symbol; const char *plug_version, *plug_release; plugin *new_plug; gchar *dot; - dir = g_dir_open(dirpath, 0, NULL); - if (dir == NULL) + if (append_type) + plugin_folder = g_build_filename(dirpath, type_to_dir(type), (gchar *)NULL); + else + plugin_folder = g_strdup(dirpath); + + dir = g_dir_open(plugin_folder, 0, NULL); + if (dir == NULL) { + g_free(plugin_folder); return; + } while ((name = g_dir_read_name(dir)) != NULL) { /* Skip anything but files with G_MODULE_SUFFIX. */ @@ -103,16 +145,14 @@ plugins_scan_dir(GPtrArray **plugins_ptr, const char *dirpath, plugin_type_e typ */ if (g_hash_table_lookup(plugins_table, name)) { /* Yes, it is. */ - if (!build_dir) { - report_warning("The plugin '%s' was found " + report_warning("The plugin '%s' was found " "in multiple directories", name); - } continue; } - path = g_build_filename(dirpath, name, (gchar *)NULL); - handle = g_module_open(path, G_MODULE_BIND_LOCAL); - g_free(path); + plugin_file = g_build_filename(plugin_folder, name, (gchar *)NULL); + handle = g_module_open(plugin_file, G_MODULE_BIND_LOCAL); + g_free(plugin_file); if (handle == NULL) { /* g_module_error() provides file path. */ report_failure("Couldn't load plugin '%s': %s", name, @@ -157,31 +197,7 @@ DIAG_ON(pedantic) new_plug->handle = handle; new_plug->name = g_strdup(name); new_plug->version = plug_version; - new_plug->type_dir = "[build]"; - switch (type) { - case WS_PLUGIN_EPAN: - if (!build_dir) { - new_plug->type_dir = TYPE_DIR_EPAN; - } - // XXX This isn't true for stats_tree and TRANSUM. - new_plug->type_name = TYPE_NAME_DISSECTOR; - break; - case WS_PLUGIN_WIRETAP: - if (!build_dir) { - new_plug->type_dir = TYPE_DIR_WIRETAP; - } - new_plug->type_name = TYPE_NAME_FILE_TYPE; - break; - case WS_PLUGIN_CODEC: - if (!build_dir) { - new_plug->type_dir = TYPE_DIR_CODECS; - } - new_plug->type_name = TYPE_NAME_CODEC; - break; - default: - g_error("Unknown plugin type: %u. Aborting.", (unsigned) type); - break; - } + new_plug->type_name = type_to_name(type); /* Add it to the list of plugins. */ if (*plugins_ptr == NULL) @@ -191,6 +207,7 @@ DIAG_ON(pedantic) g_hash_table_insert(plugins_table, new_plug->name, new_plug); } ws_dir_close(dir); + g_free(plugin_folder); } /* @@ -199,17 +216,23 @@ DIAG_ON(pedantic) static void scan_plugins_build_dir(GPtrArray **plugins_ptr, plugin_type_e type) { - const char *plugin_dir; const char *name; - char *plugin_dir_path; + char *dirpath; + char *plugin_folder; WS_DIR *dir; /* scanned directory */ WS_DIRENT *file; /* current file */ - plugin_dir = get_plugins_dir(); - if ((dir = ws_dir_open(plugin_dir, 0, NULL)) == NULL) - return; + /* Cmake */ + plugins_scan_dir(plugins_ptr, get_plugins_dir_with_version(), type, TRUE); + + /* Autotools */ + dirpath = g_build_filename(get_plugins_dir(), type_to_dir(type), (char *)NULL); + dir = ws_dir_open(dirpath, 0, NULL); + if (dir == NULL) { + g_free(dirpath); + return; + } - plugins_scan_dir(plugins_ptr, plugin_dir, type, TRUE); while ((file = ws_dir_read_name(dir)) != NULL) { name = ws_dir_get_name(file); @@ -219,8 +242,8 @@ scan_plugins_build_dir(GPtrArray **plugins_ptr, plugin_type_e type) * Get the full path of a ".libs" subdirectory of that * directory. */ - plugin_dir_path = g_build_filename(plugin_dir, name, ".libs", (gchar *)NULL); - if (test_for_directory(plugin_dir_path) != EISDIR) { + plugin_folder = g_build_filename(dirpath, name, ".libs", (gchar *)NULL); + if (test_for_directory(plugin_folder) != EISDIR) { /* * Either it doesn't refer to a directory or it * refers to something that doesn't exist. @@ -229,13 +252,14 @@ scan_plugins_build_dir(GPtrArray **plugins_ptr, plugin_type_e type) * the subdirectory of the plugin directory, not * a ".libs" subdirectory of that subdirectory. */ - g_free(plugin_dir_path); - plugin_dir_path = g_build_filename(plugin_dir, name, (gchar *)NULL); + g_free(plugin_folder); + plugin_folder = g_build_filename(get_plugins_dir(), name, (gchar *)NULL); } - plugins_scan_dir(plugins_ptr, plugin_dir_path, type, TRUE); - g_free(plugin_dir_path); + plugins_scan_dir(plugins_ptr, plugin_folder, type, FALSE); + g_free(plugin_folder); } ws_dir_close(dir); + g_free(dirpath); } /* @@ -247,24 +271,6 @@ plugins_init(plugin_type_e type) if (!g_module_supported()) return NULL; /* nothing to do */ - const char *type_dir; - - switch (type) { - case WS_PLUGIN_EPAN: - type_dir = TYPE_DIR_EPAN; - break; - case WS_PLUGIN_WIRETAP: - type_dir = TYPE_DIR_WIRETAP; - break; - case WS_PLUGIN_CODEC: - type_dir = TYPE_DIR_CODECS; - break; - default: - g_error("Unknown plugin type: %u. Aborting.", (unsigned) type); - break; - } - - gchar *dirpath; GPtrArray *plugins = NULL; if (plugins_table == NULL) @@ -285,9 +291,7 @@ plugins_init(plugin_type_e type) } else { - dirpath = g_build_filename(get_plugins_dir_with_version(), type_dir, (gchar *)NULL); - plugins_scan_dir(&plugins, dirpath, type, FALSE); - g_free(dirpath); + plugins_scan_dir(&plugins, get_plugins_dir_with_version(), type, TRUE); } /* @@ -300,9 +304,7 @@ plugins_init(plugin_type_e type) */ if (!started_with_special_privs()) { - dirpath = g_build_filename(get_plugins_pers_dir_with_version(), type_dir, (gchar *)NULL); - plugins_scan_dir(&plugins, dirpath, type, FALSE); - g_free(dirpath); + plugins_scan_dir(&plugins, get_plugins_pers_dir_with_version(), type, TRUE); } g_ptr_array_sort(plugins_array, compare_plugins);