Osmocom Open Build Service

osmo-bsc.spec Changed

@@ -17,14 +17,14 @@
 %define _lto_cflags %{nil}
 
 Name:           osmo-bsc
-Requires: osmocom-nightly = 202402192026
-Version: 1.11.0.72.d399e.202402192026
+Requires: osmocom-nightly = 202402202026
+Version: 1.11.0.75.a5249.202402202026
 Release:        0
 Summary:        OsmoBSC: Osmocom's Base Station Controller for 2G CS mobile networks
 License:        AGPL-3.0-or-later AND GPL-2.0-or-later
 Group:          Hardware/Mobile
 URL:            https://osmocom.org/projects/osmobsc
-Source: osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz
+Source: osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz
 Source1: rpmlintrc
 BuildRequires:  automake >= 1.9
 BuildRequires:  libtool >= 2
@@ -49,7 +49,7 @@
 OsmoBSC: Osmocom's Base Station Controller for 2G circuit-switched mobile networks.
 
 %package abisip-find
-Requires: osmocom-nightly = 202402192026
+Requires: osmocom-nightly = 202402202026
 Summary:        CLI utility to find ip.access compatible BTS
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities
@@ -58,7 +58,7 @@
 Command line utility to find ip.access compatible BTS.
 
 %package ipaccess-utils
-Requires: osmocom-nightly = 202402192026
+Requires: osmocom-nightly = 202402202026
 Summary:        Command line utilities for ip.access nanoBTS
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities
@@ -69,7 +69,7 @@
 and ipaccess-proxy.
 
 %package bs11-utils
-Requires: osmocom-nightly = 202402192026
+Requires: osmocom-nightly = 202402202026
 Summary:        Command line utilities for Siemens BS-11 BTS
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities
@@ -80,7 +80,7 @@
 public telephone network as frequency standard for the E1 line.
 
 %package meas-utils
-Requires: osmocom-nightly = 202402192026
+Requires: osmocom-nightly = 202402202026
 Summary:        Command line utilities for OsmoBSC's measurement reports
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities

