Osmocom Open Build Service

Changes of Revision 625

osmo-bsc.spec Changed

@@ -17,14 +17,14 @@
 %define _lto_cflags %{nil}
 
 Name:           osmo-bsc
-Requires: osmocom-nightly = 202403032026
-Version: 1.11.0.76.cc1ac.202403032026
+Requires: osmocom-nightly = 202403042026
+Version: 1.11.0.77.85687.202403042026
 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.11.0.76.cc1ac.202403032026.tar.xz
+Source: osmo-bsc_1.11.0.77.85687.202403042026.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 = 202403032026
+Requires: osmocom-nightly = 202403042026
 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 = 202403032026
+Requires: osmocom-nightly = 202403042026
 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 = 202403032026
+Requires: osmocom-nightly = 202403042026
 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 = 202403032026
+Requires: osmocom-nightly = 202403042026
 Summary:        Command line utilities for OsmoBSC's measurement reports
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities

osmo-bsc_1.11.0.76.cc1ac.202403032026.dsc -> osmo-bsc_1.11.0.77.85687.202403042026.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.11.0.76.cc1ac.202403032026
+Version: 1.11.0.77.85687.202403042026
 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:
- 0b0fa52f42044bd424b340dfa36487646a7d58a4 623908 osmo-bsc_1.11.0.76.cc1ac.202403032026.tar.xz
+ 335f79fc254e465d2af80c6e88b3b036713071b1 623760 osmo-bsc_1.11.0.77.85687.202403042026.tar.xz
 Checksums-Sha256:
- ce9d4891c634944428b25b61c0ca76d9e76f4c3de7b7f967f59b80d868e447f3 623908 osmo-bsc_1.11.0.76.cc1ac.202403032026.tar.xz
+ 5a600e88e49abf18afcd71f9e26a3cd594d5b643270136f6b4239bbf0f063d70 623760 osmo-bsc_1.11.0.77.85687.202403042026.tar.xz
 Files:
- 28c40a5ce37c42be13c787f198b4a70f 623908 osmo-bsc_1.11.0.76.cc1ac.202403032026.tar.xz
+ 4711141349ab9e92d9819a6d25e5f0da 623760 osmo-bsc_1.11.0.77.85687.202403042026.tar.xz

osmo-bsc_1.11.0.76.cc1ac.202403032026.tar.xz/.tarball-version -> osmo-bsc_1.11.0.77.85687.202403042026.tar.xz/.tarball-version Changed

osmo-bsc_1.11.0.76.cc1ac.202403032026.tar.xz/TODO-RELEASE -> osmo-bsc_1.11.0.77.85687.202403042026.tar.xz/TODO-RELEASE Changed

osmo-bsc_1.11.0.76.cc1ac.202403032026.tar.xz/contrib/osmo-bsc.spec.in -> osmo-bsc_1.11.0.77.85687.202403042026.tar.xz/contrib/osmo-bsc.spec.in Changed

@@ -17,7 +17,7 @@
 %define _lto_cflags %{nil}
 
 Name:           osmo-bsc
-Requires: osmocom-nightly = 202403032026
+Requires: osmocom-nightly = 202403042026
 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 = 202403032026
+Requires: osmocom-nightly = 202403042026
 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 = 202403032026
+Requires: osmocom-nightly = 202403042026
 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 = 202403032026
+Requires: osmocom-nightly = 202403042026
 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 = 202403032026
+Requires: osmocom-nightly = 202403042026
 Summary:        Command line utilities for OsmoBSC's measurement reports
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities

osmo-bsc_1.11.0.76.cc1ac.202403032026.tar.xz/debian/changelog -> osmo-bsc_1.11.0.77.85687.202403042026.tar.xz/debian/changelog Changed

osmo-bsc_1.11.0.76.cc1ac.202403032026.tar.xz/debian/control -> osmo-bsc_1.11.0.77.85687.202403042026.tar.xz/debian/control Changed

@@ -26,7 +26,7 @@
 Package: osmo-bsc
 Architecture: any
 Multi-Arch: foreign
