Move the protocol registration routines back into libwireshark

Follow-up to b695b3e2f7. Change-Id: I7e36519f2c3806c1205d05437671325080974257 Reviewed-on: https://code.wireshark.org/review/24524 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-11-21 18:38:44 +00:00 · 2017-11-21 18:38:44 +00:00 · 7540ac6938
parent 4e63ec305b
commit 7540ac6938
21 changed files with 26 additions and 28 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1565,7 +1565,6 @@ endif()
 set(SHARK_COMMON_SRC
 	cfile.c
 	frame_tvbuff.c
-	register.c
 	sync_pipe_write.c
 	version_info.c
 )
@ -2536,7 +2535,6 @@ if(BUILD_dftest)
 	)
 	set(dftest_FILES
 		dftest.c
-		register.c
 	)
 	add_executable(dftest ${dftest_FILES})
 	add_dependencies(dftest version)
--- a/Makefile.am
+++ b/Makefile.am
@ -379,7 +379,6 @@ EXTCAP_COMMON_SRC = \
 SHARK_COMMON_SRC = \
 	cfile.c			\
 	frame_tvbuff.c		\
-	register.c		\
 	sync_pipe_write.c

 # wireshark specifics
@ -656,8 +655,7 @@ randpkt_LDADD = \
 	@C_ARES_LIBS@

 dftest_SOURCES = \
-	dftest.c \
-	register.c
+	dftest.c

 dftest_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)

@ -719,7 +717,6 @@ noinst_HEADERS = \
 	extcap_spawn.h		\
 	fileset.h		\
 	frame_tvbuff.h		\
-	register.h		\
 	ringbuffer.h		\
 	summary.h		\
 	sync_pipe.h		\
--- a/debian/libwireshark-dev.install
+++ b/debian/libwireshark-dev.install
@ -1,7 +1,7 @@
 usr/lib/*/libwireshark.so
 usr/lib/*/pkgconfig/wireshark.pc
 obj-*/config.h usr/include/wireshark
-register.h usr/include/wireshark
+epan/register.h usr/include/wireshark
 epan/stat_groups.h usr/include/wireshark
 epan/*.h usr/include/wireshark/epan
 epan/crypt/*.h usr/include/wireshark/epan/crypt
--- a/debian/libwireshark0.symbols
+++ b/debian/libwireshark0.symbols
@ -1284,6 +1284,8 @@ libwireshark.so.0 libwireshark0 #MINVER#
 reassembly_table_destroy@Base 1.9.1
 reassembly_table_init@Base 1.9.1
 register_all_plugin_tap_listeners@Base 1.9.1
+ register_all_protocol_handoffs@Base 1.9.1
+ register_all_protocols@Base 1.9.1
 register_ber_oid_dissector@Base 2.1.0
 register_ber_oid_dissector_handle@Base 1.9.1
 register_ber_oid_syntax@Base 1.9.1
@ -1293,6 +1295,7 @@ libwireshark.so.0 libwireshark0 #MINVER#
 register_cleanup_routine@Base 1.99.8
 register_conversation_filter@Base 2.0.0
 register_conversation_table@Base 2.5.0
+ register_count@Base 1.9.1
 register_custom_dissector_table@Base 1.99.8
 register_custom_dissector_table@Base 1.99.8
 register_decode_as@Base 1.12.0~rc1
--- a/dftest.c
+++ b/dftest.c
@ -33,7 +33,7 @@
 #include <wiretap/wtap.h>

 #include "ui/util.h"
-#include "register.h"
+#include "epan/register.h"

 static void failure_warning_message(const char *msg_format, va_list ap);
 static void open_failure_message(const char *filename, int err,
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@ -139,6 +139,7 @@ set(LIBWIRESHARK_PUBLIC_HEADERS
 	range.h
 	reassemble.h
 	reedsolomon.h
+	register.h
 	req_resp_hdrs.h
 	rtd_table.h
 	rtp_pt.h
@ -228,6 +229,7 @@ set(LIBWIRESHARK_FILES
 	range.c
 	reassemble.c
 	reedsolomon.c
+	register.c
 	req_resp_hdrs.c
 	rtd_table.c
 	sequence_analysis.c
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@ -93,6 +93,7 @@ LIBWIRESHARK_SRC = \
 	reassemble.c		\
 	reedsolomon.c		\
 	req_resp_hdrs.c		\
+	register.c		\
 	rtd_table.c		\
 	sequence_analysis.c	\
 	show_exception.c	\
@ -246,6 +247,7 @@ LIBWIRESHARK_INCLUDES_PUBLIC = \
 	range.h			\
 	reassemble.h		\
 	reedsolomon.h		\
+	register.h		\
 	req_resp_hdrs.h		\
 	rtd_table.h		\
 	rtp_pt.h		\
--- a/epan/register.c
+++ b/epan/register.c
--- a/epan/register.h
+++ b/epan/register.h
@ -49,7 +49,7 @@ typedef void (*register_cb)(register_action_e action, const char *message, gpoin
 * Messages have the format "proto_register_XXX".
 * @param client_data Data pointer for the callback.
 */
