osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Kill libwscodecs plugin library, just use plugins 

Change-Id: I085d04840acb53b0b7681787429a2b4e10547cd5
Reviewed-on: https://code.wireshark.org/review/33068
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
João Valverde 2019-02-03 02:15:13 +00:00 committed by Anders Broman
parent 57bb2b2a09
commit 63af1da7e7
30 changed files with 22 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -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}

60
codecs/CMakeLists.txt
View File

@ -1,60 +0,0 @@
# CMakeLists.txt
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# 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}
)

13
debian/control vendored
View File

@ -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

2
debian/libwscodecs0.install vendored
View File

@ -1,2 +0,0 @@
usr/lib/*/libwscodecs.so.*
usr/lib/*/wireshark/plugins/*/codecs/*.so

2
debian/libwscodecs0.lintian-overrides vendored
View File

@ -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

13
debian/libwscodecs0.symbols vendored
View File

@ -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

2
doc/README.plugins
View File

@ -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:

4
docbook/wsug_src/WSUG_app_files.adoc
View File

@ -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_).

35
image/libwscodecs.rc.in
View File

@ -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 <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> 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

1
packaging/nsis/wireshark.nsi
View File

@ -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

4
packaging/wix/ComponentGroups.wxi
View File

@ -24,9 +24,6 @@
<Component Id="cmpLibwireshark_dll" Guid="*">
<File Id="filLibwireshark_dll" KeyPath="yes" Source="$(var.Staging.Dir)\libwireshark.dll" />
</Component>
<Component Id="cmpLibwscodecs_dll" Guid="*">
<File Id="filLibwscodecs_dll" KeyPath="yes" Source="$(var.Staging.Dir)\libwscodecs.dll" />
</Component>
<Component Id="cmpLibwsutil_dll" Guid="*">
<File Id="filLibwsutil_dll" KeyPath="yes" Source="$(var.Staging.Dir)\libwsutil.dll" />
</Component>
@ -84,7 +81,6 @@
<ComponentGroup Id="CG.WiresharkRequired">
<ComponentRef Id="cmpWiretap_dll" />
<ComponentRef Id="cmpLibwireshark_dll" />
<ComponentRef Id="cmpLibwscodecs_dll" />
<ComponentRef Id="cmpLibwsutil_dll" />
<ComponentRef Id="cmpCOPYING_txt" />
<ComponentRef Id="cmpNEWS_txt" />

2
plugins/codecs/G711/CMakeLists.txt
View File

@ -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)

2
plugins/codecs/G711/G711decode.c
View File

@ -12,7 +12,7 @@
#include <glib.h>
#include "codecs/codecs.h"
#include "wsutil/codecs.h"
#include "ws_attributes.h"
static gint16 ulaw_exp_table[256] = {

2
plugins/codecs/G722/CMakeLists.txt
View File

@ -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})

2
plugins/codecs/G722/G722decode.c
View File

@ -13,7 +13,7 @@
#include <glib.h>
#include "spandsp.h"
#include "codecs/codecs.h"
#include "wsutil/codecs.h"
#include "ws_attributes.h"
static void *

2
plugins/codecs/G726/CMakeLists.txt
View File

@ -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})

2
plugins/codecs/G726/G726decode.c
View File

@ -13,7 +13,7 @@
#include <glib.h>
#include "spandsp.h"
#include "codecs/codecs.h"
#include "wsutil/codecs.h"
#include "ws_attributes.h"
typedef struct _g726_codec_ctx {

2
plugins/codecs/G729/CMakeLists.txt
View File

@ -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})

2
plugins/codecs/G729/G729decode.c
View File

@ -13,7 +13,7 @@
#include <glib.h>
#include "bcg729/decoder.h"
#include "codecs/codecs.h"
#include "wsutil/codecs.h"
#include "ws_attributes.h"
static void *

2
plugins/codecs/l16_mono/CMakeLists.txt
View File

@ -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)

2
plugins/codecs/l16_mono/l16decode.c
View File

@ -13,7 +13,7 @@
#include <glib.h>
#include <string.h>
#include "codecs/codecs.h"
#include "wsutil/codecs.h"
#include "ws_attributes.h"
void codec_register_l16(void);

2
plugins/codecs/sbc/CMakeLists.txt
View File

@ -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})

2
plugins/codecs/sbc/sbc.c
View File

@ -15,7 +15,7 @@
#include <glib.h>
#include <sbc/sbc.h>
#include "codecs/codecs.h"
#include "wsutil/codecs.h"
#define SBC_BUFFER 8192

2
sharkd.c
View File

@ -53,7 +53,7 @@
#include <epan/uat-int.h>
#include <epan/secrets.h>
#include <codecs/codecs.h>
#include <wsutil/codecs.h>
#include "log.h"

2
tools/make-plugin-reg.py
View File

@ -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)

2
ui/qt/main.cpp
View File

@ -55,7 +55,7 @@
#include <epan/dissectors/packet-kerberos.h>
#endif
#include <codecs/codecs.h>
#include <wsutil/codecs.h>
#include <extcap.h>

2
ui/rtp_media.c
View File

@ -14,7 +14,7 @@
#include "config.h"
#include <codecs/codecs.h>
#include <wsutil/codecs.h>
#include <epan/rtp_pt.h>
#include <epan/dissectors/packet-rtp.h>

2
wsutil/CMakeLists.txt
View File

@ -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

0
codecs/codecs.c → wsutil/codecs.c
View File

0
codecs/codecs.h → wsutil/codecs.h
View File