From 63af1da7e72dea670594aa7ce521adc8020ecab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Sun, 3 Feb 2019 02:15:13 +0000 Subject: [PATCH] Kill libwscodecs plugin library, just use plugins Change-Id: I085d04840acb53b0b7681787429a2b4e10547cd5 Reviewed-on: https://code.wireshark.org/review/33068 Reviewed-by: Anders Broman --- CMakeLists.txt | 4 -- codecs/CMakeLists.txt | 60 -------------------------- debian/control | 13 +----- debian/libwscodecs0.install | 2 - debian/libwscodecs0.lintian-overrides | 2 - debian/libwscodecs0.symbols | 13 ------ doc/README.plugins | 2 +- docbook/wsug_src/WSUG_app_files.adoc | 4 +- image/libwscodecs.rc.in | 35 --------------- packaging/nsis/wireshark.nsi | 1 - packaging/wix/ComponentGroups.wxi | 4 -- plugins/codecs/G711/CMakeLists.txt | 2 +- plugins/codecs/G711/G711decode.c | 2 +- plugins/codecs/G722/CMakeLists.txt | 2 +- plugins/codecs/G722/G722decode.c | 2 +- plugins/codecs/G726/CMakeLists.txt | 2 +- plugins/codecs/G726/G726decode.c | 2 +- plugins/codecs/G729/CMakeLists.txt | 2 +- plugins/codecs/G729/G729decode.c | 2 +- plugins/codecs/l16_mono/CMakeLists.txt | 2 +- plugins/codecs/l16_mono/l16decode.c | 2 +- plugins/codecs/sbc/CMakeLists.txt | 2 +- plugins/codecs/sbc/sbc.c | 2 +- sharkd.c | 2 +- tools/make-plugin-reg.py | 2 +- ui/qt/main.cpp | 2 +- ui/rtp_media.c | 2 +- wsutil/CMakeLists.txt | 2 + {codecs => wsutil}/codecs.c | 0 {codecs => wsutil}/codecs.h | 0 30 files changed, 22 insertions(+), 152 deletions(-) delete mode 100644 codecs/CMakeLists.txt delete mode 100644 debian/libwscodecs0.install delete mode 100644 debian/libwscodecs0.lintian-overrides delete mode 100644 debian/libwscodecs0.symbols delete mode 100644 image/libwscodecs.rc.in rename {codecs => wsutil}/codecs.c (100%) rename {codecs => wsutil}/codecs.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b5c5d2917..c7d40a6d30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1364,7 +1364,6 @@ set(PLUGIN_VERSION_DIR "plugins/${PLUGIN_PATH_ID}") add_subdirectory( capchild ) add_subdirectory( caputils ) -add_subdirectory( codecs ) add_subdirectory( doc ) add_subdirectory( docbook EXCLUDE_FROM_ALL ) add_subdirectory( epan ) @@ -1523,7 +1522,6 @@ set(CFG_OUT_FILES image/libwireshark.rc image/wireshark.rc image/dumpcap.rc - image/libwscodecs.rc image/libwsutil.rc image/wiretap.rc image/wireshark.exe.manifest @@ -2216,7 +2214,6 @@ if(BUILD_wireshark AND QT_FOUND) capchild caputils wiretap - wscodecs epan ${QT_LIBRARIES} ${VERSION_INFO_LIBS} @@ -2416,7 +2413,6 @@ endif() if(BUILD_sharkd) set(sharkd_LIBS ui - wscodecs wiretap epan ${VERSION_INFO_LIBS} diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt deleted file mode 100644 index 13bf62ca23..0000000000 --- a/codecs/CMakeLists.txt +++ /dev/null @@ -1,60 +0,0 @@ -# CMakeLists.txt -# -# Wireshark - Network traffic analyzer -# By Gerald Combs -# Copyright 1998 Gerald Combs -# -# SPDX-License-Identifier: GPL-2.0-or-later -# - -set(WSCODECS_PUBLIC_HEADERS - codecs.h -) - -set(WSCODECS_FILES - codecs.c -) - -# Enables visibility in IDEs -file(GLOB EXTRA_CODEC_HEADERS - codecs.h -) - -set(wscodecs_LIBS - wsutil -) - -add_library(wscodecs - ${WSCODECS_FILES} - ${CMAKE_BINARY_DIR}/image/libwscodecs.rc -) - -set_target_properties(wscodecs PROPERTIES - PREFIX "lib" - COMPILE_DEFINITIONS "WS_BUILD_DLL" - LINK_FLAGS "${WS_LINK_FLAGS}" - VERSION "0.0.0" SOVERSION 0 - FOLDER "DLLs" - INSTALL_RPATH "${LIBRARY_INSTALL_RPATH}" -) - -target_link_libraries(wscodecs ${wscodecs_LIBS}) - -install(TARGETS wscodecs - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -) - -install(FILES ${WSCODECS_PUBLIC_HEADERS} - DESTINATION "${PROJECT_INSTALL_INCLUDEDIR}/codecs" -) - -CHECKAPI( - NAME - codecs - SWITCHES - -g abort -g termoutput -build - SOURCES - ${WSCODECS_FILES} -) diff --git a/debian/control b/debian/control index 707ba84281..71de626515 100644 --- a/debian/control +++ b/debian/control @@ -129,7 +129,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark-data (>= ${source:Version}), - libwsutil0 (>= ${source:Version}), libwscodecs0 (>= ${source:Version}) + libwsutil0 (>= ${source:Version}) Suggests: wireshark-doc (>= ${source:Version}) Conflicts: wireshark-common (<< 1.4.0~rc2-1) Replaces: wireshark-common (<< 1.4.0~rc2-1) @@ -162,17 +162,6 @@ Description: network packet dissection utilities library -- development files This package contains the static library and the C header files that are needed for applications to use the libwsutil library. -Package: libwscodecs0 -Section: libs -Architecture: any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: wireshark-common (<< 1.4.0~rc2-1), libwireshark1 (<< 1.4.2-2) -Replaces: wireshark-common (<< 1.4.0~rc2-1), libwireshark1 (<< 1.4.2-2) -Description: network packet dissection codecs library -- shared library - The libwscodecs library provides codec functions for libwireshark0. - Package: libwireshark-data Section: libs Architecture: all diff --git a/debian/libwscodecs0.install b/debian/libwscodecs0.install deleted file mode 100644 index f41f8804da..0000000000 --- a/debian/libwscodecs0.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libwscodecs.so.* -usr/lib/*/wireshark/plugins/*/codecs/*.so diff --git a/debian/libwscodecs0.lintian-overrides b/debian/libwscodecs0.lintian-overrides deleted file mode 100644 index 93bf482334..0000000000 --- a/debian/libwscodecs0.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# It's a plugin. -libwscodecs0: library-not-linked-against-libc usr/lib/x86_64-linux-gnu/wireshark/plugins/2.9/codecs/l16mono.so diff --git a/debian/libwscodecs0.symbols b/debian/libwscodecs0.symbols deleted file mode 100644 index e2f4951ebf..0000000000 --- a/debian/libwscodecs0.symbols +++ /dev/null @@ -1,13 +0,0 @@ -libwscodecs.so.0 libwscodecs0 #MINVER# - codec_decode@Base 2.1.0 - codec_get_channels@Base 2.1.0 - codec_get_frequency@Base 2.1.0 - codec_init@Base 2.1.0 - codec_release@Base 2.1.0 - deregister_codec@Base 2.1.0 - find_codec@Base 2.1.0 - codecs_init@Base 2.5.0 - codecs_cleanup@Base 2.5.0 - codecs_register_plugin@Base 2.5.0 - codec_get_compiled_version_info@Base 2.3.0 - register_codec@Base 2.1.0 diff --git a/doc/README.plugins b/doc/README.plugins index d39d244461..6b5ff20a8a 100644 --- a/doc/README.plugins +++ b/doc/README.plugins @@ -170,7 +170,7 @@ make install 5.1 How to update an "old style" plugin (since Wireshark 2.5) Plugins need exactly three visible symbols: plugin_version, plugin_release and -plugin_register. Each plugin is either a libwscodecs plugin, libwiretap plugin or +plugin_register. Each plugin is either a codec plugin, libwiretap plugin or libwireshark plugin and the library will call "plugin_register" after loading the plugin. "plugin_register" in turn calls all the hooks necessary to enable the plugin. So if you had two function like so: diff --git a/docbook/wsug_src/WSUG_app_files.adoc b/docbook/wsug_src/WSUG_app_files.adoc index a9ae1425ba..36c9c4393b 100644 --- a/docbook/wsug_src/WSUG_app_files.adoc +++ b/docbook/wsug_src/WSUG_app_files.adoc @@ -476,8 +476,8 @@ Wireshark looks for plugins in both a personal plugin folder and a global plugin folder. Lua plugins are stored in the plugin folders; compiled plugins are stored in subfolders of the plugin folders, with the subfolder name being the Wireshark minor version number (X.Y). There is -another hierarchical level for each Wireshark library (libwireshark, libwscodecs -and libwiretap). So for example the location for a libwireshark plugin +another hierarchical level for each Wireshark plugin type (libwireshark, +libwiretap and codecs). So for example the location for a libwireshark plugin _foo.so_ (_foo.dll_ on Windows) would be _PLUGINDIR/X.Y/epan_ (libwireshark used to be called libepan; the other folder names are _codecs_ and _wiretap_). diff --git a/image/libwscodecs.rc.in b/image/libwscodecs.rc.in deleted file mode 100644 index e529975fec..0000000000 --- a/image/libwscodecs.rc.in +++ /dev/null @@ -1,35 +0,0 @@ -#include "winver.h" -#pragma code_page(65001) - -VS_VERSION_INFO VERSIONINFO - FILEVERSION @RC_VERSION@ - PRODUCTVERSION @RC_VERSION@ - FILEFLAGSMASK 0x0L -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS 0x0L -#endif - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "The Wireshark developer community, https://www.wireshark.org/\0" - VALUE "FileDescription", "Wireshark codecs library\0" - VALUE "FileVersion", "@VERSION@\0" - VALUE "InternalName", "libwscodecs @VERSION@\0" - VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs , Gilbert Ramirez and others\0" - VALUE "OriginalFilename", "libwscodecs.dll\0" - VALUE "ProductName", "Wireshark\0" - VALUE "ProductVersion", "@VERSION@\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 2b8dbd67ec..1b846cf16e 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -483,7 +483,6 @@ SetOutPath $INSTDIR File "${STAGING_DIR}\${UNINSTALLER_NAME}" File "${STAGING_DIR}\libwiretap.dll" File "${STAGING_DIR}\libwireshark.dll" -File "${STAGING_DIR}\libwscodecs.dll" File "${STAGING_DIR}\libwsutil.dll" !include all-manifest.nsh diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index 2fa195d750..5468978bfd 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -24,9 +24,6 @@ - - - @@ -84,7 +81,6 @@ - diff --git a/plugins/codecs/G711/CMakeLists.txt b/plugins/codecs/G711/CMakeLists.txt index 642d32a3ae..94fa07a914 100644 --- a/plugins/codecs/G711/CMakeLists.txt +++ b/plugins/codecs/G711/CMakeLists.txt @@ -39,7 +39,7 @@ register_plugin_files(plugin.c add_plugin_library(g711 codecs) -target_link_libraries(g711 wscodecs) +target_link_libraries(g711 wsutil) install_plugin(g711 codecs) diff --git a/plugins/codecs/G711/G711decode.c b/plugins/codecs/G711/G711decode.c index 19a7f32893..bd1aae42c2 100644 --- a/plugins/codecs/G711/G711decode.c +++ b/plugins/codecs/G711/G711decode.c @@ -12,7 +12,7 @@ #include -#include "codecs/codecs.h" +#include "wsutil/codecs.h" #include "ws_attributes.h" static gint16 ulaw_exp_table[256] = { diff --git a/plugins/codecs/G722/CMakeLists.txt b/plugins/codecs/G722/CMakeLists.txt index 2350cb0909..8f2b02270e 100644 --- a/plugins/codecs/G722/CMakeLists.txt +++ b/plugins/codecs/G722/CMakeLists.txt @@ -39,7 +39,7 @@ register_plugin_files(plugin.c add_plugin_library(g722 codecs) -target_link_libraries(g722 wscodecs ${SPANDSP_LIBRARIES}) +target_link_libraries(g722 wsutil ${SPANDSP_LIBRARIES}) target_include_directories(g722 SYSTEM PRIVATE ${SPANDSP_INCLUDE_DIRS}) diff --git a/plugins/codecs/G722/G722decode.c b/plugins/codecs/G722/G722decode.c index 789e31b478..c58b8e5079 100644 --- a/plugins/codecs/G722/G722decode.c +++ b/plugins/codecs/G722/G722decode.c @@ -13,7 +13,7 @@ #include #include "spandsp.h" -#include "codecs/codecs.h" +#include "wsutil/codecs.h" #include "ws_attributes.h" static void * diff --git a/plugins/codecs/G726/CMakeLists.txt b/plugins/codecs/G726/CMakeLists.txt index e598cb82c0..2b6c215e7b 100644 --- a/plugins/codecs/G726/CMakeLists.txt +++ b/plugins/codecs/G726/CMakeLists.txt @@ -39,7 +39,7 @@ register_plugin_files(plugin.c add_plugin_library(g726 codecs) -target_link_libraries(g726 wscodecs ${SPANDSP_LIBRARIES}) +target_link_libraries(g726 wsutil ${SPANDSP_LIBRARIES}) target_include_directories(g726 SYSTEM PRIVATE ${SPANDSP_INCLUDE_DIRS}) diff --git a/plugins/codecs/G726/G726decode.c b/plugins/codecs/G726/G726decode.c index 86b61c0cbd..2c2ff6d167 100644 --- a/plugins/codecs/G726/G726decode.c +++ b/plugins/codecs/G726/G726decode.c @@ -13,7 +13,7 @@ #include #include "spandsp.h" -#include "codecs/codecs.h" +#include "wsutil/codecs.h" #include "ws_attributes.h" typedef struct _g726_codec_ctx { diff --git a/plugins/codecs/G729/CMakeLists.txt b/plugins/codecs/G729/CMakeLists.txt index f4c1765f27..aa3edc0196 100644 --- a/plugins/codecs/G729/CMakeLists.txt +++ b/plugins/codecs/G729/CMakeLists.txt @@ -39,7 +39,7 @@ register_plugin_files(plugin.c add_plugin_library(g729 codecs) -target_link_libraries(g729 wscodecs ${BCG729_LIBRARIES}) +target_link_libraries(g729 wsutil ${BCG729_LIBRARIES}) target_include_directories(g729 SYSTEM PRIVATE ${BCG729_INCLUDE_DIRS}) diff --git a/plugins/codecs/G729/G729decode.c b/plugins/codecs/G729/G729decode.c index e2308f36f8..a54b3c76c9 100644 --- a/plugins/codecs/G729/G729decode.c +++ b/plugins/codecs/G729/G729decode.c @@ -13,7 +13,7 @@ #include #include "bcg729/decoder.h" -#include "codecs/codecs.h" +#include "wsutil/codecs.h" #include "ws_attributes.h" static void * diff --git a/plugins/codecs/l16_mono/CMakeLists.txt b/plugins/codecs/l16_mono/CMakeLists.txt index 51589c37da..b549875848 100644 --- a/plugins/codecs/l16_mono/CMakeLists.txt +++ b/plugins/codecs/l16_mono/CMakeLists.txt @@ -39,7 +39,7 @@ register_plugin_files(plugin.c add_plugin_library(l16mono codecs) -target_link_libraries(l16mono wscodecs) +target_link_libraries(l16mono wsutil) install_plugin(l16mono codecs) diff --git a/plugins/codecs/l16_mono/l16decode.c b/plugins/codecs/l16_mono/l16decode.c index 1c60ab225d..5b6411901a 100644 --- a/plugins/codecs/l16_mono/l16decode.c +++ b/plugins/codecs/l16_mono/l16decode.c @@ -13,7 +13,7 @@ #include #include -#include "codecs/codecs.h" +#include "wsutil/codecs.h" #include "ws_attributes.h" void codec_register_l16(void); diff --git a/plugins/codecs/sbc/CMakeLists.txt b/plugins/codecs/sbc/CMakeLists.txt index bf068ed5e3..0cd2ba8eee 100644 --- a/plugins/codecs/sbc/CMakeLists.txt +++ b/plugins/codecs/sbc/CMakeLists.txt @@ -39,7 +39,7 @@ register_plugin_files(plugin.c add_plugin_library(sbc codecs) -target_link_libraries(sbc wscodecs ${SBC_LIBRARIES}) +target_link_libraries(sbc wsutil ${SBC_LIBRARIES}) target_include_directories(sbc SYSTEM PRIVATE ${SBC_INCLUDE_DIRS}) diff --git a/plugins/codecs/sbc/sbc.c b/plugins/codecs/sbc/sbc.c index 3992cd3840..1014efb72f 100644 --- a/plugins/codecs/sbc/sbc.c +++ b/plugins/codecs/sbc/sbc.c @@ -15,7 +15,7 @@ #include #include -#include "codecs/codecs.h" +#include "wsutil/codecs.h" #define SBC_BUFFER 8192 diff --git a/sharkd.c b/sharkd.c index 788e56ba16..467e3c330a 100644 --- a/sharkd.c +++ b/sharkd.c @@ -53,7 +53,7 @@ #include #include -#include +#include #include "log.h" diff --git a/tools/make-plugin-reg.py b/tools/make-plugin-reg.py index edb07c0e5b..2929089787 100755 --- a/tools/make-plugin-reg.py +++ b/tools/make-plugin-reg.py @@ -117,7 +117,7 @@ if registertype == "plugin": if registertype == "plugin_wtap": reg_code += "#include \"wiretap/wtap.h\"\n\n" if registertype == "plugin_codec": - reg_code += "#include \"codecs/codecs.h\"\n\n" + reg_code += "#include \"wsutil/codecs.h\"\n\n" for symbol in regs['proto_reg']: reg_code += "void proto_register_%s(void);\n" % (symbol) diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index 1fde62e3d0..501f7a0e7e 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -55,7 +55,7 @@ #include #endif -#include +#include #include diff --git a/ui/rtp_media.c b/ui/rtp_media.c index 8b6f725ce3..a697131562 100644 --- a/ui/rtp_media.c +++ b/ui/rtp_media.c @@ -14,7 +14,7 @@ #include "config.h" -#include +#include #include #include diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index d5854dfac2..dbdc65554f 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -20,6 +20,7 @@ set(WSUTIL_PUBLIC_HEADERS bits_ctz.h bitswap.h buffer.h + codecs.h color.h copyright_info.h cpu_info.h @@ -79,6 +80,7 @@ set(WSUTIL_COMMON_FILES base32.c bitswap.c buffer.c + codecs.c copyright_info.c crash_info.c crc10.c diff --git a/codecs/codecs.c b/wsutil/codecs.c similarity index 100% rename from codecs/codecs.c rename to wsutil/codecs.c diff --git a/codecs/codecs.h b/wsutil/codecs.h similarity index 100% rename from codecs/codecs.h rename to wsutil/codecs.h