-void register_all_protocols(register_cb cb, gpointer client_data);
+WS_DLL_PUBLIC void register_all_protocols(register_cb cb, gpointer client_data);

 /** Call each dissector's protocol handoff routine.
 *
@ -61,11 +61,11 @@ void register_all_protocols(register_cb cb, gpointer client_data);
 * Messages have the format "proto_reg_handoff_XXX".
 * @param client_data Data pointer for the callback.
 */
-void register_all_protocol_handoffs(register_cb cb, gpointer client_data);
+WS_DLL_PUBLIC void register_all_protocol_handoffs(register_cb cb, gpointer client_data);

-extern void register_all_tap_listeners(void);
+WS_DLL_LOCAL void register_all_tap_listeners(void);

-gulong register_count(void);
+WS_DLL_PUBLIC gulong register_count(void);

 #ifdef __cplusplus
 }
--- a/epan/wslua/init_wslua.h
+++ b/epan/wslua/init_wslua.h
@ -27,7 +27,7 @@
 extern "C" {
 #endif /* __cplusplus */

-#include "register.h"
+#include "epan/register.h"
 #include "ws_symbol_export.h"

 WS_DLL_PUBLIC int wslua_count_plugins(void);
--- a/rawshark.c
+++ b/rawshark.c
@ -71,7 +71,7 @@
 #include "ui/util.h"
 #include "ui/dissect_opts.h"
 #include "ui/failure_message.h"
-#include "register.h"
+#include "epan/register.h"
 #include "conditions.h"
 #include "capture_stop_conditions.h"
 #include <epan/epan_dissect.h>
--- a/sharkd.c
+++ b/sharkd.c
@ -50,7 +50,7 @@
 #include "ui/filter_files.h"
 #include "ui/tap_export_pdu.h"
 #include "ui/failure_message.h"
-#include "register.h"
+#include "epan/register.h"
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>

--- a/tfshark.c
+++ b/tfshark.c
@ -58,7 +58,7 @@
 #include "ui/util.h"
 #include "ui/decode_as_utils.h"
 #include "ui/dissect_opts.h"
-#include "register.h"
+#include "epan/register.h"
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
--- a/tools/make-tap-reg.py
+++ b/tools/make-tap-reg.py
@ -154,7 +154,7 @@ reg_code.write("/* Generated automatically from %s  */\n" % (sys.argv[0]))

 # Make the routine to register all taps
 reg_code.write("""
-#include "register.h"
+#include "epan/register.h"
 void register_all_tap_listeners(void) {
 """);

--- a/tools/oss-fuzzshark/build.sh
+++ b/tools/oss-fuzzshark/build.sh
@ -43,7 +43,7 @@ generate_fuzzer()
      -c -o $WORK/${fuzzer_name}.o \
      $fuzzer_cflags

-  $CXX $CXXFLAGS $WORK/register.o $WORK/${fuzzer_name}.o \
+  $CXX $CXXFLAGS $WORK/${fuzzer_name}.o \
      -o $OUT/${fuzzer_name} \
      ${WIRESHARK_FUZZERS_COMMON_FLAGS}

@ -57,10 +57,6 @@ WIRESHARK_FUZZERS_COMMON_FLAGS="-lFuzzingEngine \
    -L"$WIRESHARK_INSTALL_PATH/lib" -lwireshark -lwiretap -lwsutil \
    -Wl,-Bstatic `pkg-config --libs glib-2.0` -pthread -lpcre -lgcrypt -lgpg-error -lz -Wl,-Bdynamic"

-$CC $CFLAGS -I $SRC/wireshark/ `pkg-config --cflags glib-2.0` \
-    $SRC/wireshark/register.c \
-    -c -o $WORK/register.o
-
 for dissector in $FUZZ_DISSECTORS; do
  generate_fuzzer "${dissector}" -DFUZZ_DISSECTOR_TARGET=\"$dissector\"
 done
--- a/tshark.c
+++ b/tshark.c
@ -88,7 +88,7 @@
 #if defined(HAVE_GEOIP)
 #include "epan/geoip_db.h"
 #endif
-#include "register.h"
+#include "epan/register.h"
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
--- a/ui/gtk/about_dlg.c
+++ b/ui/gtk/about_dlg.c
@ -44,7 +44,7 @@
 #endif

 #include "../../log.h"
-#include "../../register.h"
+#include "epan/register.h"

 #include "ui/last_open_dir.h"

--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@ -92,7 +92,7 @@
 #include "../../frame_tvbuff.h"
 #include "../../summary.h"
 #include <epan/color_filters.h>
-#include "../../register.h"
+#include "epan/register.h"
 #include "../../ringbuffer.h"
 #include "../../log.h"

--- a/ui/qt/about_dialog.cpp
+++ b/ui/qt/about_dialog.cpp
@ -38,7 +38,7 @@
 #endif

 #include "log.h"
-#include "register.h"
+#include "epan/register.h"

 #include "ui/alert_box.h"
 #include "ui/last_open_dir.h"
--- a/ui/qt/splash_overlay.h
+++ b/ui/qt/splash_overlay.h
@ -26,7 +26,7 @@

 #include <glib.h>

-#include "register.h"
+#include "epan/register.h"

 #include <QWidget>
 #include <QElapsedTimer>
--- a/ui/qt/wireshark_application.h
+++ b/ui/qt/wireshark_application.h
@ -26,7 +26,7 @@

 #include <glib.h>

-#include "register.h"
+#include "epan/register.h"

 #include "ui/help_url.h"