<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26197">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">abis_nm: actively block BTSs with invalid configuration<br><br>At the moment the BTS configuration is checked, but the check does not<br>have much consequence other than that some initialization that is not<br>executed. The BTS will go into the OML bootstrap phase anyway and most<br>likely fail at some later point due to the invalid configuration. To<br>reduce noise and unexpected behaviour of the BTS lets make sure that the<br>OML boostrap phase can only proceed when the BSC conciders the<br>configuration as valid.<br><br>Change-Id: I42c1c26a9b800600787b1266a871f95f2114c26e<br>Related: SYS#5369<br>---<br>M include/osmocom/bsc/bts.h<br>M src/osmo-bsc/bts.c<br>M src/osmo-bsc/bts_ipaccess_nanobts.c<br>M src/osmo-bsc/osmo_bsc_main.c<br>4 files changed, 63 insertions(+), 53 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 922753c..c4ee39d 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -717,6 +717,7 @@</span><br><span> }</span><br><span> </span><br><span> struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm, uint8_t bts_num);</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm_bts_check_cfg(struct gsm_bts *bts);</span><br><span> </span><br><span> char *gsm_bts_name(const struct gsm_bts *bts);</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index 11b1ec3..c4ae518 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -421,6 +421,57 @@</span><br><span> return bts;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Validate BTS configuration (ARFCN settings and physical channel configuration) */</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm_bts_check_cfg(struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts->model)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EFAULT;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (bts->band) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_BAND_1800:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->c0->arfcn < 512 || bts->c0->arfcn > 885) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNM, LOGL_ERROR, "(bts=%u) GSM1800 channel (%u) must be between 512-885.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, bts->c0->arfcn);</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%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_BAND_1900:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->c0->arfcn < 512 || bts->c0->arfcn > 810) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNM, LOGL_ERROR, "(bts=%u) GSM1900 channel (%u) must be between 512-810.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, bts->c0->arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_BAND_900:</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((bts->c0->arfcn > 124 && bts->c0->arfcn < 955) ||</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->c0->arfcn > 1023) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNM, LOGL_ERROR, "(bts=%u) GSM900 channel (%u) must be between 0-124, 955-1023.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, bts->c0->arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_BAND_850:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->c0->arfcn < 128 || bts->c0->arfcn > 251) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNM, LOGL_ERROR, "(bts=%u) GSM850 channel (%u) must be between 128-251.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, bts->c0->arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</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%);">+ LOGP(DNM, LOGL_ERROR, "(bts=%u) Unsupported frequency band.\n", bts->nr);</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%);">+ /* Verify the physical channel mapping */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trx_has_valid_pchan_config(trx)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DNM, LOGL_ERROR, "TRX %u has invalid timeslot "</span><br><span style="color: hsl(120, 100%, 40%);">+ "configuration\n", trx->nr);</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%);">+ }</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 char ts2str[255];</span><br><span> </span><br><span> char *gsm_bts_name(const struct gsm_bts *bts)</span><br><span>diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>index 9607068..1df6537 100644</span><br><span>--- a/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>@@ -696,6 +696,14 @@</span><br><span> DEBUGP(DLINP, "%s: Identified BTS %u/%u/%u\n", e1inp_signtype_name(type),</span><br><span> dev->site_id, dev->bts_id, dev->trx_id);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check if this BTS has a valid configuration. If not we will drop it</span><br><span style="color: hsl(120, 100%, 40%);">+ * immediately. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsm_bts_check_cfg(bts) != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLINP, LOGL_NOTICE, "(bts=%u) BTS config invalid, dropping BTS!\n", bts->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipaccess_drop_oml_deferred(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> switch(type) {</span><br><span> case E1INP_SIGN_OML:</span><br><span> /* remove old OML signal link for this 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 2436641..b7e2616 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>@@ -389,56 +389,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%);">-static int check_bts(struct gsm_bts *bts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx *trx;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts->model)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EFAULT;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (bts->band) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_BAND_1800:</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->c0->arfcn < 512 || bts->c0->arfcn > 885) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNM, LOGL_ERROR, "(bts=%u) GSM1800 channel (%u) must be between 512-885.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- bts->nr, bts->c0->arfcn);</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%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_BAND_1900:</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->c0->arfcn < 512 || bts->c0->arfcn > 810) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNM, LOGL_ERROR, "(bts=%u) GSM1900 channel (%u) must be between 512-810.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- bts->nr, bts->c0->arfcn);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_BAND_900:</span><br><span style="color: hsl(0, 100%, 40%);">- if ((bts->c0->arfcn > 124 && bts->c0->arfcn < 955) ||</span><br><span style="color: hsl(0, 100%, 40%);">- bts->c0->arfcn > 1023) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNM, LOGL_ERROR, "(bts=%u) GSM900 channel (%u) must be between 0-124, 955-1023.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- bts->nr, bts->c0->arfcn);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_BAND_850:</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->c0->arfcn < 128 || bts->c0->arfcn > 251) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNM, LOGL_ERROR, "(bts=%u) GSM850 channel (%u) must be between 128-251.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- bts->nr, bts->c0->arfcn);</span><br><span style="color: hsl(0, 100%, 40%);">- }</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%);">- LOGP(DNM, LOGL_ERROR, "(bts=%u) Unsupported frequency band.\n", bts->nr);</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%);">- /* Verify the physical channel mapping */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!trx_has_valid_pchan_config(trx)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DNM, LOGL_ERROR, "TRX %u has invalid timeslot "</span><br><span style="color: hsl(0, 100%, 40%);">- "configuration\n", trx->nr);</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%);">- }</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 void bootstrap_bts(struct gsm_bts *bts)</span><br><span> {</span><br><span> unsigned int n = 0;</span><br><span>@@ -492,7 +442,7 @@</span><br><span> case S_L_INP_TEI_UP:</span><br><span> if (isd->link_type == E1INP_SIGN_OML) {</span><br><span> /* Check parameters and apply vty config dependent parameters */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = check_bts(trx->bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm_bts_check_cfg(trx->bts);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DNM, LOGL_ERROR, "(bts=%u) Error in BTS configuration -- cannot bootstrap BTS\n",</span><br><span> trx->bts->nr);</span><br><span>@@ -501,7 +451,7 @@</span><br><span> bootstrap_bts(trx->bts);</span><br><span> }</span><br><span> if (isd->link_type == E1INP_SIGN_RSL) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = check_bts(trx->bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm_bts_check_cfg(trx->bts);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DNM, LOGL_ERROR, "(bts=%u) Error in BTS configuration -- cannot bootstrap RSL\n",</span><br><span> trx->bts->nr);</span><br><span>@@ -556,7 +506,7 @@</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 = check_bts(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm_bts_check_cfg(bts);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DNM, LOGL_FATAL, "(bts=%u) cannot bootstrap BTS, invalid BTS configuration\n", bts->nr);</span><br><span> return rc;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26197">change 26197</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/+/26197"/><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: I42c1c26a9b800600787b1266a871f95f2114c26e </div>
<div style="display:none"> Gerrit-Change-Number: 26197 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </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: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>