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

dissectors: Fix visibility and header installation 

Registration definitions for built-in dissectors are internal to
libwireshark.

Change-Id: Icd7065731459848bd6aabe721ae1da6d2e7ced34
Reviewed-on: https://code.wireshark.org/review/30371
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
This commit is contained in:
João Valverde 2018-10-24 14:53:07 +01:00 committed by Peter Wu
parent ac24039ca5
commit 83ca3f025f
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/libwireshark0.symbols vendored
View File

@ -465,10 +465,6 @@ libwireshark.so.0 libwireshark0 #MINVER#
dissector_handle_get_protocol_index@Base 1.9.1
dissector_handle_get_short_name@Base 1.9.1
dissector_hostlist_init@Base 1.99.0
dissector_reg_handoff@Base 2.5.0
dissector_reg_handoff_count@Base 2.5.0
dissector_reg_proto@Base 2.5.0
dissector_reg_proto_count@Base 2.5.0
dissector_reset_payload@Base 2.5.0
dissector_reset_string@Base 1.9.1
dissector_reset_uint@Base 1.9.1

1
epan/dissectors/CMakeLists.txt
View File

@ -237,7 +237,6 @@ set(NCP2222_DISSECTOR_SRC
source_group(dissectors-ncp2222 FILES ${NCP2222_DISSECTOR_SRC})
set(DISSECTOR_PUBLIC_HEADERS
dissectors.h
file-rbm.h
packet-6lowpan.h
packet-a21.h

10
epan/dissectors/dissectors.h
View File

@ -11,8 +11,6 @@
#ifndef __DISSECTOR_REGISTER_H__
#define __DISSECTOR_REGISTER_H__
#include "ws_symbol_export.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
@ -24,11 +22,11 @@ typedef struct _dissector_reg {
void (*cb_func)(void);
} dissector_reg_t;
WS_DLL_PUBLIC dissector_reg_t dissector_reg_proto[];
WS_DLL_PUBLIC dissector_reg_t dissector_reg_handoff[];
extern dissector_reg_t dissector_reg_proto[];
extern dissector_reg_t dissector_reg_handoff[];
WS_DLL_PUBLIC const gulong dissector_reg_proto_count;
WS_DLL_PUBLIC const gulong dissector_reg_handoff_count;
extern const gulong dissector_reg_proto_count;
extern const gulong dissector_reg_handoff_count;
#ifdef __cplusplus
}