Osmocom Open Build Service

commit_7067255b8486a299fc67312819641f813c6099d6.txt Deleted

commit_a6379ef8f2e4df33637d6ae53579d50284a21fe6.txt Added

osmo-bsc_1.12.1.35.70672.dsc Deleted

@@ -1,25 +0,0 @@
-Format: 3.0 (native)
-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.35.70672
-Maintainer: Osmocom team <openbsc@lists.osmocom.org>
-Homepage: https://projects.osmocom.org/projects/osmo-bsc
-Standards-Version: 3.9.8
-Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-bsc
-Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-bsc
-Build-Depends: debhelper (>= 10), dh-autoreconf, autotools-dev, autoconf, automake, libtool, pkg-config, python3-minimal, libcdk5-dev, libtalloc-dev, libosmocore-dev (>= 1.10.0), libosmo-sigtran-dev (>= 1.9.0), libosmo-abis-dev (>= 1.6.0), libosmo-netif-dev (>= 1.5.0), libosmo-mgcp-client-dev (>= 1.13.0), osmo-gsm-manuals-dev (>= 1.6.0)
-Package-List:
- abisip-find deb net extra arch=any
- osmo-bsc deb net extra arch=any
- osmo-bsc-bs11-utils deb net extra arch=any
- osmo-bsc-dbg deb debug extra arch=any
- osmo-bsc-doc deb doc optional arch=all
- osmo-bsc-ipaccess-utils deb net extra arch=any
- osmo-bsc-meas-utils deb net extra arch=any
-Checksums-Sha1:
- 690850cda536b5f3295f5e9b0c5670855891b09c 628744 osmo-bsc_1.12.1.35.70672.tar.xz
-Checksums-Sha256:
- bdadbf306265010b824ceffbc33b66df0c86f62fb6a5342ddff1fd6e37faf0c4 628744 osmo-bsc_1.12.1.35.70672.tar.xz
-Files:
- c02678424371acb41eabfeac9ff7b370 628744 osmo-bsc_1.12.1.35.70672.tar.xz

osmo-bsc_1.12.1.36.a6379.dsc Added

@@ -0,0 +1,25 @@
+Format: 3.0 (native)
+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.36.a6379
+Maintainer: Osmocom team <openbsc@lists.osmocom.org>
+Homepage: https://projects.osmocom.org/projects/osmo-bsc
+Standards-Version: 3.9.8
+Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-bsc
+Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-bsc
+Build-Depends: debhelper (>= 10), dh-autoreconf, autotools-dev, autoconf, automake, libtool, pkg-config, python3-minimal, libcdk5-dev, libtalloc-dev, libosmocore-dev (>= 1.10.0), libosmo-sigtran-dev (>= 1.9.0), libosmo-abis-dev (>= 1.6.0), libosmo-netif-dev (>= 1.5.0), libosmo-mgcp-client-dev (>= 1.13.0), osmo-gsm-manuals-dev (>= 1.6.0)
+Package-List:
+ abisip-find deb net extra arch=any
+ osmo-bsc deb net extra arch=any
+ osmo-bsc-bs11-utils deb net extra arch=any
+ osmo-bsc-dbg deb debug extra arch=any
+ osmo-bsc-doc deb doc optional arch=all
+ osmo-bsc-ipaccess-utils deb net extra arch=any
+ osmo-bsc-meas-utils deb net extra arch=any
+Checksums-Sha1:
+ af380c538f63dd90b979b23050ba1c53bac7fbc7 628740 osmo-bsc_1.12.1.36.a6379.tar.xz
+Checksums-Sha256:
+ a76581d0a6e129bbda8e7ba4dc4c001d99e9ab1e567301d4015f4f31e3719e5b 628740 osmo-bsc_1.12.1.36.a6379.tar.xz
+Files:
+ 4a287d7d05848a45e38f8f95d98acb79 628740 osmo-bsc_1.12.1.36.a6379.tar.xz

osmo-bsc_1.12.1.35.70672.tar.xz/.tarball-version -> osmo-bsc_1.12.1.36.a6379.tar.xz/.tarball-version Changed

osmo-bsc_1.12.1.35.70672.tar.xz/debian/changelog -> osmo-bsc_1.12.1.36.a6379.tar.xz/debian/changelog Changed

