Projects
osmocom:nightly
osmo-bsc
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 154
View file
osmo-bsc.spec
Changed
@@ -17,14 +17,14 @@ %define _lto_cflags %{nil} Name: osmo-bsc -Requires: osmocom-nightly = 202211230002 -Version: 1.9.0.91.27cb5.202211230002 +Requires: osmocom-nightly = 202211240002 +Version: 1.9.0.97.94951.202211240002 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.9.0.91.27cb5.202211230002.tar.xz +Source: osmo-bsc_1.9.0.97.94951.202211240002.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 = 202211230002 +Requires: osmocom-nightly = 202211240002 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 = 202211230002 +Requires: osmocom-nightly = 202211240002 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 = 202211230002 +Requires: osmocom-nightly = 202211240002 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 = 202211230002 +Requires: osmocom-nightly = 202211240002 Summary: Command line utilities for OsmoBSC's measurement reports License: GPL-2.0-or-later Group: Productivity/Telephony/Utilities
View file
osmo-bsc_1.9.0.91.27cb5.202211230002.dsc -> osmo-bsc_1.9.0.97.94951.202211240002.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.9.0.91.27cb5.202211230002 +Version: 1.9.0.97.94951.202211240002 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: - ed95d8784c0d655e72fa0d98fa9c9cecf9abe54e 583528 osmo-bsc_1.9.0.91.27cb5.202211230002.tar.xz + 684563be9345756ef562bbf4536a18dea257bff7 583608 osmo-bsc_1.9.0.97.94951.202211240002.tar.xz Checksums-Sha256: - 3d63439a796fdcc329b302473dfd483094687c49b7f8061e0ac8d24ed052772c 583528 osmo-bsc_1.9.0.91.27cb5.202211230002.tar.xz + 61628374b131ce93d8f619d913f420e1e972f99bd704127d8c7795b3f01a561a 583608 osmo-bsc_1.9.0.97.94951.202211240002.tar.xz Files: - acee496e9cee50c1702952f6e3457cdf 583528 osmo-bsc_1.9.0.91.27cb5.202211230002.tar.xz + 3659451675564a51ca12edad35f8345b 583608 osmo-bsc_1.9.0.97.94951.202211240002.tar.xz
View file
osmo-bsc_1.9.0.91.27cb5.202211230002.tar.xz/.tarball-version -> osmo-bsc_1.9.0.97.94951.202211240002.tar.xz/.tarball-version
Changed
@@ -1 +1 @@ -1.9.0.91-27cb5.202211230002 +1.9.0.97-94951.202211240002
View file
osmo-bsc_1.9.0.91.27cb5.202211230002.tar.xz/contrib/osmo-bsc.spec.in -> osmo-bsc_1.9.0.97.94951.202211240002.tar.xz/contrib/osmo-bsc.spec.in
Changed
@@ -17,7 +17,7 @@ %define _lto_cflags %{nil} Name: osmo-bsc -Requires: osmocom-nightly = 202211230002 +Requires: osmocom-nightly = 202211240002 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 = 202211230002 +Requires: osmocom-nightly = 202211240002 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 = 202211230002 +Requires: osmocom-nightly = 202211240002 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 = 202211230002 +Requires: osmocom-nightly = 202211240002 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 = 202211230002 +Requires: osmocom-nightly = 202211240002 Summary: Command line utilities for OsmoBSC's measurement reports License: GPL-2.0-or-later Group: Productivity/Telephony/Utilities
View file
osmo-bsc_1.9.0.91.27cb5.202211230002.tar.xz/debian/changelog -> osmo-bsc_1.9.0.97.94951.202211240002.tar.xz/debian/changelog
Changed
@@ -1,8 +1,8 @@ -osmo-bsc (1.9.0.91.27cb5.202211230002) unstable; urgency=medium +osmo-bsc (1.9.0.97.94951.202211240002) unstable; urgency=medium * Automatically generated changelog entry for building the Osmocom nightly feed - -- Osmocom OBS scripts <info@osmocom.org> Wed, 23 Nov 2022 00:02:48 +0000 + -- Osmocom OBS scripts <info@osmocom.org> Thu, 24 Nov 2022 00:02:47 +0000 osmo-bsc (1.9.0) unstable; urgency=medium
View file
osmo-bsc_1.9.0.91.27cb5.202211230002.tar.xz/debian/control -> osmo-bsc_1.9.0.97.94951.202211240002.tar.xz/debian/control
Changed
@@ -26,7 +26,7 @@ Package: osmo-bsc Architecture: any Multi-Arch: foreign -Depends: osmocom-nightly (= 202211230002), ${misc:Depends}, ${shlibs:Depends} +Depends: osmocom-nightly (= 202211240002), ${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 (= 202211230002), osmo-bsc (= ${binary:Version}), ${misc:Depends} +Depends: osmocom-nightly (= 202211240002), 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 (= 202211230002), ${misc:Depends}, ${shlibs:Depends} +Depends: osmocom-nightly (= 202211240002), ${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 (= 202211230002), ${misc:Depends}, ${shlibs:Depends} +Depends: osmocom-nightly (= 202211240002), ${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 (= 202211230002), ${misc:Depends}, ${shlibs:Depends} +Depends: osmocom-nightly (= 202211240002), ${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 (= 202211230002), ${misc:Depends}, ${shlibs:Depends} +Depends: osmocom-nightly (= 202211240002), ${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 (= 202211230002), ${misc:Depends} +Depends: osmocom-nightly (= 202211240002), ${misc:Depends} Description: ${misc:Package} PDF documentation Various manuals: user manual, VTY reference manual and/or protocol/interface manuals.
View file
osmo-bsc_1.9.0.91.27cb5.202211230002.tar.xz/include/osmocom/bsc/bts.h -> osmo-bsc_1.9.0.97.94951.202211240002.tar.xz/include/osmocom/bsc/bts.h
Changed
@@ -228,7 +228,9 @@ BTS_STAT_TS_BORKEN, BTS_STAT_NUM_TRX_RSL_CONNECTED, BTS_STAT_NUM_TRX_TOTAL, - BTS_STAT_T3113, + BTS_STAT_PAGING_REQ_QUEUE_LENGTH, + BTS_STAT_PAGING_AVAILABLE_SLOTS, + BTS_STAT_PAGING_T3113, }; extern const struct osmo_stat_item_desc bts_stat_desc;
View file
osmo-bsc_1.9.0.91.27cb5.202211230002.tar.xz/src/osmo-bsc/assignment_fsm.c -> osmo-bsc_1.9.0.97.94951.202211240002.tar.xz/src/osmo-bsc/assignment_fsm.c
Changed
@@ -51,10 +51,10 @@ } static const struct osmo_tdef_state_timeout assignment_fsm_timeouts32 = { - ASSIGNMENT_ST_WAIT_LCHAN_ACTIVE = { .T=10 }, - ASSIGNMENT_ST_WAIT_RR_ASS_COMPLETE = { .keep_timer=true }, - ASSIGNMENT_ST_WAIT_LCHAN_ESTABLISHED = { .keep_timer=true }, - ASSIGNMENT_ST_WAIT_MGW_ENDPOINT_TO_MSC = { .T=23042 }, + ASSIGNMENT_ST_WAIT_LCHAN_ACTIVE = { .T = 10 }, + ASSIGNMENT_ST_WAIT_RR_ASS_COMPLETE = { .keep_timer = true }, + ASSIGNMENT_ST_WAIT_LCHAN_ESTABLISHED = { .keep_timer = true }, + ASSIGNMENT_ST_WAIT_MGW_ENDPOINT_TO_MSC = { .T = 23042 }, }; /* Transition to a state, using the T timer defined in assignment_fsm_timeouts.
View file
osmo-bsc_1.9.0.91.27cb5.202211230002.tar.xz/src/osmo-bsc/bts.c -> osmo-bsc_1.9.0.97.94951.202211240002.tar.xz/src/osmo-bsc/bts.c
Changed
@@ -1042,7 +1042,9 @@ osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_SDCCH8_CBCH_TOTAL), 0); osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_OSMO_DYN_USED), 0); osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_OSMO_DYN_TOTAL), 0); - osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_T3113), 0); + osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_T3113), 0); + osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_REQ_QUEUE_LENGTH), paging_pending_requests_nr(bts)); + osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_AVAILABLE_SLOTS), bts->paging.available_slots); } const struct rate_ctr_desc bts_ctr_description = { @@ -1694,8 +1696,16 @@ { "num_trx:total", "Number of configured TRX in this BTS", "" }, - BTS_STAT_T3113 = \ - { "t3113", + BTS_STAT_PAGING_REQ_QUEUE_LENGTH = \ + { "paging:request_queue_length", + "Paging Request queue length", + "", 60, 0 }, + BTS_STAT_PAGING_AVAILABLE_SLOTS = \ + { "paging:available_slots", + "Available paging slots in this BTS", + "", 60, 0 }, + BTS_STAT_PAGING_T3113 = \ + { "paging:t3113", "T3113 paging timer", "s", 60, 0 }, };
View file
osmo-bsc_1.9.0.91.27cb5.202211230002.tar.xz/src/osmo-bsc/lchan_fsm.c -> osmo-bsc_1.9.0.97.94951.202211240002.tar.xz/src/osmo-bsc/lchan_fsm.c
Changed
@@ -282,15 +282,15 @@ } struct osmo_tdef_state_timeout lchan_fsm_timeouts32 = { - LCHAN_ST_WAIT_TS_READY = { .T=-5 }, - LCHAN_ST_WAIT_ACTIV_ACK = { .T=-6 }, - LCHAN_ST_WAIT_RLL_RTP_ESTABLISH = { .T=3101 }, - LCHAN_ST_WAIT_RLL_RTP_RELEASED = { .T=3109 }, - LCHAN_ST_WAIT_BEFORE_RF_RELEASE = { .T=3111 }, - LCHAN_ST_WAIT_RF_RELEASE_ACK = { .T=3111 }, - LCHAN_ST_WAIT_AFTER_ERROR = { .T=-3111 }, - LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK = { .T=-13 }, - LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK = { .T=-14 }, + LCHAN_ST_WAIT_TS_READY = { .T = -5 }, + LCHAN_ST_WAIT_ACTIV_ACK = { .T = -6 }, + LCHAN_ST_WAIT_RLL_RTP_ESTABLISH = { .T = 3101 }, + LCHAN_ST_WAIT_RLL_RTP_RELEASED = { .T = 3109 }, + LCHAN_ST_WAIT_BEFORE_RF_RELEASE = { .T = 3111 }, + LCHAN_ST_WAIT_RF_RELEASE_ACK = { .T = 3111 }, + LCHAN_ST_WAIT_AFTER_ERROR = { .T = -3111 }, + LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK = { .T = -13 }, + LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK = { .T = -14 }, }; /* Transition to a state, using the T timer defined in lchan_fsm_timeouts. @@ -324,7 +324,7 @@ } while (0) /* Which state to transition to when lchan_fail() is called in a given state. */ -uint32_t lchan_fsm_on_error34 = { +uint32_t lchan_fsm_on_error32 = { LCHAN_ST_UNUSED = LCHAN_ST_UNUSED, LCHAN_ST_WAIT_TS_READY = LCHAN_ST_UNUSED, LCHAN_ST_WAIT_ACTIV_ACK = LCHAN_ST_BORKEN, @@ -1530,16 +1530,6 @@ lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); lchan_fsm_state_chg(LCHAN_ST_WAIT_AFTER_ERROR); - /* TODO: we used to do this only for sysmobts: - int do_free = is_osmobts(ts->trx->bts); - LOGP(DRSL, LOGL_NOTICE, - "%s CHAN REL ACK for broken channel. %s.\n", - gsm_lchan_name(lchan), - do_free ? "Releasing it" : "Keeping it broken"); - if (do_free) - do_lchan_free(lchan); - * Clarify the reason. If a BTS sends a RF Chan Rel ACK, we can consider it released, - * independently from the BTS model, right?? */ return; case LCHAN_EV_RTP_RELEASED:
View file
osmo-bsc_1.9.0.91.27cb5.202211230002.tar.xz/src/osmo-bsc/lchan_rtp_fsm.c -> osmo-bsc_1.9.0.97.94951.202211240002.tar.xz/src/osmo-bsc/lchan_rtp_fsm.c
Changed
@@ -44,10 +44,10 @@ } struct osmo_tdef_state_timeout lchan_rtp_fsm_timeouts32 = { - LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_AVAILABLE = { .T=-9 }, - LCHAN_RTP_ST_WAIT_IPACC_CRCX_ACK = { .T=-7 }, - LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK = { .T=-8 }, - LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_CONFIGURED = { .T=-10 }, + LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_AVAILABLE = { .T = -9 }, + LCHAN_RTP_ST_WAIT_IPACC_CRCX_ACK = { .T = -7 }, + LCHAN_RTP_ST_WAIT_IPACC_MDCX_ACK = { .T = -8 }, + LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_CONFIGURED = { .T = -10 }, }; /* Transition to a state, using the T timer defined in lchan_rtp_fsm_timeouts.
View file
osmo-bsc_1.9.0.91.27cb5.202211230002.tar.xz/src/osmo-bsc/net_init.c -> osmo-bsc_1.9.0.97.94951.202211240002.tar.xz/src/osmo-bsc/net_init.c
Changed
@@ -28,36 +28,36 @@ #include <osmocom/bsc/bts_setup_ramp.h> static struct osmo_tdef gsm_network_T_defs = { - { .T=4, .default_val=5, .desc="Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC" }, - { .T=7, .default_val=10, .desc="inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout" }, - { .T=8, .default_val=10, .desc="inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout" }, - { .T=10, .default_val=6, .desc="RR Assignment" }, - { .T=101, .default_val=10, .desc="inter-BSC/MSC Handover incoming, BSSMAP HO Request to HO Accept" }, - { .T=3101, .default_val=3, .desc="RR Immediate Assignment" }, - { .T=3103, .default_val=5, .desc="Handover" }, - { .T=3105, .default_val=100, .unit=OSMO_TDEF_MS, .desc="Physical Information" }, - { .T=3107, .default_val=5, .desc="(unused)" }, - { .T=3109, .default_val=5, .desc="RSL SACCH deactivation" }, - { .T=3111, .default_val=2, .desc="Wait time before RSL RF Channel Release" }, - { .T=3113, .default_val=7, .desc="Paging"}, - { .T=3115, .default_val=10, .desc="(unused)" }, - { .T=3117, .default_val=10, .desc="(unused)" }, - { .T=3119, .default_val=10, .desc="(unused)" }, - { .T=3122, .default_val=GSM_T3122_DEFAULT, .desc="Wait time after RR Immediate Assignment Reject" }, - { .T=3141, .default_val=10, .desc="(unused)" }, - { .T=3212, .default_val=5, .unit=OSMO_TDEF_CUSTOM, - .desc="Periodic Location Update timer, sent to MS (1 = 6 minutes)" }, - { .T=-4, .default_val=60, .desc="After Clear Request, wait for MSC to Clear Command (sanity)" }, - { .T=-5, .default_val=5, .desc="Timeout to switch dynamic timeslot PCHAN modes"}, - { .T=-6, .default_val=5, .desc="Timeout for RSL Channel Activate ACK after sending RSL Channel Activate" }, - { .T=-7, .default_val=5, .desc="Timeout for RSL IPA CRCX ACK after sending RSL IPA CRCX" }, - { .T=-8, .default_val=5, .desc="Timeout for RSL IPA MDCX ACK after sending RSL IPA MDCX" }, - { .T=-9, .default_val=5, .desc="Timeout for availability of MGW endpoint" }, - { .T=-10, .default_val=5, .desc="Timeout for fully configured MGW endpoint" }, - { .T=-11, .default_val=5, .desc="Timeout for Perform Location Response from SMLC" }, - { .T=-12, .default_val=5, .desc="Timeout for obtaining TA after BSSLAP TA Request" }, - { .T=-13, .default_val=5, .desc="Timeout for RR Channel Mode Modify ACK (BSC <-> MS)" }, - { .T=-14, .default_val=5, .desc="Timeout for RSL Channel Mode Modify ACK (BSC <-> BTS)" }, + { .T = 4, .default_val = 5, .desc = "Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC" }, + { .T = 7, .default_val = 10, .desc = "inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout" }, + { .T = 8, .default_val = 10, .desc = "inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout" }, + { .T = 10, .default_val = 6, .desc = "RR Assignment" }, + { .T = 101, .default_val = 10, .desc = "inter-BSC/MSC Handover incoming, BSSMAP HO Request to HO Accept" }, + { .T = 3101, .default_val = 3, .desc = "RR Immediate Assignment" }, + { .T = 3103, .default_val = 5, .desc = "Handover" }, + { .T = 3105, .default_val = 100, .unit = OSMO_TDEF_MS, .desc = "Physical Information" }, + { .T = 3107, .default_val = 5, .desc = "(unused)" }, + { .T = 3109, .default_val = 5, .desc = "RSL SACCH deactivation" }, + { .T = 3111, .default_val = 2, .desc = "Wait time before RSL RF Channel Release" }, + { .T = 3113, .default_val = 7, .desc = "Paging"}, + { .T = 3115, .default_val = 10, .desc = "(unused)" }, + { .T = 3117, .default_val = 10, .desc = "(unused)" }, + { .T = 3119, .default_val = 10, .desc = "(unused)" }, + { .T = 3122, .default_val = GSM_T3122_DEFAULT, .desc = "Wait time after RR Immediate Assignment Reject" }, + { .T = 3141, .default_val = 10, .desc = "(unused)" }, + { .T = 3212, .default_val = 5, .unit = OSMO_TDEF_CUSTOM, + .desc = "Periodic Location Update timer, sent to MS (1 = 6 minutes)" }, + { .T = -4, .default_val = 60, .desc = "After Clear Request, wait for MSC to Clear Command (sanity)" }, + { .T = -5, .default_val = 5, .desc = "Timeout to switch dynamic timeslot PCHAN modes"}, + { .T = -6, .default_val = 5, .desc = "Timeout for RSL Channel Activate ACK after sending RSL Channel Activate" }, + { .T = -7, .default_val = 5, .desc = "Timeout for RSL IPA CRCX ACK after sending RSL IPA CRCX" }, + { .T = -8, .default_val = 5, .desc = "Timeout for RSL IPA MDCX ACK after sending RSL IPA MDCX" }, + { .T = -9, .default_val = 5, .desc = "Timeout for availability of MGW endpoint" }, + { .T = -10, .default_val = 5, .desc = "Timeout for fully configured MGW endpoint" }, + { .T = -11, .default_val = 5, .desc = "Timeout for Perform Location Response from SMLC" }, + { .T = -12, .default_val = 5, .desc = "Timeout for obtaining TA after BSSLAP TA Request" }, + { .T = -13, .default_val = 5, .desc = "Timeout for RR Channel Mode Modify ACK (BSC <-> MS)" }, + { .T = -14, .default_val = 5, .desc = "Timeout for RSL Channel Mode Modify ACK (BSC <-> BTS)" }, { .T = -16, .default_val = 1000, .unit = OSMO_TDEF_MS, .desc = "Granularity for all_allocated:* rate counters: amount of milliseconds that one counter increment" " represents. See also X17, X18" }, @@ -72,14 +72,14 @@ .desc = "Forget-sum period for all_allocated:* rate counters:" " after this amount of idle time, forget internally cumulated time remainders. Zero to always" " keep remainders. See also X16, X17." }, - { .T=-25, .default_val=5, .desc="Timeout for initial user data after an MSC initiated an SCCP connection to the BSS" }, - { .T=-3111, .default_val=4, .desc="Wait time after lchan was released in error (should be T3111 + 2s)" }, - { .T=-3210, .default_val=20, .desc="After L3 Complete, wait for MSC to confirm" }, + { .T = -25, .default_val = 5, .desc = "Timeout for initial user data after an MSC initiated an SCCP connection to the BSS" }, + { .T = -3111, .default_val = 4, .desc = "Wait time after lchan was released in error (should be T3111 + 2s)" }, + { .T = -3210, .default_val = 20, .desc = "After L3 Complete, wait for MSC to confirm" }, {} }; struct osmo_tdef g_mgw_tdefs = { - { .T=-2427, .default_val=5, .desc="timeout for MGCP response from MGW" }, + { .T = -2427, .default_val = 5, .desc = "timeout for MGCP response from MGW" }, {} };
View file
osmo-bsc_1.9.0.91.27cb5.202211230002.tar.xz/src/osmo-bsc/paging.c -> osmo-bsc_1.9.0.97.94951.202211240002.tar.xz/src/osmo-bsc/paging.c
Changed
@@ -89,6 +89,7 @@ osmo_timer_del(&to_be_deleted->T3113); llist_del(&to_be_deleted->entry); paging_bts->pending_requests_len--; + osmo_stat_item_dec(osmo_stat_item_group_get_item(to_be_deleted->bts->bts_statg, BTS_STAT_PAGING_REQ_QUEUE_LENGTH), 1); bsc_subscr_remove_active_paging_request(to_be_deleted->bsub, to_be_deleted); talloc_free(to_be_deleted); if (llist_empty(&paging_bts->pending_requests)) @@ -135,6 +136,13 @@ paging_handle_pending_requests(paging_bts); } +/* Placeholder to set the value and update the related osmo_stat: */ +static void paging_set_available_slots(struct gsm_bts *bts, uint16_t available_slots) +{ + bts->paging.available_slots = available_slots; + osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_AVAILABLE_SLOTS), available_slots); +} + static void paging_give_credit(void *data) { struct gsm_bts_paging_state *paging_bts_st = data; @@ -144,7 +152,7 @@ LOG_BTS(bts, DPAG, LOGL_INFO, "Timeout waiting for CCCH Load Indication, assuming BTS is below Load Threshold (available_slots %u -> %u)\n", paging_bts_st->available_slots, estimated_slots); - paging_bts_st->available_slots = estimated_slots; + paging_set_available_slots(bts, estimated_slots); paging_schedule_if_needed(paging_bts_st); osmo_timer_schedule(&bts->paging.credit_timer, load_ind_timeout, 0); } @@ -270,7 +278,7 @@ /* handle the paging request now */ page_ms(request); - paging_bts->available_slots--; + paging_set_available_slots(bts, paging_bts->available_slots - 1); request->last_attempt_ts = now; request->attempts++; num_paged++; @@ -302,7 +310,7 @@ { bts->paging.bts = bts; bts->paging.free_chans_need = -1; - bts->paging.available_slots = 0; + paging_set_available_slots(bts, 0); INIT_LLIST_HEAD(&bts->paging.pending_requests); osmo_timer_setup(&bts->paging.work_timer, paging_worker, &bts->paging); osmo_timer_setup(&bts->paging.credit_timer, paging_give_credit, &bts->paging); @@ -388,7 +396,7 @@ "Paging request: T3113 expires in %u seconds (estimated %u)\n", to, estimated_to); ret: - osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_T3113), to); + osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_T3113), to); return to; } @@ -466,6 +474,7 @@ bsc_subscr_add_active_paging_request(req->bsub, req); bts_entry->pending_requests_len++; + osmo_stat_item_inc(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_PAGING_REQ_QUEUE_LENGTH), 1); /* there's no initial req (attempts==0), add to the start of the list */ if (last_initial_req == NULL) llist_add(&req->entry, &bts_entry->pending_requests); @@ -607,7 +616,7 @@ { LOG_BTS(bts, DPAG, LOGL_DEBUG, "Rx CCCH Load Indication from BTS (available_slots %u -> %u)\n", bts->paging.available_slots, free_slots); - bts->paging.available_slots = free_slots; + paging_set_available_slots(bts, free_slots); /* Re-arm credit_timer if needed */ if (trx_is_usable(bts->c0)) { paging_schedule_if_needed(&bts->paging); @@ -700,6 +709,7 @@ struct gsm_bts *bts; struct gsm_bts_trx *trx; unsigned int load_ind_timeout; + uint16_t estimated_slots; if (signal != S_NM_RUNNING_CHG) return 0; @@ -727,7 +737,8 @@ LOG_BTS(bts, DPAG, LOGL_INFO, "C0 becomes available for paging\n"); /* Fill in initial credit */ load_ind_timeout = bts_no_ccch_load_ind_timeout_sec(bts); - bts->paging.available_slots = paging_estimate_available_slots(bts, load_ind_timeout); + estimated_slots = paging_estimate_available_slots(bts, load_ind_timeout); + paging_set_available_slots(bts, estimated_slots); /* Start scheduling credit_timer */ osmo_timer_schedule(&bts->paging.credit_timer, bts_no_ccch_load_ind_timeout_sec(bts), 0);
View file
osmo-bsc_1.9.0.91.27cb5.202211230002.tar.xz/tests/nanobts_omlattr/nanobts_omlattr_test.c -> osmo-bsc_1.9.0.97.94951.202211240002.tar.xz/tests/nanobts_omlattr/nanobts_omlattr_test.c
Changed
@@ -125,9 +125,9 @@ }; static struct osmo_tdef gsm_network_T_defs = { - { .T=3105, .default_val=100, .val=13, .unit=OSMO_TDEF_MS, .desc="Physical Information" }, - { .T=3212, .default_val=5, .unit=OSMO_TDEF_CUSTOM, - .desc="Periodic Location Update timer, sent to MS (1 = 6 minutes)" }, + { .T = 3105, .default_val = 100, .val = 13, .unit = OSMO_TDEF_MS, .desc = "Physical Information" }, + { .T = 3212, .default_val = 5, .unit = OSMO_TDEF_CUSTOM, + .desc = "Periodic Location Update timer, sent to MS (1 = 6 minutes)" }, {} };
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
.