Projects
osmocom:nightly
osmo-bsc
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 261
View file
osmo-bsc.spec
Changed
@@ -17,14 +17,14 @@ %define _lto_cflags %{nil} Name: osmo-bsc -Requires: osmocom-nightly = 202303080004 -Version: 1.10.0.74.6d3da.202303080004 +Requires: osmocom-nightly = 202303090006 +Version: 1.10.0.75.2689a.202303090006 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.74.6d3da.202303080004.tar.xz +Source: osmo-bsc_1.10.0.75.2689a.202303090006.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 = 202303080004 +Requires: osmocom-nightly = 202303090006 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 = 202303080004 +Requires: osmocom-nightly = 202303090006 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 = 202303080004 +Requires: osmocom-nightly = 202303090006 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 = 202303080004 +Requires: osmocom-nightly = 202303090006 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.74.6d3da.202303080004.dsc -> osmo-bsc_1.10.0.75.2689a.202303090006.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.74.6d3da.202303080004 +Version: 1.10.0.75.2689a.202303090006 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: - 71d1fc8a15d4e7eab36c4c144dd3f8d7db288ade 594120 osmo-bsc_1.10.0.74.6d3da.202303080004.tar.xz + 1c5f9c584d1fe66ae2386a0a938c7775cc169b4c 594540 osmo-bsc_1.10.0.75.2689a.202303090006.tar.xz Checksums-Sha256: - 1e4ff35fa01d9c10d1a564b757a69ed666214486d62c92508551c3c4223f13b7 594120 osmo-bsc_1.10.0.74.6d3da.202303080004.tar.xz + aada62ed806352973a703b6acd61ebd821729cdc55f619c47fe5dacbec0747ce 594540 osmo-bsc_1.10.0.75.2689a.202303090006.tar.xz Files: - 09334ece703698fb5acaf09654913f2c 594120 osmo-bsc_1.10.0.74.6d3da.202303080004.tar.xz + 3e5214ba3b37a1f924b4547546111437 594540 osmo-bsc_1.10.0.75.2689a.202303090006.tar.xz
View file
osmo-bsc_1.10.0.74.6d3da.202303080004.tar.xz/.tarball-version -> osmo-bsc_1.10.0.75.2689a.202303090006.tar.xz/.tarball-version
Changed
@@ -1 +1 @@ -1.10.0.74-6d3da.202303080004 +1.10.0.75-2689a.202303090006
View file
osmo-bsc_1.10.0.74.6d3da.202303080004.tar.xz/contrib/osmo-bsc.spec.in -> osmo-bsc_1.10.0.75.2689a.202303090006.tar.xz/contrib/osmo-bsc.spec.in
Changed
@@ -17,7 +17,7 @@ %define _lto_cflags %{nil} Name: osmo-bsc -Requires: osmocom-nightly = 202303080004 +Requires: osmocom-nightly = 202303090006 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 = 202303080004 +Requires: osmocom-nightly = 202303090006 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 = 202303080004 +Requires: osmocom-nightly = 202303090006 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 = 202303080004 +Requires: osmocom-nightly = 202303090006 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 = 202303080004 +Requires: osmocom-nightly = 202303090006 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.74.6d3da.202303080004.tar.xz/debian/changelog -> osmo-bsc_1.10.0.75.2689a.202303090006.tar.xz/debian/changelog
Changed
@@ -1,8 +1,8 @@ -osmo-bsc (1.10.0.74.6d3da.202303080004) unstable; urgency=medium +osmo-bsc (1.10.0.75.2689a.202303090006) unstable; urgency=medium * Automatically generated changelog entry for building the Osmocom nightly feed - -- Osmocom OBS scripts <info@osmocom.org> Wed, 08 Mar 2023 00:04:41 +0000 + -- Osmocom OBS scripts <info@osmocom.org> Thu, 09 Mar 2023 00:06:51 +0000 osmo-bsc (1.10.0) unstable; urgency=medium
View file
osmo-bsc_1.10.0.74.6d3da.202303080004.tar.xz/debian/control -> osmo-bsc_1.10.0.75.2689a.202303090006.tar.xz/debian/control
Changed
@@ -26,7 +26,7 @@ Package: osmo-bsc Architecture: any Multi-Arch: foreign -Depends: osmocom-nightly (= 202303080004), ${misc:Depends}, ${shlibs:Depends} +Depends: osmocom-nightly (= 202303090006), ${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 (= 202303080004), osmo-bsc (= ${binary:Version}), ${misc:Depends} +Depends: osmocom-nightly (= 202303090006), 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 (= 202303080004), ${misc:Depends}, ${shlibs:Depends} +Depends: osmocom-nightly (= 202303090006), ${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 (= 202303080004), ${misc:Depends}, ${shlibs:Depends} +Depends: osmocom-nightly (= 202303090006), ${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 (= 202303080004), ${misc:Depends}, ${shlibs:Depends} +Depends: osmocom-nightly (= 202303090006), ${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 (= 202303080004), ${misc:Depends}, ${shlibs:Depends} +Depends: osmocom-nightly (= 202303090006), ${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 (= 202303080004), ${misc:Depends} +Depends: osmocom-nightly (= 202303090006), ${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.74.6d3da.202303080004.tar.xz/include/osmocom/bsc/abis_rsl.h -> osmo-bsc_1.10.0.75.2689a.202303090006.tar.xz/include/osmocom/bsc/abis_rsl.h
Changed
@@ -120,6 +120,11 @@ int rsl_forward_layer3_info(struct gsm_lchan *lchan, const uint8_t *l3_info, uint8_t l3_info_len); +int ipacc_rtp_csd_fmt_transp(const struct channel_mode_and_rate *ch_mode_rate, + const enum rsl_ipac_rtp_csd_format_d format_d); +int ipacc_rtp_csd_fmt_non_transp(const struct channel_mode_and_rate *ch_mode_rate, + const enum rsl_ipac_rtp_csd_format_d format_d); + int ipacc_speech_mode(enum gsm48_chan_mode tch_mode, enum gsm_chan_t type); void ipacc_speech_mode_set_direction(uint8_t *speech_mode, bool send); int ipacc_payload_type(enum gsm48_chan_mode tch_mode, enum gsm_chan_t type);
View file
osmo-bsc_1.10.0.74.6d3da.202303080004.tar.xz/include/osmocom/bsc/lchan.h -> osmo-bsc_1.10.0.75.2689a.202303090006.tar.xz/include/osmocom/bsc/lchan.h
Changed
@@ -286,6 +286,7 @@ uint16_t conn_id; uint8_t rtp_payload; uint8_t rtp_payload2; + uint8_t rtp_csd_fmt; uint8_t speech_mode; /* info we need to postpone the AoIP
View file
osmo-bsc_1.10.0.74.6d3da.202303080004.tar.xz/src/osmo-bsc/abis_rsl.c -> osmo-bsc_1.10.0.75.2689a.202303090006.tar.xz/src/osmo-bsc/abis_rsl.c
Changed
@@ -2582,6 +2582,65 @@ return rc; } +/* Return an ip.access RTP CSD FMT value (uint8_t) or negative on error. */ +int ipacc_rtp_csd_fmt_transp(const struct channel_mode_and_rate *ch_mode_rate, + const enum rsl_ipac_rtp_csd_format_d format_d) +{ + uint8_t ret = format_d; + + switch (ch_mode_rate->data_rate.t) { + case RSL_CMOD_CSD_T_32k0: + case RSL_CMOD_CSD_T_29k0: + ret |= RSL_IPAC_RTP_CSD_IR_32k << 5; + break; + case RSL_CMOD_CSD_T_14k4: + case RSL_CMOD_CSD_T_9k6: + ret |= RSL_IPAC_RTP_CSD_IR_16k << 5; + break; + case RSL_CMOD_CSD_T_4k8: + case RSL_CMOD_CSD_T_2k4: + case RSL_CMOD_CSD_T_1k2: + case RSL_CMOD_CSD_T_600: + case RSL_CMOD_CSD_T_1200_75: + ret |= RSL_IPAC_RTP_CSD_IR_8k << 5; + break; + default: + return -EINVAL; + } + + return ret; +} + +/* Return an ip.access RTP CSD FMT value (uint8_t) or negative on error. */ +int ipacc_rtp_csd_fmt_non_transp(const struct channel_mode_and_rate *ch_mode_rate, + const enum rsl_ipac_rtp_csd_format_d format_d) +{ + uint8_t ret = format_d; + + switch (ch_mode_rate->data_rate.nt) { + case RSL_CMOD_CSD_NTA_43k5_14k5: + case RSL_CMOD_CSD_NTA_43k5_29k0: + case RSL_CMOD_CSD_NTA_14k5_43k5: + case RSL_CMOD_CSD_NTA_29k0_43k5: + case RSL_CMOD_CSD_NT_43k5: + ret |= RSL_IPAC_RTP_CSD_IR_64k << 5; + case RSL_CMOD_CSD_NTA_29k0_14k5: + case RSL_CMOD_CSD_NTA_14k5_29k0: + case RSL_CMOD_CSD_NT_28k8: + ret |= RSL_IPAC_RTP_CSD_IR_32k << 5; + case RSL_CMOD_CSD_NT_14k5: + case RSL_CMOD_CSD_NT_12k0: + ret |= RSL_IPAC_RTP_CSD_IR_16k << 5; + case RSL_CMOD_CSD_NT_6k0: + ret |= RSL_IPAC_RTP_CSD_IR_8k << 5; + break; + default: + return -EINVAL; + } + + return ret; +} + /* Return an ip.access BTS speech mode value (uint8_t) or negative on error. */ int ipacc_speech_mode(enum gsm48_chan_mode tch_mode, enum gsm_chan_t type) { @@ -2755,9 +2814,11 @@ dh->chan_nr = chan_nr; if (lchan->current_ch_indctr == GSM0808_CHAN_DATA) { + msgb_tv_put(msg, RSL_IE_IPAC_RTP_CSD_FMT, lchan->abis_ip.rtp_csd_fmt); + LOG_LCHAN(lchan, LOGL_DEBUG, - "Sending IPACC CRCX to BTS: RTP_PAYLOAD=%d (CSD) osmux_use=%d osmux_loc_cid=%d\n", - lchan->abis_ip.rtp_payload, + "Sending IPACC CRCX to BTS: rtp_csd_fmt=0x%02x RTP_PAYLOAD=%d (CSD) osmux_use=%d osmux_loc_cid=%d\n", + lchan->abis_ip.rtp_csd_fmt, lchan->abis_ip.rtp_payload, lchan->abis_ip.osmux.use, lchan->abis_ip.osmux.local_cid); } else { /* 0x1- == receive-only, 0x-1 == EFR codec */ @@ -2806,8 +2867,12 @@ att_ip = (uint32_t *)msgb_put(msg, sizeof(uint32_t)); *att_ip = htonl(dest_ip); msgb_tv16_put(msg, RSL_IE_IPAC_REMOTE_PORT, dest_port); - if (lchan->current_ch_indctr == GSM0808_CHAN_SPEECH) + + if (lchan->current_ch_indctr == GSM0808_CHAN_DATA) + msgb_tv_put(msg, RSL_IE_IPAC_RTP_CSD_FMT, lchan->abis_ip.rtp_csd_fmt); + else msgb_tv_put(msg, RSL_IE_IPAC_SPEECH_MODE, lchan->abis_ip.speech_mode); + msgb_tv_put(msg, RSL_IE_IPAC_RTP_PAYLOAD, lchan->abis_ip.rtp_payload); if (lchan->abis_ip.rtp_payload2) msgb_tv_put(msg, RSL_IE_IPAC_RTP_PAYLOAD2, lchan->abis_ip.rtp_payload2); @@ -2832,12 +2897,13 @@ if (lchan->current_ch_indctr == GSM0808_CHAN_DATA) LOG_LCHAN(lchan, LOGL_DEBUG, "Sending IPACC MDCX to BTS:" - " %s:%u rtp_payload=%u (CSD) rtp_payload2=%u conn_id=%u\n", + " %s:%u rtp_payload=%u (CSD) rtp_payload2=%u conn_id=%u rtp_csd_fmt=0x%02x\n", ip_to_a(lchan->abis_ip.connect_ip), lchan->abis_ip.connect_port, lchan->abis_ip.rtp_payload, lchan->abis_ip.rtp_payload2, - lchan->abis_ip.conn_id); + lchan->abis_ip.conn_id, + lchan->abis_ip.rtp_csd_fmt); else LOG_LCHAN(lchan, LOGL_DEBUG, "Sending IPACC MDCX to BTS:" " %s:%u rtp_payload=%u rtp_payload2=%u conn_id=%u speech_mode=0x%02x\n",
View file
osmo-bsc_1.10.0.74.6d3da.202303080004.tar.xz/src/osmo-bsc/lchan_rtp_fsm.c -> osmo-bsc_1.10.0.75.2689a.202303090006.tar.xz/src/osmo-bsc/lchan_rtp_fsm.c
Changed
@@ -307,7 +307,26 @@ return; } - if (lchan->current_ch_indctr == GSM0808_CHAN_SPEECH) { + if (lchan->current_ch_indctr == GSM0808_CHAN_DATA) { + enum rsl_ipac_rtp_csd_format_d format_d = RSL_IPAC_RTP_CSD_TRAU_BTS; + + if (lchan->activate.ch_mode_rate.data_transparent) { + val = ipacc_rtp_csd_fmt_transp(&lchan->activate.ch_mode_rate, format_d); + if (val < 0) { + lchan_rtp_fail("Cannot determine Abis/IP RTP CSD format for rsl_cmod_csd_t=%d", + lchan->activate.ch_mode_rate.data_rate.t); + return; + } + } else { + val = ipacc_rtp_csd_fmt_non_transp(&lchan->activate.ch_mode_rate, format_d); + if (val < 0) { + lchan_rtp_fail("Cannot determine Abis/IP RTP CSD format for rsl_cmod_csd_nt=%d", + lchan->activate.ch_mode_rate.data_rate.nt); + return; + } + } + lchan->abis_ip.rtp_csd_fmt = val; + } else { val = ipacc_speech_mode(lchan->activate.ch_mode_rate.chan_mode, lchan->type); if (val < 0) { lchan_rtp_fail("Cannot determine Abis/IP speech mode for tch_mode=%s type=%s",
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
.