<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9331">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ctrl: Introduce libosmoctrl.map to avoid unintended exports<br><br>There are some symbols for use between control_cmd.c and control_if.c,<br>which are not supposed to be exported publicly.  Let's make sure we<br>keep those symbols local.<br><br>Change-Id: Ia85f36a9c4b2ebf4003718e0a230959638370320<br>---<br>M configure.ac<br>M src/ctrl/Makefile.am<br>A src/ctrl/libosmoctrl.map<br>3 files changed, 38 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 6b9c66f..79ef9d4 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -47,11 +47,13 @@</span><br><span>    LTLDFLAGS_OSMOGB='-Wl,--version-script=$(srcdir)/libosmogb.map'</span><br><span>      LTLDFLAGS_OSMOGSM='-Wl,--version-script=$(srcdir)/libosmogsm.map'</span><br><span>    LTLDFLAGS_OSMOCODING='-Wl,--version-script=$(srcdir)/libosmocoding.map'</span><br><span style="color: hsl(120, 100%, 40%);">+       LTLDFLAGS_OSMOCTRL='-Wl,--version-script=$(srcdir)/libosmoctrl.map'</span><br><span>  ;;</span><br><span> esac</span><br><span> AC_SUBST(LTLDFLAGS_OSMOGB)</span><br><span> AC_SUBST(LTLDFLAGS_OSMOGSM)</span><br><span> AC_SUBST(LTLDFLAGS_OSMOCODING)</span><br><span style="color: hsl(120, 100%, 40%);">+AC_SUBST(LTLDFLAGS_OSMOCTRL)</span><br><span> </span><br><span> dnl checks for header files</span><br><span> AC_HEADER_STDC</span><br><span>diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am</span><br><span>index 71cc9a3..a51ae05 100644</span><br><span>--- a/src/ctrl/Makefile.am</span><br><span>+++ b/src/ctrl/Makefile.am</span><br><span>@@ -20,4 +20,6 @@</span><br><span> libosmoctrl_la_SOURCES += control_vty.c</span><br><span> endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+EXTRA_DIST = libosmoctrl.map</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> endif</span><br><span>diff --git a/src/ctrl/libosmoctrl.map b/src/ctrl/libosmoctrl.map</span><br><span>new file mode 100644</span><br><span>index 0000000..5b888a2</span><br><span>--- /dev/null</span><br><span>+++ b/src/ctrl/libosmoctrl.map</span><br><span>@@ -0,0 +1,34 @@</span><br><span style="color: hsl(120, 100%, 40%);">+LIBOSMOCTRL_1.0 {</span><br><span style="color: hsl(120, 100%, 40%);">+global:</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_cmd_cpy;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_cmd_create;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_cmd_def_is_zombie;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_cmd_def_make;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_cmd_def_send;</span><br><span style="color: hsl(120, 100%, 40%);">+#ctrl_cmd_exec;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_cmd_exec_from_string;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_cmd_handle;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_cmd_install;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_cmd_make;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_cmd_parse;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_cmd_parse2;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_cmd_send;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_cmd_send_to_all;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_cmd_send_trap;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_cmd_trap;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_handle_alloc; /* could be removed? */</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_handle_alloc2; /* could be removed? */</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_handle_msg; /* only used in unit test */</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_interface_setup;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_interface_setup_dynip;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_interface_setup_dynip2;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_lookup_register;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_parse_get_num;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_type_vals;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_vty_get_bind_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl_vty_init;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_ctrl_conn_alloc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+local: *;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9331">change 9331</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9331"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia85f36a9c4b2ebf4003718e0a230959638370320 </div>
<div style="display:none"> Gerrit-Change-Number: 9331 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>