<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20405">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OML: Stay compatible with older osmo-bts versions<br><br>Older osmo-bts versions (before FSMs) tended to mimic broken behavior<br>from nanoBTS. As so, we detect it because SiteMGr becomes Enabled by<br>default as in nanoBTS, and hence we can manage them also by expecting no<br>Offline state and sending Opstart (and hence finally transitting to<br>Enabled) during Dependency state.<br><br>Change-Id: Iaa036a2936f609b9b9721b2b4ad8d6deaf023f42<br>---<br>M include/osmocom/bsc/bts.h<br>M src/osmo-bsc/nm_bb_transc_fsm.c<br>M src/osmo-bsc/nm_bts_fsm.c<br>M src/osmo-bsc/nm_bts_sm_fsm.c<br>M src/osmo-bsc/nm_channel_fsm.c<br>M src/osmo-bsc/nm_rcarrier_fsm.c<br>6 files changed, 22 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h</span><br><span>index a9d57a3..284a932 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -364,6 +364,12 @@</span><br><span> /* BTS Site Manager */</span><br><span> struct gsm_bts_sm {</span><br><span> struct gsm_abis_mo mo;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* nanoBTS and old versions of osmo-bts behaves this way due to</span><br><span style="color: hsl(120, 100%, 40%);">+ broken FSMs not following TS 12.21: they never do</span><br><span style="color: hsl(120, 100%, 40%);">+ Dependency->Offline transition, but they should be OPSTARTed</span><br><span style="color: hsl(120, 100%, 40%);">+ nevertheless during Dependnecy state to work. This field is</span><br><span style="color: hsl(120, 100%, 40%);">+ used by all dependent NM objects. */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool peer_has_no_avstate_offline;</span><br><span> };</span><br><span> </span><br><span> /* One BTS */</span><br><span>diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c</span><br><span>index d4875c1..c29f53d 100644</span><br><span>--- a/src/osmo-bsc/nm_bb_transc_fsm.c</span><br><span>+++ b/src/osmo-bsc/nm_bb_transc_fsm.c</span><br><span>@@ -113,10 +113,7 @@</span><br><span> struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv;</span><br><span> struct gsm_bts_trx *trx = gsm_bts_bb_trx_get_trx(bb_transc);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* nanoBTS is broken, doesn't follow TS 12.21. Opstart MUST be sent</span><br><span style="color: hsl(0, 100%, 40%);">- during Dependency, so we simply move to OFFLINE state here to avoid</span><br><span style="color: hsl(0, 100%, 40%);">- duplicating code */</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx->bts->type == GSM_BTS_TYPE_NANOBTS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx->bts->site_mgr.peer_has_no_avstate_offline) {</span><br><span> nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE);</span><br><span> return;</span><br><span> }</span><br><span>@@ -188,9 +185,9 @@</span><br><span> nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED);</span><br><span> return;</span><br><span> case NM_AVSTATE_DEPENDENCY:</span><br><span style="color: hsl(0, 100%, 40%);">- /* There's no point in moving back to Dependency in nanoBTS, since it's broken</span><br><span style="color: hsl(120, 100%, 40%);">+ /* There's no point in moving back to Dependency, since it's broken</span><br><span> and it acts actually as if it was in Offline state */</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx->bts->type != GSM_BTS_TYPE_NANOBTS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trx->bts->site_mgr.peer_has_no_avstate_offline) {</span><br><span> nm_bb_transc_fsm_state_chg(fi, NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY);</span><br><span> } else {</span><br><span> /* Moreover, in nanoBTS we need to check here for tx</span><br><span>diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c</span><br><span>index fa42351..5f47fdc 100644</span><br><span>--- a/src/osmo-bsc/nm_bts_fsm.c</span><br><span>+++ b/src/osmo-bsc/nm_bts_fsm.c</span><br><span>@@ -119,7 +119,7 @@</span><br><span> /* nanoBTS is broken, doesn't follow TS 12.21. Opstart MUST be sent</span><br><span> during Dependency, so we simply move to OFFLINE state here to avoid</span><br><span> duplicating code */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->type == GSM_BTS_TYPE_NANOBTS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->site_mgr.peer_has_no_avstate_offline) {</span><br><span> nm_bts_fsm_state_chg(fi, NM_BTS_ST_OP_DISABLED_OFFLINE);</span><br><span> return;</span><br><span> }</span><br><span>@@ -200,9 +200,9 @@</span><br><span> nm_bts_fsm_state_chg(fi, NM_BTS_ST_OP_DISABLED_NOTINSTALLED);</span><br><span> return;</span><br><span> case NM_AVSTATE_DEPENDENCY:</span><br><span style="color: hsl(0, 100%, 40%);">- /* There's no point in moving back to Dependency in nanoBTS, since it's broken</span><br><span style="color: hsl(120, 100%, 40%);">+ /* There's no point in moving back to Dependency, since it's broken</span><br><span> and it acts actually as if it was in Offline state */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->type != GSM_BTS_TYPE_NANOBTS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts->site_mgr.peer_has_no_avstate_offline) {</span><br><span> nm_bts_fsm_state_chg(fi, NM_BTS_ST_OP_DISABLED_DEPENDENCY);</span><br><span> } else {</span><br><span> /* Moreover, in nanoBTS we need to check here for tx</span><br><span>diff --git a/src/osmo-bsc/nm_bts_sm_fsm.c b/src/osmo-bsc/nm_bts_sm_fsm.c</span><br><span>index 94ca9d3..ce9e15b 100644</span><br><span>--- a/src/osmo-bsc/nm_bts_sm_fsm.c</span><br><span>+++ b/src/osmo-bsc/nm_bts_sm_fsm.c</span><br><span>@@ -46,7 +46,9 @@</span><br><span> static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span> {</span><br><span> struct gsm_bts_sm *site_mgr = (struct gsm_bts_sm *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = gsm_bts_sm_get_bts(site_mgr);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ site_mgr->peer_has_no_avstate_offline = (bts->type == GSM_BTS_TYPE_NANOBTS);</span><br><span> site_mgr->mo.opstart_sent = false;</span><br><span> }</span><br><span> </span><br><span>@@ -73,7 +75,10 @@</span><br><span> } else {</span><br><span> LOGPFSML(fi, LOGL_NOTICE, "Received BTS Site Mgr State Report Enabled "</span><br><span> "without Opstart. You are probably using a nanoBTS but don't "</span><br><span style="color: hsl(0, 100%, 40%);">- "have your .cfg with 'type nanobts'\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ "have your .cfg with 'type nanobts'. Otherwise, you probably "</span><br><span style="color: hsl(120, 100%, 40%);">+ "are using an old osmo-bts; automatically adjusting OML "</span><br><span style="color: hsl(120, 100%, 40%);">+ "behavior to be backward-compatible.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->site_mgr.peer_has_no_avstate_offline = true;</span><br><span> }</span><br><span> nm_bts_sm_fsm_state_chg(fi, NM_BTS_SM_ST_OP_ENABLED);</span><br><span> return;</span><br><span>diff --git a/src/osmo-bsc/nm_channel_fsm.c b/src/osmo-bsc/nm_channel_fsm.c</span><br><span>index aeaf1fe..1d798a6 100644</span><br><span>--- a/src/osmo-bsc/nm_channel_fsm.c</span><br><span>+++ b/src/osmo-bsc/nm_channel_fsm.c</span><br><span>@@ -125,10 +125,7 @@</span><br><span> {</span><br><span> struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* nanoBTS is broken, doesn't follow TS 12.21. Opstart MUST be sent</span><br><span style="color: hsl(0, 100%, 40%);">- during Dependency, so we simply move to OFFLINE state here to avoid</span><br><span style="color: hsl(0, 100%, 40%);">- duplicating code */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->trx->bts->type == GSM_BTS_TYPE_NANOBTS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->trx->bts->site_mgr.peer_has_no_avstate_offline) {</span><br><span> nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_OFFLINE);</span><br><span> return;</span><br><span> }</span><br><span>@@ -209,9 +206,9 @@</span><br><span> nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_NOTINSTALLED);</span><br><span> return;</span><br><span> case NM_AVSTATE_DEPENDENCY:</span><br><span style="color: hsl(0, 100%, 40%);">- /* There's no point in moving back to Dependency in nanoBTS, since it's broken</span><br><span style="color: hsl(120, 100%, 40%);">+ /* There's no point in moving back to Dependency, since it's broken</span><br><span> and it acts actually as if it was in Offline state */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->trx->bts->type != GSM_BTS_TYPE_NANOBTS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ts->trx->bts->site_mgr.peer_has_no_avstate_offline) {</span><br><span> nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_DEPENDENCY);</span><br><span> } else {</span><br><span> /* Moreover, in nanoBTS we need to check here for tx</span><br><span>diff --git a/src/osmo-bsc/nm_rcarrier_fsm.c b/src/osmo-bsc/nm_rcarrier_fsm.c</span><br><span>index 5a95461..8702ebe 100644</span><br><span>--- a/src/osmo-bsc/nm_rcarrier_fsm.c</span><br><span>+++ b/src/osmo-bsc/nm_rcarrier_fsm.c</span><br><span>@@ -123,7 +123,7 @@</span><br><span> * version is found with the aboev estated bug, this code needs to be</span><br><span> * enabled, similar to what we do in nm_bb_transc_fsm:</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- /*if (trx->bts->type == GSM_BTS_TYPE_NANOBTS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*if (trx->bts->site_mgr.peer_has_no_avstate_offline) {</span><br><span> nm_rcarrier_fsm_state_chg(fi, NM_RCARRIER_ST_OP_DISABLED_OFFLINE);</span><br><span> return;</span><br><span> }*/</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20405">change 20405</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/+/20405"/><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: Iaa036a2936f609b9b9721b2b4ad8d6deaf023f42 </div>
<div style="display:none"> Gerrit-Change-Number: 20405 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>