<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25767">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo_bsc_main: call bootstrap_bts when OML TEI comes up<br><br>At the moment bootstrap_bts is called only once on startup. When a new<br>BTY is set up during runtime bootstrap_bts is not called. This means<br>that some parameters of the BTS stay uninitalized until osmo-bsc is<br>restarted. Lets rather call bootstrap_bts() when the OML TEI of the BTS<br>comes up.<br><br>Change-Id: Ie599f809623efd6ea4ab3f39294195fc1ef84b85<br>Related: OS#5369<br>---<br>M src/osmo-bsc/osmo_bsc_main.c<br>1 file changed, 55 insertions(+), 52 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/67/25767/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index 92b7475..a133b9e 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>@@ -391,53 +391,6 @@</span><br><span> osmo_timer_schedule(&update_connection_stats_timer, 1, 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Callback function to be called every time we receive a signal from INPUT */</span><br><span style="color: hsl(0, 100%, 40%);">-static int inp_sig_cb(unsigned int subsys, unsigned int signal,</span><br><span style="color: hsl(0, 100%, 40%);">- void *handler_data, void *signal_data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct input_signal_data *isd = signal_data;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx *trx = isd->trx;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (subsys != SS_L_INPUT)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMI, LOGL_DEBUG, "%s(): Input signal '%s' received\n", __func__,</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(e1inp_signal_names, signal));</span><br><span style="color: hsl(0, 100%, 40%);">- switch (signal) {</span><br><span style="color: hsl(0, 100%, 40%);">- case S_L_INP_TEI_UP:</span><br><span style="color: hsl(0, 100%, 40%);">- if (isd->link_type == E1INP_SIGN_OML) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Generate Mobile Allocation bit-masks for all timeslots.</span><br><span style="color: hsl(0, 100%, 40%);">- * This needs to be done here, because it's used for TS configuration. */</span><br><span style="color: hsl(0, 100%, 40%);">- generate_ma_for_bts(trx->bts);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (isd->link_type == E1INP_SIGN_RSL)</span><br><span style="color: hsl(0, 100%, 40%);">- bootstrap_rsl(trx);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case S_L_INP_TEI_DN:</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_TRX(trx, DLMI, LOGL_ERROR, "Lost E1 %s link\n", e1inp_signtype_name(isd->link_type));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (isd->link_type == E1INP_SIGN_OML) {</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(rate_ctr_group_get_ctr(trx->bts->bts_ctrs, BTS_CTR_BTS_OML_FAIL));</span><br><span style="color: hsl(0, 100%, 40%);">- all_ts_dispatch_event(trx, TS_EV_OML_DOWN);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (isd->link_type == E1INP_SIGN_RSL) {</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(rate_ctr_group_get_ctr(trx->bts->bts_ctrs, BTS_CTR_BTS_RSL_FAIL));</span><br><span style="color: hsl(0, 100%, 40%);">- acc_ramp_abort(&trx->bts->acc_ramp);</span><br><span style="color: hsl(0, 100%, 40%);">- all_ts_dispatch_event(trx, TS_EV_RSL_DOWN);</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx->nr == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_del(&trx->bts->cbch_timer);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_sm_mo_reset(trx->bts->site_mgr);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- abis_nm_clear_queue(trx->bts);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static int bootstrap_bts(struct gsm_bts *bts)</span><br><span> {</span><br><span> struct gsm_bts_trx *trx;</span><br><span>@@ -516,6 +469,61 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Callback function to be called every time we receive a signal from INPUT */</span><br><span style="color: hsl(120, 100%, 40%);">+static int inp_sig_cb(unsigned int subsys, unsigned int signal,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *handler_data, void *signal_data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct input_signal_data *isd = signal_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx = isd->trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (subsys != SS_L_INPUT)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMI, LOGL_DEBUG, "%s(): Input signal '%s' received\n", __func__,</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(e1inp_signal_names, signal));</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (signal) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case S_L_INP_TEI_UP:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (isd->link_type == E1INP_SIGN_OML) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check parameters and apply vty config dependant parameters */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = bootstrap_bts(trx->bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNM, LOGL_FATAL, "Error bootstrapping BTS\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Generate Mobile Allocation bit-masks for all timeslots.</span><br><span style="color: hsl(120, 100%, 40%);">+ * This needs to be done here, because it's used for TS configuration. */</span><br><span style="color: hsl(120, 100%, 40%);">+ generate_ma_for_bts(trx->bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (isd->link_type == E1INP_SIGN_RSL)</span><br><span style="color: hsl(120, 100%, 40%);">+ bootstrap_rsl(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case S_L_INP_TEI_DN:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRX(trx, DLMI, LOGL_ERROR, "Lost E1 %s link\n", e1inp_signtype_name(isd->link_type));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (isd->link_type == E1INP_SIGN_OML) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(trx->bts->bts_ctrs, BTS_CTR_BTS_OML_FAIL));</span><br><span style="color: hsl(120, 100%, 40%);">+ all_ts_dispatch_event(trx, TS_EV_OML_DOWN);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (isd->link_type == E1INP_SIGN_RSL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rate_ctr_group_get_ctr(trx->bts->bts_ctrs, BTS_CTR_BTS_RSL_FAIL));</span><br><span style="color: hsl(120, 100%, 40%);">+ acc_ramp_abort(&trx->bts->acc_ramp);</span><br><span style="color: hsl(120, 100%, 40%);">+ all_ts_dispatch_event(trx, TS_EV_RSL_DOWN);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx->nr == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_del(&trx->bts->cbch_timer);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_bts_sm_mo_reset(trx->bts->site_mgr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_nm_clear_queue(trx->bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int bsc_network_configure(const char *config_file)</span><br><span> {</span><br><span> struct gsm_bts *bts;</span><br><span>@@ -537,11 +545,6 @@</span><br><span> osmo_signal_register_handler(SS_L_INPUT, inp_sig_cb, NULL);</span><br><span> </span><br><span> llist_for_each_entry(bts, &bsc_gsmnet->bts_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = bootstrap_bts(bts);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNM, LOGL_FATAL, "Error bootstrapping BTS\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> rc = e1_reconfig_bts(bts);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DNM, LOGL_FATAL, "Error enabling E1 input driver\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25767">change 25767</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/+/25767"/><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: Ie599f809623efd6ea4ab3f39294195fc1ef84b85 </div>
<div style="display:none"> Gerrit-Change-Number: 25767 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>