@@ -14,13 +14,13 @@

 Name:           libosmocore

 Requires: osmocom-master

-Version: 1.8.0.134.a9c2

+Version: 1.8.0.137.57a3

 Release:        0

 Summary:        The Open Source Mobile Communications Core Library

 License:        GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND AGPL-3.0-or-later

 Group:          Productivity/Telephony/Utilities

 Url:            https://osmocom.org/projects/libosmocore/wiki/Libosmocore

-Source: libosmocore_1.8.0.134.a9c2.tar.xz

+Source: libosmocore_1.8.0.137.57a3.tar.xz

 Source1: rpmlintrc

 BuildRequires:  automake >= 1.6

 BuildRequires:  libtool >= 2

​

@@ -2,7 +2,7 @@

 Source: libosmocore

 Binary: libosmocore, libosmocodec0, libosmocodec-doc, libosmocoding0, libosmocoding-doc, libosmocore20, libosmocore-doc, libosmogb14, libosmogb-doc, libosmogsm18, libosmogsm-doc, libosmoisdn0, libosmoisdn-doc, libosmovty9, libosmovty-doc, libosmoctrl0, libosmoctrl-doc, libosmosim2, libosmosim-doc, libosmousb0, libosmousb-doc, libosmocore-dev, libosmocore-utils, libosmocore-dbg

 Architecture: any all

-Version: 1.8.0.134.a9c2

+Version: 1.8.0.137.57a3

 Maintainer: Osmocom team <openbsc@lists.osmocom.org>

 Homepage: https://projects.osmocom.org/projects/libosmocore

 Standards-Version: 3.9.8

@@ -35,8 +35,8 @@

  libosmovty-doc deb doc optional arch=all

  libosmovty9 deb libs optional arch=any

 Checksums-Sha1:

- 002ef495ace602278818e827149379848e0b274f 1043768 libosmocore_1.8.0.134.a9c2.tar.xz

+ 0c34858e2c5d17ed726543f4cf51b0d341e67e1c 1043904 libosmocore_1.8.0.137.57a3.tar.xz

 Checksums-Sha256:

- 1d915eb1d25afade3adb0e918204ee482e6a5051bf3a399a3782925257448065 1043768 libosmocore_1.8.0.134.a9c2.tar.xz

+ 88ac3acd213f551a2e18703c783f5c5dad8fcffcddd8011922684e43a0f76919 1043904 libosmocore_1.8.0.137.57a3.tar.xz

 Files:

- 212a8adba0bebdc8351768ce05ed769e 1043768 libosmocore_1.8.0.134.a9c2.tar.xz

+ 39d5ea0678452b136c02c1cc6dbf362f 1043904 libosmocore_1.8.0.137.57a3.tar.xz

​

@@ -1 +1 @@

-1.8.0.134-a9c2

+1.8.0.137-57a3

​

@@ -11,3 +11,5 @@

 libosmocore ADD     new defines in osmocom/gsm/protocol/gsm_04_08.h (old ones marked deprecated)

 libosmovty drop API        drop struct vty_parent_node from public API, it should never have been public

 libosmocore ADD     new API osmo_io_*()

+libosmocoding  ADD new gsm0503_tch_hr_decode2() public API, previous API

+           gsm0503_tch_hr_decode() marked as deprecated

​

@@ -1,8 +1,8 @@

-libosmocore (1.8.0.134.a9c2) unstable; urgency=medium

+libosmocore (1.8.0.137.57a3) unstable; urgency=medium

   * Automatically generated changelog entry for building the Osmocom master feed

- -- Osmocom OBS scripts <info@osmocom.org>  Mon, 22 May 2023 15:42:17 +0000

+ -- Osmocom OBS scripts <info@osmocom.org>  Tue, 23 May 2023 18:09:31 +0000

 libosmocore (1.8.0) unstable; urgency=medium

​

@@ -50,6 +50,9 @@

 int gsm0503_tch_hr_encode(ubit_t *bursts, const uint8_t *tch_data, int len);

 int gsm0503_tch_hr_decode(uint8_t *tch_data, const sbit_t *bursts, int odd,

+   int *n_errors, int *n_bits_total)

+   OSMO_DEPRECATED("Use gsm0503_tch_hr_decode2() instead");

+int gsm0503_tch_hr_decode2(uint8_t *tch_data, const sbit_t *bursts, int odd,

    int *n_errors, int *n_bits_total);

 int gsm0503_tch_afs_encode(ubit_t *bursts, const uint8_t *tch_data, int len,

​

@@ -1572,24 +1572,22 @@

    }

 }

-/* assemble a HR codec frame in format as used inside RTP */