osmo-bsc_1.12.1.35.70672.tar.xz/src/osmo-bsc/pcu_sock.c -> osmo-bsc_1.12.1.36.a6379.tar.xz/src/osmo-bsc/pcu_sock.c Changed

@@ -665,24 +665,33 @@
 	return 0;
 }
 
-static int pcu_rx_txt_ind(struct gsm_bts *bts,
+static int pcu_rx_txt_ind(struct gsm_network *net, struct gsm_bts *bts,
 			  const struct gsm_pcu_if_txt_ind *txt)
 {
-	int rc;
+	int rc = 0;
 
 	switch (txt->type) {
 	case PCU_VERSION:
-		LOG_BTS(bts, DPCU, LOGL_INFO, "OsmoPCU version %s connected\n",
+		LOGP(DPCU, LOGL_INFO, "OsmoPCU version %s connected\n",
 		     txt->text);
-		rc = pcu_tx_si_all(bts);
+
+		/* we use the reception of the PCU_VERSION as a trigger to make the PCU available for
+		 * all BTSs handled by this process (currently this is exactly one BTS, see FIXME notes) */
+		llist_for_each_entry(bts, &net->bts_list, list) {
+			if (bsc_co_located_pcu(bts)) {
+				if (pcu_tx_si_all(bts) < 0)
+					rc = -EINVAL;
+			}
+		}
 		if (rc < 0)
 			return -EINVAL;
 		break;
 	case PCU_OML_ALERT:
+		OSMO_ASSERT(bts);
 		LOG_BTS(bts, DPCU, LOGL_ERROR, "PCU external alarm: %s\n", txt->text);
 		break;
 	default:
-		LOG_BTS(bts, DPCU, LOGL_ERROR, "Unknown TXT_IND type %u received\n",
+		LOGP(DPCU, LOGL_ERROR, "Unknown TXT_IND type %u received\n",
 		     txt->type);
 		return -EINVAL;
 	}
@@ -699,25 +708,39 @@
 			return -EINVAL; \
 		} \
 	} while (0)
+
+#define ENSURE_BTS_OBJECT(bts) \
+	do { \
+		if ((bts = gsm_bts_num(net, pcu_prim->bts_nr)) == NULL) { \
+			LOGP(DPCU, LOGL_ERROR, "Received PCU Prim for non-existent BTS %u\n", pcu_prim->bts_nr); \
+			return -EINVAL; \
+		} \
+	} while (0)
+
 static int pcu_rx(struct gsm_network *net, uint8_t msg_type,
 	struct gsm_pcu_if *pcu_prim, size_t prim_len)
 {
 	int rc = 0;
 	struct gsm_bts *bts;
 
-	bts = gsm_bts_num(net, pcu_prim->bts_nr);
-	if (!bts)
-		return -EINVAL;
-
 	switch (msg_type) {
 	case PCU_IF_MSG_DATA_REQ:
 	case PCU_IF_MSG_PAG_REQ:
 		CHECK_IF_MSG_SIZE(prim_len, pcu_prim->u.data_req);
+		ENSURE_BTS_OBJECT(bts);
 		rc = pcu_rx_data_req(bts, msg_type, &pcu_prim->u.data_req);
 		break;
 	case PCU_IF_MSG_TXT_IND:
 		CHECK_IF_MSG_SIZE(prim_len, pcu_prim->u.txt_ind);
-		rc = pcu_rx_txt_ind(bts, &pcu_prim->u.txt_ind);
+		if (pcu_prim->u.txt_ind.type == PCU_VERSION) {
+			/* A TXT indication that carries the PCU_VERSION is always addressed to the
+			 * receiving process as a whole, which means we will not resolve a specific
+			 * BTS object in this case. */
+			rc = pcu_rx_txt_ind(net, NULL, &pcu_prim->u.txt_ind);
+		} else {
+			ENSURE_BTS_OBJECT(bts);
+			rc = pcu_rx_txt_ind(NULL, bts, &pcu_prim->u.txt_ind);
+		}
 		break;
 	default:
 		LOGP(DPCU, LOGL_ERROR, "Received unknown PCU msg type %d\n",

Changes of Revision 270