osmo-bsc_1.11.0.72.d399e.202402192026.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.11.0.72.d399e.202402192026
-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.9.0), libosmo-sigtran-dev (>= 1.8.0), libosmo-abis-dev (>= 1.5.0), libosmo-netif-dev (>= 1.4.0), libosmo-mgcp-client-dev (>= 1.12.0), osmo-gsm-manuals-dev (>= 1.5.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:
- 275b3f6147c0affff49822b72e608edb7523447a 623120 osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz
-Checksums-Sha256:
- 8a9a75ed1f942b14318cbab76300bf399be472db827e66111eb1f212a5580540 623120 osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz
-Files:
- 66fc8e6d98d4c01e26ec7c7a42c4cc77 623120 osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz

osmo-bsc_1.11.0.75.a5249.202402202026.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.11.0.75.a5249.202402202026
+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.9.0), libosmo-sigtran-dev (>= 1.8.0), libosmo-abis-dev (>= 1.5.0), libosmo-netif-dev (>= 1.4.0), libosmo-mgcp-client-dev (>= 1.12.0), osmo-gsm-manuals-dev (>= 1.5.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:
+ a945842bc03a95c028d14e694ef8d304b9a71648 623368 osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz
+Checksums-Sha256:
+ b23aa5b20cb5850cfecf32be214287c647d36fc88fc63f4897feb30c63c8a7c5 623368 osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz
+Files:
+ bf7f29f3d20752cb71c2b23098d53d76 623368 osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/.tarball-version -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/.tarball-version Changed

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/contrib/osmo-bsc.spec.in -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/contrib/osmo-bsc.spec.in Changed

@@ -17,7 +17,7 @@
 %define _lto_cflags %{nil}
 
 Name:           osmo-bsc
-Requires: osmocom-nightly = 202402192026
+Requires: osmocom-nightly = 202402202026
 Version:        @VERSION@
 Release:        0
 Summary:        OsmoBSC: Osmocom's Base Station Controller for 2G CS mobile networks
@@ -48,7 +48,7 @@
 OsmoBSC: Osmocom's Base Station Controller for 2G circuit-switched mobile networks.
 
 %package abisip-find
-Requires: osmocom-nightly = 202402192026
+Requires: osmocom-nightly = 202402202026
 Summary:        CLI utility to find ip.access compatible BTS
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities
@@ -57,7 +57,7 @@
 Command line utility to find ip.access compatible BTS.
 
 %package ipaccess-utils
-Requires: osmocom-nightly = 202402192026
+Requires: osmocom-nightly = 202402202026
 Summary:        Command line utilities for ip.access nanoBTS
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities
@@ -68,7 +68,7 @@
 and ipaccess-proxy.
 
 %package bs11-utils
-Requires: osmocom-nightly = 202402192026
+Requires: osmocom-nightly = 202402202026
 Summary:        Command line utilities for Siemens BS-11 BTS
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities
@@ -79,7 +79,7 @@
 public telephone network as frequency standard for the E1 line.
 
 %package meas-utils
-Requires: osmocom-nightly = 202402192026
+Requires: osmocom-nightly = 202402202026
 Summary:        Command line utilities for OsmoBSC's measurement reports
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/debian/changelog -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/debian/changelog Changed

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/debian/control -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/debian/control Changed

@@ -26,7 +26,7 @@
 Package: osmo-bsc
 Architecture: any
 Multi-Arch: foreign
-Depends: osmocom-nightly (= 202402192026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202402202026), ${misc:Depends}, ${shlibs:Depends}
 Recommends: osmo-mgw
 Description: OsmoBSC: Osmocom's Base Station Controller for 2G circuit-switched mobile networks
 
@@ -34,19 +34,19 @@
 Section: debug
 Architecture: any
 Multi-Arch: same
-Depends: osmocom-nightly (= 202402192026), osmo-bsc (= ${binary:Version}), ${misc:Depends}
+Depends: osmocom-nightly (= 202402202026), osmo-bsc (= ${binary:Version}), ${misc:Depends}
 Description: OsmoBSC: Osmocom's Base Station Controller for 2G circuit-switched mobile networks
 
 Package: abisip-find
 Architecture: any
 Multi-Arch: foreign
-Depends: osmocom-nightly (= 202402192026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202402202026), ${misc:Depends}, ${shlibs:Depends}
 Description: Command line utility to find ip.access compatible BTS
 
 Package: osmo-bsc-ipaccess-utils
 Architecture: any
 Multi-Arch: foreign
-Depends: osmocom-nightly (= 202402192026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202402202026), ${misc:Depends}, ${shlibs:Depends}
 Description: Command line utilities for ip.access nanoBTS
  This package contains utilities that are specific for nanoBTS when being used
  together with OpenBSC. It contains mainly two tools: ipaccess-config and ipaccess-proxy.
@@ -54,7 +54,7 @@
 Package: osmo-bsc-bs11-utils
 Architecture: any
 Multi-Arch: foreign
-Depends: osmocom-nightly (= 202402192026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202402202026), ${misc:Depends}, ${shlibs:Depends}
 Description: Command line utilities for Siemens BS-11 BTS
  There is a tool in this package for configuring the Siemens BS-11 BTS.
  Additionally, it contains one tool for making use of an ISDN-card and the
@@ -63,14 +63,14 @@
 Package: osmo-bsc-meas-utils
 Architecture: any
 Multi-Arch: foreign
-Depends: osmocom-nightly (= 202402192026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202402202026), ${misc:Depends}, ${shlibs:Depends}
 Description: Command line utilities to manage measurement reports.
 
 Package: osmo-bsc-doc
 Architecture: all
 Section: doc
 Priority: optional
-Depends: osmocom-nightly (= 202402192026), ${misc:Depends}
+Depends: osmocom-nightly (= 202402202026), ${misc:Depends}
 Description: ${misc:Package} PDF documentation
  Various manuals: user manual, VTY reference manual and/or
  protocol/interface manuals.

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/debian/copyright -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/debian/copyright Changed

@@ -25,31 +25,6 @@
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-Files:     src/libbsc/bsc_ctrl_lookup.c
-           src/libbsc/pcu_sock.c
-Copyright: 2008-2010 Harald Welte <laforge@gnumonks.org>
-           2009-2012 Andreas Eversberg <jolly@eversberg.eu>
-           2010-2011 Daniel Willmann <daniel@totalueberwachung.de>
-           2010-2011 On-Waves
-           2012 Holger Hans Peter Freyther
-License:   GPL-2.0+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- .
- On Debian systems, the complete text of the GNU General Public License
- Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-
 Files:     osmoappdesc.py
 Copyright: 2013 Katerina Barone-Adesi <kat.obsc@gmail.com>
 License:   GPL-3.0+

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/src/osmo-bsc/bsc_ctrl_lookup.c -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/src/osmo-bsc/bsc_ctrl_lookup.c Changed

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/src/osmo-bsc/bts_trx_ts_lchan_ctrl.c -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/src/osmo-bsc/bts_trx_ts_lchan_ctrl.c Changed

@@ -22,6 +22,7 @@
 #include <osmocom/bsc/bts.h>
 #include <osmocom/bsc/system_information.h>
 #include <osmocom/bsc/abis_rsl.h>
+#include <osmocom/bsc/lchan_fsm.h>
 
 static int verify_lchan_ms_power(struct ctrl_cmd *cmd, const char *value, void *_data)
 {
@@ -67,11 +68,87 @@
 
 CTRL_CMD_DEFINE(lchan_ms_power, "ms-power");
 
+/* Return full information about a logical channel.
+ * format: bts.<0-255>.trx.<0-255>.ts.<0-8>.lchan.<0-8>.show.full
+ * result format: <bts>,<trx>,<ts>,<lchan>,<type>,<connection>,<state>,<last error>,<bs power>,<ms power>,<interference dbm>,
+ *	<interference band>,<channel mode>,<imsi>,<tmsi>,<ipa bound ip>,<ipa bound port>,<ipa bound conn id>,<ipa conn ip>,
+ *	<ipa conn port>,<ipa conn sppech mode>
+ */
+static int get_lchan_show_full(struct ctrl_cmd *cmd, void *data)
+{
+	struct gsm_lchan *lchan = cmd->node;
+	struct in_addr ia;
+	char *interference = ",", *tmsi = "", *ipa_bound = ",,", *ipa_conn = ",,";
+
+	if (lchan->interf_dbm != INTERF_DBM_UNKNOWN) {
+		interference = talloc_asprintf(cmd, "%d,%u", lchan->interf_dbm, lchan->interf_band);
+		if (!interference) {
+			cmd->reply = "OOM";
+			return CTRL_CMD_ERROR;
+		}
+	}
+
+	if (lchan->conn && lchan->conn->bsub && lchan->conn->bsub->tmsi != GSM_RESERVED_TMSI) {
+		tmsi = talloc_asprintf(cmd, "0x%08x", lchan->conn->bsub->tmsi);
+		if (!tmsi) {
+			cmd->reply = "OOM";
+			return CTRL_CMD_ERROR;
+		}
+	}
+
+	if (is_ipa_abisip_bts(lchan->ts->trx->bts) && lchan->abis_ip.bound_ip) {
+		ia.s_addr = htonl(lchan->abis_ip.bound_ip);
+		ipa_bound = talloc_asprintf(cmd, "%s,%u,%u", inet_ntoa(ia), lchan->abis_ip.bound_port,
+								lchan->abis_ip.conn_id);
+		if (!ipa_bound) {
+			cmd->reply = "OOM";
+			return CTRL_CMD_ERROR;
+		}
+	}
+
+	if (is_ipa_abisip_bts(lchan->ts->trx->bts) && lchan->abis_ip.connect_ip) {
+		ia.s_addr = htonl(lchan->abis_ip.connect_ip);
+		ipa_conn = talloc_asprintf(cmd, "%s,%u,0x%02x", inet_ntoa(ia), lchan->abis_ip.connect_port,
+								lchan->abis_ip.speech_mode);
+		if (!ipa_conn) {
+			cmd->reply = "OOM";
+			return CTRL_CMD_ERROR;
+		}
+	}
+
+	cmd->reply = talloc_asprintf(cmd, "%u,%u,%u,%u,%s,%u,%s,%s,%u,%u,%s,%s,%s,%s,%s,%s",
+		lchan->ts->trx->bts->nr,
+		lchan->ts->trx->nr,
+		lchan->ts->nr,
+		lchan->nr,
+		gsm_chan_t_name(lchan->type),
+		lchan->conn ? 1 : 0, lchan_state_name(lchan),
+		lchan->fi && lchan->fi->state == LCHAN_ST_BORKEN ? lchan->last_error : "",
+		lchan->ts->trx->nominal_power - lchan->ts->trx->max_power_red - lchan->bs_power_db,
+		ms_pwr_dbm(lchan->ts->trx->bts->band, lchan->ms_power),
+		interference,
+		gsm48_chan_mode_name(lchan->current_ch_mode_rate.chan_mode),
+		lchan->conn && lchan->conn->bsub && strlen(lchan->conn->bsub->imsi) ? lchan->conn->bsub->imsi : "",
+		tmsi,
+		ipa_bound,
+		ipa_conn
+	);
+	if (!cmd->reply) {
+		cmd->reply = "OOM";
+		return CTRL_CMD_ERROR;
+	}
+
+	return CTRL_CMD_REPLY;
+}
+CTRL_CMD_DEFINE_RO(lchan_show_full, "show full");
+
+
 int bsc_bts_trx_ts_lchan_ctrl_cmds_install(void)
 {
 	int rc = 0;
 
 	rc |= ctrl_cmd_install(CTRL_NODE_LCHAN, &cmd_lchan_ms_power);
+	rc |= ctrl_cmd_install(CTRL_NODE_LCHAN, &cmd_lchan_show_full);
 
 	return rc;
 }

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/src/osmo-bsc/nm_bb_transc_fsm.c -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/src/osmo-bsc/nm_bb_transc_fsm.c Changed

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/src/osmo-bsc/nm_bts_fsm.c -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/src/osmo-bsc/nm_bts_fsm.c Changed

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/src/osmo-bsc/nm_bts_sm_fsm.c -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/src/osmo-bsc/nm_bts_sm_fsm.c Changed

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/src/osmo-bsc/nm_channel_fsm.c -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/src/osmo-bsc/nm_channel_fsm.c Changed

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/src/osmo-bsc/nm_common_fsm.c -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/src/osmo-bsc/nm_common_fsm.c Changed

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/src/osmo-bsc/nm_gprs_cell_fsm.c -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/src/osmo-bsc/nm_gprs_cell_fsm.c Changed

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/src/osmo-bsc/nm_gprs_nse_fsm.c -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/src/osmo-bsc/nm_gprs_nse_fsm.c Changed

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/src/osmo-bsc/nm_gprs_nsvc_fsm.c -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/src/osmo-bsc/nm_gprs_nsvc_fsm.c Changed

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/src/osmo-bsc/nm_rcarrier_fsm.c -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/src/osmo-bsc/nm_rcarrier_fsm.c Changed

osmo-bsc_1.11.0.72.d399e.202402192026.tar.xz/src/osmo-bsc/power_control.c -> osmo-bsc_1.11.0.75.a5249.202402202026.tar.xz/src/osmo-bsc/power_control.c Changed

Changes of Revision 612