Change in osmo-bsc[master]: osmo_bsc_main: call bootstrap_bts when OML TEI comes up

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25767 )

Change subject: osmo_bsc_main: call bootstrap_bts when OML TEI comes up
......................................................................

osmo_bsc_main: call bootstrap_bts when OML TEI comes up

At the moment check_bts and bootstrap_bts is called only once on startup.
When a new BTS is set up during runtime bootstrap_bts, nor check_bts is
called. This means that some parameters of the BTS stay uninitalized
until osmo-bsc is restarted. Lets rather call check_bts() and then
bootstrap_bts() when the OML TEI of the BTS comes up.

Change-Id: Ie599f809623efd6ea4ab3f39294195fc1ef84b85
Related: SYS#5369
---
M src/osmo-bsc/osmo_bsc_main.c
1 file changed, 17 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  osmith: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index fae2ef2..ae9bd69 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -477,6 +477,7 @@
 {
 	struct input_signal_data *isd = signal_data;
 	struct gsm_bts_trx *trx = isd->trx;
+	int rc;
 
 	if (subsys != SS_L_INPUT)
 		return -EINVAL;
@@ -489,9 +490,24 @@
 			/* Generate Mobile Allocation bit-masks for all timeslots.
 			 * This needs to be done here, because it's used for TS configuration. */
 			generate_ma_for_bts(trx->bts);
+			/* Check parameters and apply vty config dependent parameters */
+			rc = check_bts(trx->bts);
+			if (rc < 0) {
+				LOGP(DNM, LOGL_ERROR, "(bts=%u) Error in BTS configuration -- cannot bootstrap BTS\n",
+				     trx->bts->nr);
+				return rc;
+			}
+			bootstrap_bts(trx->bts);
 		}
-		if (isd->link_type == E1INP_SIGN_RSL)
+		if (isd->link_type == E1INP_SIGN_RSL) {
+			rc = check_bts(trx->bts);
+			if (rc < 0) {
+				LOGP(DNM, LOGL_ERROR, "(bts=%u) Error in BTS configuration -- cannot bootstrap RSL\n",
+				     trx->bts->nr);
+				return rc;
+			}
 			bootstrap_rsl(trx);
+		}
 		break;
 	case S_L_INP_TEI_DN:
 		LOG_TRX(trx, DLMI, LOGL_ERROR, "Lost E1 %s link\n", e1inp_signtype_name(isd->link_type));

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25767
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ie599f809623efd6ea4ab3f39294195fc1ef84b85
Gerrit-Change-Number: 25767
Gerrit-PatchSet: 7
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211115/4eed00e6/attachment.htm>