Osmocom Open Build Service

osmo-bsc.spec Changed

commit_85687bf176e4b9663f2396a27c28b49221c72fa3.txt Added

commit_cc1ac2167181391a61365bc662b9c100eedc3752.txt Deleted

osmo-bsc_1.11.0.76.cc1ac.dsc -> osmo-bsc_1.11.0.77.85687.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
+Version: 1.11.0.77.85687
 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:
- 5f8f2b51b1ce8884f93b2897bdbb9c6363323671 623816 osmo-bsc_1.11.0.76.cc1ac.tar.xz
+ 9053b949740ead3d53d658217d9aa9ef45b7e7b6 623756 osmo-bsc_1.11.0.77.85687.tar.xz
 Checksums-Sha256:
- fd34cc1cd921dd6f1bd910f4ac85586d3d75f2111a4cca4625ae43b15044abc5 623816 osmo-bsc_1.11.0.76.cc1ac.tar.xz
+ 3c8341cf9f6f9e460fe9b418001c45fc6825268003f2513e36361be45c23364a 623756 osmo-bsc_1.11.0.77.85687.tar.xz
 Files:
- f67e7216fba38f11c17de9e646e347ed 623816 osmo-bsc_1.11.0.76.cc1ac.tar.xz
+ 38a964605f88504ade96522c218158e4 623756 osmo-bsc_1.11.0.77.85687.tar.xz

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

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

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

osmo-bsc_1.11.0.76.cc1ac.tar.xz/src/osmo-bsc/cbsp_link.c -> osmo-bsc_1.11.0.77.85687.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);

Changes of Revision 233