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

 Name:           libosmocore

 Requires: osmocom-master

-Version: 1.9.0.12.9519

+Version: 1.9.0.13.1584

 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.9.0.12.9519.tar.xz

+Source: libosmocore_1.9.0.13.1584.tar.xz

 Source1: rpmlintrc

 BuildRequires:  automake >= 1.6

 BuildRequires:  libtool >= 2

​

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

 Source: libosmocore

 Binary: libosmocore, libosmocodec4, libosmocodec-doc, libosmocoding0, libosmocoding-doc, libosmocore21, libosmocore-doc, libosmogb14, libosmogb-doc, libosmogsm20, libosmogsm-doc, libosmoisdn0, libosmoisdn-doc, libosmovty13, libosmovty-doc, libosmoctrl0, libosmoctrl-doc, libosmosim2, libosmosim-doc, libosmousb0, libosmousb-doc, libosmocore-dev, libosmocore-utils, libosmocore-dbg

 Architecture: any all

-Version: 1.9.0.12.9519

+Version: 1.9.0.13.1584

 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

  libosmovty13 deb libs optional arch=any

 Checksums-Sha1:

- a42832452df90b5814b9e637009d54bbbbeec9c5 1074052 libosmocore_1.9.0.12.9519.tar.xz

+ f3c6214d83c815998e6124c26505f86f1153b4c9 1073440 libosmocore_1.9.0.13.1584.tar.xz

 Checksums-Sha256:

- 234e43c4f2198619b1aa59b9bfcede882820aba8f5d8c905d7bb15d11b744d3e 1074052 libosmocore_1.9.0.12.9519.tar.xz

+ a4709098ef2e28649ba481192c1b13c18c39bc2234e71b1f85535786b4e1acdd 1073440 libosmocore_1.9.0.13.1584.tar.xz

 Files:

- b6a8e2795cc024335997530f2310a68b 1074052 libosmocore_1.9.0.12.9519.tar.xz

+ cfbba6df92ab54ef6c997bf4ee79dd18 1073440 libosmocore_1.9.0.13.1584.tar.xz

​

@@ -1 +1 @@

-1.9.0.12-9519

+1.9.0.13-1584

​

@@ -7,4 +7,5 @@

 # If any interfaces have been added since the last public release: c:r:a + 1.

 # If any interfaces have been removed or changed since the last public release: c:r:0.

 #library   what            description / commit summary line

-core      ADD       osmo_sock_multiaddr_{add,del}_local_addr()

\ No newline at end of file

+core      ADD       osmo_sock_multiaddr_{add,del}_local_addr()

+core      ADD       gsmtap_inst_fd2() core, DEPRECATE gsmtap_inst_fd()

​

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

-libosmocore (1.9.0.12.9519) unstable; urgency=medium

+libosmocore (1.9.0.13.1584) unstable; urgency=medium

   * Automatically generated changelog entry for building the Osmocom master feed

- -- Osmocom OBS scripts <info@osmocom.org>  Thu, 05 Oct 2023 14:59:50 +0000

+ -- Osmocom OBS scripts <info@osmocom.org>  Mon, 16 Oct 2023 13:52:26 +0000

 libosmocore (1.9.0) unstable; urgency=medium

​

@@ -24,19 +24,12 @@

                int8_t snr, const uint8_t *data, unsigned int len);

 /*! one gsmtap instance */

-struct gsmtap_inst {

-   int ofd_wq_mode;    /*!< wait queue mode? */

-   struct osmo_wqueue wq;  /*!< the wait queue */

-   struct osmo_fd sink_ofd;/*!< file descriptor */

-};

+struct gsmtap_inst;

-/*! obtain the file descriptor associated with a gsmtap instance

- *  \paramin gti GSMTAP instance

- *  \returns file descriptor of GSMTAP instance */

-static inline int gsmtap_inst_fd(struct gsmtap_inst *gti)

-{

-   return gti->wq.bfd.fd;

-}

+int gsmtap_inst_fd(struct gsmtap_inst *gti)

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

+

+int gsmtap_inst_fd2(const struct gsmtap_inst *gti);

 int gsmtap_source_init_fd(const char *host, uint16_t port);

 int gsmtap_source_init_fd2(const char *local_host, uint16_t local_port, const char *rem_host, uint16_t rem_port);

​

@@ -46,6 +46,28 @@

  *

  * \file gsmtap_util.c */

+/*! one gsmtap instance */

+struct gsmtap_inst {

+   int ofd_wq_mode;    /*!< wait queue mode? This field member may not be changed or moved (backwards compatibility) */

+   struct osmo_wqueue wq;  /*!< the wait queue. This field member may not be changed or moved (backwards compatibility) */

+   struct osmo_fd sink_ofd; /*!< file descriptor */

+};

+

+/*! Deprecated, use gsmtap_inst_fd2() instead

+ *  \paramin gti GSMTAP instance

+ *  \returns file descriptor of GSMTAP instance */

+int gsmtap_inst_fd(struct gsmtap_inst *gti)

+{

+   return gsmtap_inst_fd2(gti);

+}

+

+/*! obtain the file descriptor associated with a gsmtap instance

+ *  \paramin gti GSMTAP instance

+ *  \returns file descriptor of GSMTAP instance */

+int gsmtap_inst_fd2(const struct gsmtap_inst *gti)

+{

+   return gti->wq.bfd.fd;

+}

 /*! convert RSL channel number to GSMTAP channel type

  *  \paramin rsl_chantype RSL channel type

@@ -330,7 +352,7 @@

        /* try immediate send and return error if any */

        int rc;

-       rc = write(gsmtap_inst_fd(gti), msg->data, msg->len);

+       rc = write(gsmtap_inst_fd2(gti), msg->data, msg->len);

        if (rc < 0) {

            return rc;

        } else if (rc >= msg->len) {

@@ -447,7 +469,7 @@

 {

    int fd, rc;

-   fd = gsmtap_source_add_sink_fd(gsmtap_inst_fd(gti));

+   fd = gsmtap_source_add_sink_fd(gsmtap_inst_fd2(gti));

    if (fd < 0)

        return fd;

​

@@ -39,6 +39,8 @@

 get_value_string;

 get_value_string_or_null;

 gsmtap_gsm_channel_names;

+gsmtap_inst_fd;

+gsmtap_inst_fd2;

 gsmtap_makemsg;

 gsmtap_makemsg_ex;

 gsmtap_send;

​