From ed6057841dd094f95efebbeae51a85bd0879463f Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 26 May 2018 17:07:39 +0200 Subject: ctrl: Introduce libosmoctrl.map to avoid unintended exports There are some symbols for use between control_cmd.c and control_if.c, which are not supposed to be exported publicly. Let's make sure we keep those symbols local. Change-Id: Ia85f36a9c4b2ebf4003718e0a230959638370320 --- configure.ac | 2 ++ src/ctrl/Makefile.am | 2 ++ src/ctrl/libosmoctrl.map | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 src/ctrl/libosmoctrl.map diff --git a/configure.ac b/configure.ac index 6b9c66f1..79ef9d41 100644 --- a/configure.ac +++ b/configure.ac @@ -47,11 +47,13 @@ case $host in LTLDFLAGS_OSMOGB='-Wl,--version-script=$(srcdir)/libosmogb.map' LTLDFLAGS_OSMOGSM='-Wl,--version-script=$(srcdir)/libosmogsm.map' LTLDFLAGS_OSMOCODING='-Wl,--version-script=$(srcdir)/libosmocoding.map' + LTLDFLAGS_OSMOCTRL='-Wl,--version-script=$(srcdir)/libosmoctrl.map' ;; esac AC_SUBST(LTLDFLAGS_OSMOGB) AC_SUBST(LTLDFLAGS_OSMOGSM) AC_SUBST(LTLDFLAGS_OSMOCODING) +AC_SUBST(LTLDFLAGS_OSMOCTRL) dnl checks for header files AC_HEADER_STDC diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index 71cc9a37..a51ae053 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -20,4 +20,6 @@ if ENABLE_VTY libosmoctrl_la_SOURCES += control_vty.c endif +EXTRA_DIST = libosmoctrl.map + endif diff --git a/src/ctrl/libosmoctrl.map b/src/ctrl/libosmoctrl.map new file mode 100644 index 00000000..5b888a2d --- /dev/null +++ b/src/ctrl/libosmoctrl.map @@ -0,0 +1,34 @@ +LIBOSMOCTRL_1.0 { +global: + +ctrl_cmd_cpy; +ctrl_cmd_create; +ctrl_cmd_def_is_zombie; +ctrl_cmd_def_make; +ctrl_cmd_def_send; +#ctrl_cmd_exec; +ctrl_cmd_exec_from_string; +ctrl_cmd_handle; +ctrl_cmd_install; +ctrl_cmd_make; +ctrl_cmd_parse; +ctrl_cmd_parse2; +ctrl_cmd_send; +ctrl_cmd_send_to_all; +ctrl_cmd_send_trap; +ctrl_cmd_trap; +ctrl_handle_alloc; /* could be removed? */ +ctrl_handle_alloc2; /* could be removed? */ +ctrl_handle_msg; /* only used in unit test */ +ctrl_interface_setup; +ctrl_interface_setup_dynip; +ctrl_interface_setup_dynip2; +ctrl_lookup_register; +ctrl_parse_get_num; +ctrl_type_vals; +ctrl_vty_get_bind_addr; +ctrl_vty_init; +osmo_ctrl_conn_alloc; + +local: *; +}; -- cgit v1.2.3