From 931c6f54bad50d880560e8705e08b16bf8a19337 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Sat, 17 Oct 2020 13:33:32 +0200
Subject: misc: don't export symbols from plugins

Type: improvement
Change-Id: I2a176fe2871d2e54b010bffc4f1f7a3616f0c455
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 src/cmake/plugin.cmake                  | 1 +
 src/plugins/acl/lookup_context.c        | 3 ++-
 src/plugins/dpdk/main.c                 | 2 +-
 src/plugins/http_static/static_server.c | 2 +-
 src/plugins/ioam/lib-trace/trace_util.c | 2 +-
 src/plugins/l2e/l2e.c                   | 4 ++--
 src/vlib/unix/plugin.h                  | 2 +-
 7 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/cmake/plugin.cmake b/src/cmake/plugin.cmake
index 1bcff5559ff..516588c7b8b 100644
--- a/src/cmake/plugin.cmake
+++ b/src/cmake/plugin.cmake
@@ -45,6 +45,7 @@ macro(add_vpp_plugin name)
   endforeach()
   add_library(${plugin_name} SHARED ${PLUGIN_SOURCES} ${api_includes})
   set_target_properties(${plugin_name} PROPERTIES NO_SONAME 1)
+  target_compile_options(${plugin_name} PRIVATE "-fvisibility=hidden")
   set(deps "")
   if(PLUGIN_API_FILES)
     list(APPEND deps ${plugin_name}_api_headers)
diff --git a/src/plugins/acl/lookup_context.c b/src/plugins/acl/lookup_context.c
index 5344975402e..ed9b2c7da21 100644
--- a/src/plugins/acl/lookup_context.c
+++ b/src/plugins/acl/lookup_context.c
@@ -359,7 +359,8 @@ acl_plugin_get_p_acl_main(void)
   return &acl_main;
 }
 
-clib_error_t *acl_plugin_methods_vtable_init(acl_plugin_methods_t *m)
+__clib_export clib_error_t *
+acl_plugin_methods_vtable_init(acl_plugin_methods_t *m)
 {
   m->p_acl_main = &acl_main;
 #define _(name) m->name = acl_plugin_ ## name;
diff --git a/src/plugins/dpdk/main.c b/src/plugins/dpdk/main.c
index ea0348a5e7f..ef93a224ef9 100644
--- a/src/plugins/dpdk/main.c
+++ b/src/plugins/dpdk/main.c
@@ -99,7 +99,7 @@ VLIB_INIT_FUNCTION (dpdk_main_init) =
 /* *INDENT-ON* */
 
 
-clib_error_t *
+__clib_export clib_error_t *
 dpdk_early_init (vlib_main_t *vm)
 {
   int fd = -1;
diff --git a/src/plugins/http_static/static_server.c b/src/plugins/http_static/static_server.c
index 4db3eadd940..b61243ab19e 100644
--- a/src/plugins/http_static/static_server.c
+++ b/src/plugins/http_static/static_server.c
@@ -521,7 +521,7 @@ close_session (http_session_t * hs)
 
 /** \brief Register a builtin GET or POST handler
  */
-void http_static_server_register_builtin_handler
+__clib_export void http_static_server_register_builtin_handler
   (void *fp, char *url, int request_type)
 {
   http_static_server_main_t *hsm = &http_static_server_main;
diff --git a/src/plugins/ioam/lib-trace/trace_util.c b/src/plugins/ioam/lib-trace/trace_util.c
index af92513685f..d935543cf23 100644
--- a/src/plugins/ioam/lib-trace/trace_util.c
+++ b/src/plugins/ioam/lib-trace/trace_util.c
@@ -20,7 +20,7 @@
 #include "trace_util.h"
 #include "trace_config.h"
 
-trace_main_t trace_main;
+__clib_export trace_main_t trace_main;
 
 static int
 trace_profile_cleanup (trace_profile * profile)
diff --git a/src/plugins/l2e/l2e.c b/src/plugins/l2e/l2e.c
index 01f7788efce..791c3f67cb6 100644
--- a/src/plugins/l2e/l2e.c
+++ b/src/plugins/l2e/l2e.c
@@ -27,7 +27,7 @@ l2_emulation_main_t l2_emulation_main;
  */
 static const l2_emulation_t ezero = { };
 
-void
+__clib_export void
 l2_emulation_enable (u32 sw_if_index)
 {
   l2_emulation_main_t *em = &l2_emulation_main;
@@ -49,7 +49,7 @@ l2_emulation_enable (u32 sw_if_index)
 }
 
 
-void
+__clib_export void
 l2_emulation_disable (u32 sw_if_index)
 {
   l2_emulation_main_t *em = &l2_emulation_main;
diff --git a/src/vlib/unix/plugin.h b/src/vlib/unix/plugin.h
index 4beae43d504..ae15e5db973 100644
--- a/src/vlib/unix/plugin.h
+++ b/src/vlib/unix/plugin.h
@@ -150,7 +150,7 @@ u8 *vlib_get_vat_plugin_path (void);
 #define VLIB_PLUGIN_REGISTER() \
   vlib_plugin_registration_t vlib_plugin_registration \
   CLIB_NOSANITIZE_PLUGIN_REG_SECTION \
-  __attribute__((__section__(".vlib_plugin_registration")))
+  __clib_export __clib_section(".vlib_plugin_registration")
 
 /* Call a plugin init function: used for init function dependencies. */
 #define vlib_call_plugin_init_function(vm,p,x)                  \
-- 
cgit 1.2.3-korg