<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25707">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  osmith: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved; Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move global var bsc_gsmnet into libbsc [2/4]<br><br>This is used inside group of files forming libbsc (shared files used by<br>several apps). Let's instantie only once inside a file from libbsc<br>instead of doing so on each binary.<br><br>This is one further step towards fixing interdependency mess of symbols<br>and stubs.<br><br>Change-Id: I9b287aa492ca6aae5fc56133e1510aff3146fe25<br>---<br>M src/ipaccess/ipaccess-config.c<br>M src/osmo-bsc/bsc_init.c<br>M src/osmo-bsc/osmo_bsc_main.c<br>M tests/bsc/bsc_test.c<br>M tests/gsm0408/gsm0408_test.c<br>M tests/handover/handover_test.c<br>6 files changed, 2 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c</span><br><span>index 02501bd..741a97e 100644</span><br><span>--- a/src/ipaccess/ipaccess-config.c</span><br><span>+++ b/src/ipaccess/ipaccess-config.c</span><br><span>@@ -58,8 +58,6 @@</span><br><span> #include <osmocom/bsc/bss.h></span><br><span> #include <osmocom/bsc/bts.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gsm_network *bsc_gsmnet;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static int net_listen_testnr;</span><br><span> static int restart;</span><br><span> static bool get_attr;</span><br><span>diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c</span><br><span>index a85e76f..bf150cb 100644</span><br><span>--- a/src/osmo-bsc/bsc_init.c</span><br><span>+++ b/src/osmo-bsc/bsc_init.c</span><br><span>@@ -47,6 +47,8 @@</span><br><span> #include <limits.h></span><br><span> #include <stdbool.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_network *bsc_gsmnet;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int bsc_shutdown_net(struct gsm_network *net)</span><br><span> {</span><br><span>     struct gsm_bts *bts;</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index 0ed0033..8d6901d 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_main.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>@@ -87,7 +87,6 @@</span><br><span> </span><br><span> #include "../../bscconfig.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gsm_network *bsc_gsmnet = 0;</span><br><span> static const char *config_file = "osmo-bsc.cfg";</span><br><span> static const char *rf_ctrl = NULL;</span><br><span> static int daemonize = 0;</span><br><span>diff --git a/tests/bsc/bsc_test.c b/tests/bsc/bsc_test.c</span><br><span>index dbb547e..0cf0bc2 100644</span><br><span>--- a/tests/bsc/bsc_test.c</span><br><span>+++ b/tests/bsc/bsc_test.c</span><br><span>@@ -39,7 +39,6 @@</span><br><span> #include <search.h></span><br><span> </span><br><span> void *ctx = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-struct gsm_network *bsc_gsmnet = NULL;</span><br><span> </span><br><span> enum test {</span><br><span>  TEST_SCAN_TO_BTS,</span><br><span>diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c</span><br><span>index 4255ab2..4017293 100644</span><br><span>--- a/tests/gsm0408/gsm0408_test.c</span><br><span>+++ b/tests/gsm0408/gsm0408_test.c</span><br><span>@@ -57,9 +57,6 @@</span><br><span>                   __FILE__, __LINE__, (int) res, # cmp, (int) wanted);    \</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct gsm_network *bsc_gsmnet = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static inline void gen(struct gsm_bts *bts, const char *s)</span><br><span> {</span><br><span>       int r;</span><br><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index a355d3b..bd65b2f 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -58,8 +58,6 @@</span><br><span> </span><br><span> void *ctx;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gsm_network *bsc_gsmnet;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* override, requires '-Wl,--wrap=osmo_mgcpc_ep_ci_request'.</span><br><span>  * Catch modification of an MGCP connection. */</span><br><span> void __real_osmo_mgcpc_ep_ci_request(struct osmo_mgcpc_ep_ci *ci,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25707">change 25707</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/c/osmo-bsc/+/25707"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I9b287aa492ca6aae5fc56133e1510aff3146fe25 </div>
<div style="display:none"> Gerrit-Change-Number: 25707 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>