Projects
osmocom:nightly
osmo-bsc
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 346
View file
osmo-bsc.spec
Changed
@@ -17,14 +17,14 @@ %define _lto_cflags %{nil} Name: osmo-bsc -Requires: osmocom-nightly = 202305310026 -Version: 1.10.0.169.ff354.202305310026 +Requires: osmocom-nightly = 202306010026 +Version: 1.10.0.170.87986.202306010026 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.10.0.169.ff354.202305310026.tar.xz +Source: osmo-bsc_1.10.0.170.87986.202306010026.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 = 202305310026 +Requires: osmocom-nightly = 202306010026 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 = 202305310026 +Requires: osmocom-nightly = 202306010026 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 = 202305310026 +Requires: osmocom-nightly = 202306010026 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 = 202305310026 +Requires: osmocom-nightly = 202306010026 Summary: Command line utilities for OsmoBSC's measurement reports License: GPL-2.0-or-later Group: Productivity/Telephony/Utilities
View file
osmo-bsc_1.10.0.169.ff354.202305310026.dsc -> osmo-bsc_1.10.0.170.87986.202306010026.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.10.0.169.ff354.202305310026 +Version: 1.10.0.170.87986.202306010026 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: - 0bef0b9684f29c0e7399f570976da7bf9c71b28d 601820 osmo-bsc_1.10.0.169.ff354.202305310026.tar.xz + 61cbb39b1447664d0d871a7d912476fb6aeb2656 602276 osmo-bsc_1.10.0.170.87986.202306010026.tar.xz Checksums-Sha256: - 7dac7fd9cef5b99be70fea709d245fe6ba7ecb89eef8c6995a6dcee3220bcd45 601820 osmo-bsc_1.10.0.169.ff354.202305310026.tar.xz + 2fdbaafd8afb92e70c787d9f3d22547f7e1acefea5bc76b8de3a2dca78a9ee1d 602276 osmo-bsc_1.10.0.170.87986.202306010026.tar.xz Files: - 4865331f21c76d037c1a4e538f0311db 601820 osmo-bsc_1.10.0.169.ff354.202305310026.tar.xz + 76c55cb147e16f75a3578a4331eae96e 602276 osmo-bsc_1.10.0.170.87986.202306010026.tar.xz
View file
osmo-bsc_1.10.0.169.ff354.202305310026.tar.xz/.tarball-version -> osmo-bsc_1.10.0.170.87986.202306010026.tar.xz/.tarball-version
Changed
@@ -1 +1 @@ -1.10.0.169-ff354.202305310026 +1.10.0.170-87986.202306010026
View file
osmo-bsc_1.10.0.169.ff354.202305310026.tar.xz/contrib/osmo-bsc.spec.in -> osmo-bsc_1.10.0.170.87986.202306010026.tar.xz/contrib/osmo-bsc.spec.in
Changed
@@ -17,7 +17,7 @@ %define _lto_cflags %{nil} Name: osmo-bsc -Requires: osmocom-nightly = 202305310026 +Requires: osmocom-nightly = 202306010026 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 = 202305310026 +Requires: osmocom-nightly = 202306010026 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 = 202305310026 +Requires: osmocom-nightly = 202306010026 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 = 202305310026 +Requires: osmocom-nightly = 202306010026 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 = 202305310026 +Requires: osmocom-nightly = 202306010026 Summary: Command line utilities for OsmoBSC's measurement reports License: GPL-2.0-or-later Group: Productivity/Telephony/Utilities
View file
osmo-bsc_1.10.0.169.ff354.202305310026.tar.xz/debian/changelog -> osmo-bsc_1.10.0.170.87986.202306010026.tar.xz/debian/changelog
Changed
@@ -1,8 +1,8 @@ -osmo-bsc (1.10.0.169.ff354.202305310026) unstable; urgency=medium +osmo-bsc (1.10.0.170.87986.202306010026) unstable; urgency=medium * Automatically generated changelog entry for building the Osmocom nightly feed - -- Osmocom OBS scripts <info@osmocom.org> Wed, 31 May 2023 00:26:26 +0000 + -- Osmocom OBS scripts <info@osmocom.org> Thu, 01 Jun 2023 00:26:27 +0000 osmo-bsc (1.10.0) unstable; urgency=medium
View file
osmo-bsc_1.10.0.169.ff354.202305310026.tar.xz/debian/control -> osmo-bsc_1.10.0.170.87986.202306010026.tar.xz/debian/control
Changed
@@ -26,7 +26,7 @@ Package: osmo-bsc Architecture: any Multi-Arch: foreign -Depends: osmocom-nightly (= 202305310026), ${misc:Depends}, ${shlibs:Depends} +Depends: osmocom-nightly (= 202306010026), ${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 (= 202305310026), osmo-bsc (= ${binary:Version}), ${misc:Depends} +Depends: osmocom-nightly (= 202306010026), 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 (= 202305310026), ${misc:Depends}, ${shlibs:Depends} +Depends: osmocom-nightly (= 202306010026), ${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 (= 202305310026), ${misc:Depends}, ${shlibs:Depends} +Depends: osmocom-nightly (= 202306010026), ${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 (= 202305310026), ${misc:Depends}, ${shlibs:Depends} +Depends: osmocom-nightly (= 202306010026), ${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 (= 202305310026), ${misc:Depends}, ${shlibs:Depends} +Depends: osmocom-nightly (= 202306010026), ${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 (= 202305310026), ${misc:Depends} +Depends: osmocom-nightly (= 202306010026), ${misc:Depends} Description: ${misc:Package} PDF documentation Various manuals: user manual, VTY reference manual and/or protocol/interface manuals.
View file
osmo-bsc_1.10.0.169.ff354.202305310026.tar.xz/include/osmocom/bsc/bts.h -> osmo-bsc_1.10.0.170.87986.202306010026.tar.xz/include/osmocom/bsc/bts.h
Changed
@@ -568,6 +568,11 @@ uint16_t scramble_listMAX_EARFCN_LIST; } data; } si_common; + /* NCH (Notification Channel) related parameters */ + struct { + uint8_t num_blocks; /* NCH number of CCCH blocks (0 = no NCH) */ + uint8_t first_block; /* NCH first block number */ + } nch; bool early_classmark_allowed; bool early_classmark_allowed_3g; /* for testing only: Have an infinitely long radio link timeout */
View file
osmo-bsc_1.10.0.169.ff354.202305310026.tar.xz/src/osmo-bsc/bts_vty.c -> osmo-bsc_1.10.0.170.87986.202306010026.tar.xz/src/osmo-bsc/bts_vty.c
Changed
@@ -1107,6 +1107,46 @@ return CMD_SUCCESS; } +DEFUN_USRATTR(cfg_bts_nch_position, + cfg_bts_nch_position_cmd, + X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK), + "nch-position num-blocks <1-7> first-block <0-6>", + "NCH (Notification Channel) position within CCCH\n" + "Number of blocks reserved for NCH\n" + "Number of blocks reserved for NCH\n" + "First block reserved for NCH\n" + "First block reserved for NCH\n") +{ + struct gsm_bts *bts = vty->index; + int num_blocks = atoi(argv0); + int first_block = atoi(argv1); + + if (osmo_gsm48_si1ro_nch_pos_encode(num_blocks, first_block)) { + vty_out(vty, "num-blocks %u first-block %u is not permitted by 3GPP TS 44.010 Table 10.5.2.32.1b%s", + num_blocks, first_block, VTY_NEWLINE); + return CMD_WARNING; + } + + bts->nch.num_blocks = num_blocks; + bts->nch.first_block = first_block; + + return CMD_SUCCESS; +} + +DEFUN_USRATTR(cfg_bts_no_nch_position, + cfg_bts_no_nch_position_cmd, + X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK), + "no nch-position", + NO_STR "Disable NCH in this BTS\n") +{ + struct gsm_bts *bts = vty->index; + + bts->nch.num_blocks = 0; + bts->nch.first_block = 0; + + return CMD_SUCCESS; +} + DEFUN_USRATTR(cfg_bts_cell_barred, cfg_bts_cell_barred_cmd, X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK), @@ -4405,6 +4445,12 @@ bts->si_common.chan_desc.bs_pa_mfrms + 2, VTY_NEWLINE); vty_out(vty, " channel-description bs-ag-blks-res %u%s", bts->si_common.chan_desc.bs_ag_blks_res, VTY_NEWLINE); + if (bts->nch.num_blocks) { + vty_out(vty, " nch-position num-blocks %u first-block %u%s", + bts->nch.num_blocks, bts->nch.first_block, VTY_NEWLINE); + } else { + vty_out(vty, " no nch-position%s", VTY_NEWLINE); + } if (bts->ccch_load_ind_thresh != 10) vty_out(vty, " ccch load-indication-threshold %u%s", @@ -4851,6 +4897,8 @@ install_element(BTS_NODE, &cfg_bts_interf_meas_level_bounds_cmd); install_element(BTS_NODE, &cfg_bts_srvcc_fast_return_cmd); install_element(BTS_NODE, &cfg_bts_immediate_assignment_cmd); + install_element(BTS_NODE, &cfg_bts_nch_position_cmd); + install_element(BTS_NODE, &cfg_bts_no_nch_position_cmd); neighbor_ident_vty_init(); /* See also handover commands added on bts level from handover_vty.c */
View file
osmo-bsc_1.10.0.169.ff354.202305310026.tar.xz/src/osmo-bsc/osmo_bsc_main.c -> osmo-bsc_1.10.0.170.87986.202306010026.tar.xz/src/osmo-bsc/osmo_bsc_main.c
Changed
@@ -393,6 +393,12 @@ bts->si_common.chan_desc.bs_ag_blks_res); bts->si_common.chan_desc.bs_ag_blks_res = 2; } + + if (!(bts->nch.num_blocks == 1 && (bts->nch.first_block == 0 || bts->nch.first_block == 1)) && + !(bts->nch.num_blocks == 2 && bts->nch.first_block == 0)) { + LOG_BTS(bts, DNM, LOGL_ERROR, "CCCH is combined with SDCCHs, but NCH position/size is " + "incompatible with that. Please fix your config!\n"); + } } else { /* Non-combined TS0/C0 configuration */ /* There can be additional CCCHs on even timeslot numbers */ n += (bts->c0->ts2.pchan_from_config == GSM_PCHAN_CCCH); @@ -401,6 +407,13 @@ bts->si_common.chan_desc.ccch_conf = (n << 1); } + if (bts->nch.first_block + bts->nch.num_blocks > bts->si_common.chan_desc.bs_ag_blks_res) { + LOG_BTS(bts, DNM, LOGL_ERROR, "Position/Number of NCH blocks (%u..%u) exceeds AGCH (%u)." + "Please fix your config!\n", bts->nch.first_block, + bts->nch.first_block + bts->nch.num_blocks - 1, + bts->si_common.chan_desc.bs_ag_blks_res); + } + bts_setup_ramp_init_bts(bts); /* ACC ramping is initialized from vty/config */
View file
osmo-bsc_1.10.0.169.ff354.202305310026.tar.xz/src/osmo-bsc/system_information.c -> osmo-bsc_1.10.0.170.87986.202306010026.tar.xz/src/osmo-bsc/system_information.c
Changed
@@ -771,7 +771,19 @@ * SI1 Rest Octets (10.5.2.32), contains NCH position and band * indicator but that is not in the 04.08. */ - rc = osmo_gsm48_rest_octets_si1_encode(si1->rest_octets, NULL, is_dcs_net(bts)); + if (bts->nch.num_blocks) { + rc = osmo_gsm48_si1ro_nch_pos_encode(bts->nch.num_blocks, bts->nch.first_block); + if (rc < 0) { + LOGP(DRR, LOGL_ERROR, "Unable to encode NCH position (num_blocks=%u, first_block=%u)\n", + bts->nch.num_blocks, bts->nch.first_block); + rc = osmo_gsm48_rest_octets_si1_encode(si1->rest_octets, NULL, is_dcs_net(bts)); + } else { + uint8_t nch_pos = rc; + rc = osmo_gsm48_rest_octets_si1_encode(si1->rest_octets, &nch_pos, is_dcs_net(bts)); + } + } else { + rc = osmo_gsm48_rest_octets_si1_encode(si1->rest_octets, NULL, is_dcs_net(bts)); + } return sizeof(*si1) + rc; }
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.