Osmocom Open Build Service

commit_6a4e24fb381b3c9fd97cd5ffba1cff31be244899.txt Deleted

commit_83793ffb49b4d1de086f0192c12f8abb26324dc4.txt Added

osmo-bsc_1.12.1.30.6a4e2.dsc -> osmo-bsc_1.12.1.31.83793.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-bsc
 Binary: osmo-bsc, osmo-bsc-dbg, abisip-find, osmo-bsc-ipaccess-utils, osmo-bsc-bs11-utils, osmo-bsc-meas-utils, osmo-bsc-doc
 Architecture: any all
-Version: 1.12.1.30.6a4e2
+Version: 1.12.1.31.83793
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmo-bsc
 Standards-Version: 3.9.8
@@ -18,8 +18,8 @@
  osmo-bsc-ipaccess-utils deb net extra arch=any
  osmo-bsc-meas-utils deb net extra arch=any
 Checksums-Sha1:
- d672e23a4105fa5e3497c150a1f0578fda3ca459 626048 osmo-bsc_1.12.1.30.6a4e2.tar.xz
+ 1c2d9d25e080c110f5d516581d36f3134471704c 626192 osmo-bsc_1.12.1.31.83793.tar.xz
 Checksums-Sha256:
- e95777ad8a833f78d05c2bde0dbb83f550405ff2b7e8b30f23eeaecc4c9e593a 626048 osmo-bsc_1.12.1.30.6a4e2.tar.xz
+ a4c206d56824fe881d2055da2992af6e40fa1618c7f92000ae1aeebeb9c30c02 626192 osmo-bsc_1.12.1.31.83793.tar.xz
 Files:
- 0c26b9a459efa9bdb52f38a804444fc3 626048 osmo-bsc_1.12.1.30.6a4e2.tar.xz
+ d5c73e445a118d2bde6326327aba88a4 626192 osmo-bsc_1.12.1.31.83793.tar.xz

osmo-bsc_1.12.1.30.6a4e2.tar.xz/.tarball-version -> osmo-bsc_1.12.1.31.83793.tar.xz/.tarball-version Changed

osmo-bsc_1.12.1.30.6a4e2.tar.xz/debian/changelog -> osmo-bsc_1.12.1.31.83793.tar.xz/debian/changelog Changed

osmo-bsc_1.12.1.30.6a4e2.tar.xz/src/osmo-bsc/bts_ipaccess_nanobts.c -> osmo-bsc_1.12.1.31.83793.tar.xz/src/osmo-bsc/bts_ipaccess_nanobts.c Changed

@@ -508,12 +508,17 @@
 /* These are exported because they are used by the VTY interface. */
 void ipaccess_drop_rsl(struct gsm_bts_trx *trx, const char *reason)
 {
+	struct e1inp_sign_link *link;
+
 	if (!trx->rsl_link_primary)
 		return;
 
 	LOG_TRX(trx, DLINP, LOGL_NOTICE, "Dropping RSL link: %s\n", reason);
-	e1inp_sign_link_destroy(trx->rsl_link_primary);
+	/* Mark bts->rsl_link_primary ptr null before calling sign_link_destroy,
+	 * to avoid a callback triggering this same code path. */
+	link = trx->rsl_link_primary;
 	trx->rsl_link_primary = NULL;
+	e1inp_sign_link_destroy(link);
 	osmo_stat_item_dec(osmo_stat_item_group_get_item(trx->bts->bts_statg, BTS_STAT_RSL_CONNECTED), 1);
 
 	if (trx->bts->c0 == trx)
@@ -529,6 +534,7 @@
 	uint8_t i;
 	struct timespec tp;
 	int rc;
+	struct e1inp_sign_link *link;
 
 	/* First of all, remove deferred drop if enabled */
 	osmo_timer_del(&bts->oml_drop_link_timer);
@@ -537,8 +543,11 @@
 		return;
 
 	LOG_BTS(bts, DLINP, LOGL_NOTICE, "Dropping OML link: %s\n", reason);
-	e1inp_sign_link_destroy(bts->oml_link);
+	/* Mark bts->oml_link ptr null before calling sign_link_destroy,
+	 * to avoid a callback triggering this same code path. */
+	link = bts->oml_link;
 	bts->oml_link = NULL;
+	e1inp_sign_link_destroy(link);
 	rc = osmo_clock_gettime(CLOCK_MONOTONIC, &tp);
 	bts->updowntime = (rc < 0) ? 0 : tp.tv_sec; /* we don't need sub-second precision for downtime */
 	osmo_stat_item_dec(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_OML_CONNECTED), 1);
@@ -546,8 +555,9 @@
 
 	/* Also drop the associated OSMO link */
 	OSMO_ASSERT(bts->osmo_link);
-	e1inp_sign_link_destroy(bts->osmo_link);
+	link = bts->osmo_link;
 	bts->osmo_link = NULL;
+	e1inp_sign_link_destroy(link);
 
 	bts_setup_ramp_remove(bts);

Changes of Revision 265