+/* assemble a HR codec frame in the canonical format of ETSI TS 101 318 */

 static void tch_hr_reassemble(uint8_t *tch_data, const ubit_t *b_bits)

 {

-   int i, j;

-

-   tch_data0 = 0x00; /* F = 0, FT = 000 */

-   memset(tch_data + 1, 0, 14);

+   int i;

-   for (i = 0, j = 8; i < 112; i++, j++)

-       tch_dataj >> 3 |= (b_bitsi << (7 - (j & 7)));

+   memset(tch_data, 0, GSM_HR_BYTES);

+   for (i = 0; i < 112; i++)

+       tch_datai >> 3 |= (b_bitsi << (7 - (i & 7)));

 }

 static void tch_hr_disassemble(ubit_t *b_bits, const uint8_t *tch_data)

 {

-   int i, j;

+   int i;

-   for (i = 0, j = 8; i < 112; i++, j++)

-       b_bitsi = (tch_dataj >> 3 >> (7 - (j & 7))) & 1;

+   for (i = 0; i < 112; i++)

+       b_bitsi = (tch_datai >> 3 >> (7 - (i & 7))) & 1;

 }

 /* assemble a EFR codec frame in format as used inside RTP */

@@ -1977,13 +1975,13 @@

 }

 /*! Perform channel decoding of a HR(v1) channel according TS 05.03

- *  \paramout tch_data Codec frame in RTP payload format

+ *  \paramout tch_data Codec frame in TS 101 318 canonical format

  *  \paramin bursts buffer containing the symbols of 8 bursts

  *  \paramin odd Odd (1) or even (0) frame number

  *  \paramout n_errors Number of detected bit errors

  *  \paramout n_bits_total Total number of bits

  *  \returns length of bytes used in \a tch_data output buffer; negative on error */

-int gsm0503_tch_hr_decode(uint8_t *tch_data, const sbit_t *bursts, int odd,

+int gsm0503_tch_hr_decode2(uint8_t *tch_data, const sbit_t *bursts, int odd,

    int *n_errors, int *n_bits_total)

 {

    sbit_t iB912, cB456, h;

@@ -1997,7 +1995,7 @@

            steal -= h;

        }

-       for (i = 2; i < 5; i++) {

+       for (i = 2; i < 6; i++) {

            gsm0503_tch_burst_unmap(NULL, &burstsi * 116, &h, 1);

            steal -= h;

        }

@@ -2050,7 +2048,35 @@

    tch_hr_reassemble(tch_data, b);

-   return 15;

+   return GSM_HR_BYTES;

+}

+

+/*! Perform channel decoding of a HR(v1) channel according TS 05.03,

+ *  deprecated legacy API.

+ *  \paramout tch_data Codec frame in pseudo-RFC5993 format

+ *  \paramin bursts buffer containing the symbols of 8 bursts

+ *  \paramin odd Odd (1) or even (0) frame number

+ *  \paramout n_errors Number of detected bit errors

+ *  \paramout n_bits_total Total number of bits

+ *  \returns length of bytes used in \a tch_data output buffer; negative on error

+ *

+ *  The HR1 codec frame format returned by this function is pseudo-RFC5993,

+ *  not true RFC 5993, as there is no SID classification being done

+ *  and the FT bits in the ToC octet are always set to 0 - but this

+ *  arguably-bogus format is the legacy public API.

+ */

+int gsm0503_tch_hr_decode(uint8_t *tch_data, const sbit_t *bursts, int odd,

+   int *n_errors, int *n_bits_total)

+{

+   int rc;

+

+   rc = gsm0503_tch_hr_decode2(tch_data, bursts, odd, n_errors,

+                   n_bits_total);

+   if (rc != GSM_HR_BYTES)

+       return rc;

+   memmove(tch_data + 1, tch_data, GSM_HR_BYTES);

+   tch_data0 = 0x00;   /* FT=0, note absence of SID classification */

+   return GSM_HR_BYTES_RTP_RFC5993;

 }

 /*! Perform channel encoding on a TCH/HS channel according to TS 05.03

@@ -2065,7 +2091,10 @@

    int i;

    switch (len) {

-   case 15: /* TCH HR */

+   case GSM_HR_BYTES_RTP_RFC5993:  /* TCH HR with RFC 5993 prefix */

+       tch_data++;

+       /* fall-through */

+   case GSM_HR_BYTES:  /* TCH HR in "pure" form */

        tch_hr_disassemble(b, tch_data);

        tch_hr_b_to_d(d, b);

@@ -2086,7 +2115,6 @@

            gsm0503_tch_burst_map(&iBi * 114,

                &burstsi * 116, &h, i >> 1);

        }

-

        break;

    case GSM_MACBLOCK_LEN: /* FACCH */

        _xcch_encode_cB(cB, tch_data);

@@ -2104,7 +2132,6 @@

            gsm0503_tch_burst_map(&iBi * 114 + 456,

                &burstsi * 116, &h, 1);

        }

-

        break;

    default:

        return -1;

​