Move the protocol registration routines back into libwireshark

Follow-up to b695b3e2f72998d66ca4b7a6826d4ce1688060c8.

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>

21 files changed, 26 insertions, 28 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de47807b3c..247b044bbd 100644
--- 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)
diff --git a/Makefile.am b/Makefile.am
index 9f4e08fada..63968c3e0e 100644
--- 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		\
diff --git a/debian/libwireshark-dev.install b/debian/libwireshark-dev.install
index 14441b9a6a..19296e9654 100644
--- 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
diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols
index 7126308dcb..e9a3dc5e94 100644
--- 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
diff --git a/dftest.c b/dftest.c
index 36abd03303..481b5979c6 100644
--- 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,
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 984b062c20..b0fd8d7eb1 100644
--- 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
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 945c7b4803..52be37fea6 100644
--- 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		\
diff --git a/register.c b/epan/register.c
index 63973c684a..63973c684a 100644
--- a/register.c
+++ b/epan/register.c
diff --git a/register.h b/epan/register.h
index 39fefe0780..55c72c2464 100644
--- a/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
 }
diff --git a/epan/wslua/init_wslua.h b/epan/wslua/init_wslua.h
index 850cc2e9e8..1c6d9624ea 100644
--- 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);
diff --git a/rawshark.c b/rawshark.c
index 94417e0661..c3bbb7660d 100644
--- 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>
diff --git a/sharkd.c b/sharkd.c
index 66b0694ec7..c24e3f3ecc 100644
--- 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>
 
diff --git a/tfshark.c b/tfshark.c
index 8aa09222d1..00380bf8e9 100644
--- 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>
diff --git a/tools/make-tap-reg.py b/tools/make-tap-reg.py
index f4435df4e0..1d780979c5 100755
--- 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) {
 """);
 
diff --git a/tools/oss-fuzzshark/build.sh b/tools/oss-fuzzshark/build.sh
index 394fd79470..6164cd3141 100755
--- 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
diff --git a/tshark.c b/tshark.c
index ccfaca13a2..7e013ba274 100644
--- 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>
diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c
index a2980bf6bb..5d90c1b4ba 100644
--- 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"
 
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 854d2cc783..79b8c05882 100644
--- 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"
 
diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp
index c26b4b0052..79b53eb0b6 100644
--- 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"
diff --git a/ui/qt/splash_overlay.h b/ui/qt/splash_overlay.h
index 3aae85ff5a..03c06d9ed2 100644
--- 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>
diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h
index 83f8fc6093..c9d6c9ebba 100644
--- 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"