-Depends: osmocom-nightly (= 202403032026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202403042026), ${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 (= 202403032026), osmo-bsc (= ${binary:Version}), ${misc:Depends}
+Depends: osmocom-nightly (= 202403042026), 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 (= 202403032026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202403042026), ${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 (= 202403032026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202403042026), ${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 (= 202403032026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202403042026), ${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 (= 202403032026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202403042026), ${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 (= 202403032026), ${misc:Depends}
+Depends: osmocom-nightly (= 202403042026), ${misc:Depends}
 Description: ${misc:Package} PDF documentation
  Various manuals: user manual, VTY reference manual and/or
  protocol/interface manuals.

osmo-bsc_1.11.0.76.cc1ac.202403032026.tar.xz/src/osmo-bsc/cbsp_link.c -> osmo-bsc_1.11.0.77.85687.202403042026.tar.xz/src/osmo-bsc/cbsp_link.c Changed

@@ -54,7 +54,6 @@
 static int cbsp_srv_closed_cb(struct osmo_stream_srv *conn)
 {
 	struct bsc_cbc_link *cbc = osmo_stream_srv_get_data(conn);
-	//struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn);
 
 	LOGP(DCBS, LOGL_NOTICE, "CBSP Server lost connection from %s\n", cbc->server.sock_name);
 	talloc_free(cbc->server.sock_name);
@@ -63,29 +62,11 @@
 	return 0;
 }
 
-static int cbsp_srv_cb(struct osmo_stream_srv *conn)
+static int cbsp_srv_read_cb(struct osmo_stream_srv *conn, struct msgb *msg)
 {
 	struct bsc_cbc_link *cbc = osmo_stream_srv_get_data(conn);
-	struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn);
 	struct osmo_cbsp_decoded *decoded;
-	struct msgb *msg;
-	int rc;
 
-	/* READ */
-	rc = osmo_cbsp_recv_buffered(cbc, ofd->fd, &msg, &cbc->server.msg);
-	if (rc <= 0) {
-		if (rc == -EAGAIN || rc == -EINTR) {
-			/* more data needs to be read */
-			return 0;
-		} else if (rc == -EPIPE || rc == -ECONNRESET) {
-			/* lost connection */
-		} else if (rc == 0) {
-			/* connection closed */
-		}
-		osmo_stream_srv_destroy(conn);
-		cbc->server.srv = NULL;
-		return -EBADF;
-	}
 	OSMO_ASSERT(msg);
 	decoded = osmo_cbsp_decode(conn, msg);
 	if (decoded) {
@@ -117,12 +98,15 @@
 		return -1;
 	}
 
-	srv = osmo_stream_srv_create(cbc, link, fd, cbsp_srv_cb, cbsp_srv_closed_cb, cbc);
+	srv = osmo_stream_srv_create2(cbc, link, fd, cbc);
 	if (!srv) {
 		LOGP(DCBS, LOGL_ERROR, "Unable to create stream server for %s\n",
 			osmo_sock_get_name2(fd));
 		return -1;
 	}
+	osmo_stream_srv_set_read_cb(srv, cbsp_srv_read_cb);
+	osmo_stream_srv_set_closed_cb(srv, cbsp_srv_closed_cb);
+	osmo_stream_srv_set_segmentation_cb(srv, osmo_cbsp_segmentation_cb);
 
 	cbc->server.srv = srv;
 	if (cbc->server.sock_name)
@@ -141,11 +125,10 @@
 static int cbsp_client_connect_cb(struct osmo_stream_cli *cli)
 {
 	struct bsc_cbc_link *cbc = osmo_stream_cli_get_data(cli);
-	struct osmo_fd *ofd = osmo_stream_cli_get_ofd(cli);
 
 	if (cbc->client.sock_name)
 		talloc_free(cbc->client.sock_name);
-	cbc->client.sock_name = osmo_sock_get_name(cbc, ofd->fd);
+	cbc->client.sock_name = osmo_sock_get_name(cbc, osmo_stream_cli_get_fd(cli));
 
 	LOGP(DCBS, LOGL_NOTICE, "CBSP Client connected to CBC: %s\n", cbc->client.sock_name);
 
@@ -165,28 +148,11 @@
 	return 0;
 }
 
-static int cbsp_client_read_cb(struct osmo_stream_cli *cli)
+static int cbsp_client_read_cb(struct osmo_stream_cli *cli, struct msgb *msg)
 {
 	struct bsc_cbc_link *cbc = osmo_stream_cli_get_data(cli);
-	struct osmo_fd *ofd = osmo_stream_cli_get_ofd(cli);
 	struct osmo_cbsp_decoded *decoded;
-	struct msgb *msg = NULL;
-	int rc;
 
-	/* READ */
-	rc = osmo_cbsp_recv_buffered(cbc, ofd->fd, &msg, &cbc->client.msg);
-	if (rc <= 0) {
-		if (rc == -EAGAIN || rc == -EINTR) {
-			/* more data needs to be read */
-			return 0;
-		} else if (rc == -EPIPE || rc == -ECONNRESET) {
-			/* lost connection */
-		} else if (rc == 0) {
-			/* connection closed */
-		}
-		osmo_stream_cli_reconnect(cli);
-		return -EBADF;
-	}
 	OSMO_ASSERT(msg);
 	decoded = osmo_cbsp_decode(cli, msg);
 	if (decoded) {
@@ -244,7 +210,8 @@
 			osmo_stream_cli_set_data(cbc->client.cli, cbc);
 			osmo_stream_cli_set_connect_cb(cbc->client.cli, cbsp_client_connect_cb);
 			osmo_stream_cli_set_disconnect_cb(cbc->client.cli, cbsp_client_disconnect_cb);
-			osmo_stream_cli_set_read_cb(cbc->client.cli, cbsp_client_read_cb);
+			osmo_stream_cli_set_read_cb2(cbc->client.cli, cbsp_client_read_cb);
+			osmo_stream_cli_set_segmentation_cb(cbc->client.cli, osmo_cbsp_segmentation_cb);
 		}
 		/* CBC side */
 		osmo_stream_cli_set_addr(cbc->client.cli, cbc->client.remote_addr.ip);