<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10190">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix: dispatch TS_EV_RSL_DOWN when losing RSL<br><br>Noticed by ttcn3-bsc-test: after TC_ms_rel_ind_does_not_cause_bssmap_reset the<br>test TC_dyn_pdch_ipa_act_deact would fail because RSL was still indicated as<br>available, and only OML was properly signalled as down.<br><br>Before recent commit I4843d03b3237cdcca0ad2041ef6895ff253d8419 to fix nanobts<br>and use only flags for RSL and OML presence, the timeslot FSM actually checked<br>RSL link presence and the lacking RSL DOWN event was not noticed.<br><br>Change-Id: I66c7fc5fcc676f4960f3d089b8c2ae5bce37ed99<br>---<br>M src/osmo-bsc/osmo_bsc_main.c<br>1 file changed, 14 insertions(+), 14 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/90/10190/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 218ea15..8dc9098 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>@@ -309,13 +309,22 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void all_ts_dispatch_event(struct gsm_bts_trx *trx, uint32_t event)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int ts_i;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (ts_i = 0; ts_i < ARRAY_SIZE(trx->ts); ts_i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = &trx->ts[ts_i];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->fi)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(ts->fi, event, 0);</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%);">+</span><br><span> /* Callback function to be called every time we receive a signal from INPUT */</span><br><span> static int inp_sig_cb(unsigned int subsys, unsigned int signal,</span><br><span> void *handler_data, void *signal_data)</span><br><span> {</span><br><span> struct input_signal_data *isd = signal_data;</span><br><span> struct gsm_bts_trx *trx = isd->trx;</span><br><span style="color: hsl(0, 100%, 40%);">- int ts_no;</span><br><span> /* N. B: we rely on attribute order when parsing response in abis_nm_rx_get_attr_resp() */</span><br><span> const uint8_t bts_attr[] = { NM_ATT_MANUF_ID, NM_ATT_SW_CONFIG, };</span><br><span> const uint8_t trx_attr[] = { NM_ATT_MANUF_STATE, NM_ATT_SW_CONFIG, };</span><br><span>@@ -360,22 +369,13 @@</span><br><span> case S_L_INP_TEI_DN:</span><br><span> LOGP(DLMI, LOGL_ERROR, "Lost some E1 TEI link: %d %p\n", isd->link_type, trx);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (isd->link_type == E1INP_SIGN_OML)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (isd->link_type == E1INP_SIGN_OML) {</span><br><span> rate_ctr_inc(&trx->bts->bts_ctrs->ctr[BTS_CTR_BTS_OML_FAIL]);</span><br><span style="color: hsl(0, 100%, 40%);">- else if (isd->link_type == E1INP_SIGN_RSL) {</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> rate_ctr_inc(&trx->bts->bts_ctrs->ctr[BTS_CTR_BTS_RSL_FAIL]);</span><br><span> acc_ramp_abort(&trx->bts->acc_ramp);</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%);">- /*</span><br><span style="color: hsl(0, 100%, 40%);">- * free all allocated channels. change the nm_state so the</span><br><span style="color: hsl(0, 100%, 40%);">- * trx and trx_ts becomes unusable and chan_alloc.c can not</span><br><span style="color: hsl(0, 100%, 40%);">- * allocate from it.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- for (ts_no = 0; ts_no < ARRAY_SIZE(trx->ts); ++ts_no) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx_ts *ts = &trx->ts[ts_no];</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->fi)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(ts->fi, TS_EV_OML_DOWN, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ all_ts_dispatch_event(trx, TS_EV_RSL_DOWN);</span><br><span> }</span><br><span> </span><br><span> gsm_bts_mo_reset(trx->bts);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10190">change 10190</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/10190"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I66c7fc5fcc676f4960f3d089b8c2ae5bce37ed99 </div>
<div style="display:none"> Gerrit-Change-Number: 10190 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>