Osmocom Open Build Service

libosmocore.spec Changed

commit_2386e9a7e237fe98a8b675ea824368c658f8f1cc.txt Added

commit_435856be518c9d3531ae5b8cbadac1474d521f3a.txt Deleted

libosmocore_1.9.0.8.43585.dsc -> libosmocore_1.9.0.9.2386.dsc Changed

@@ -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.8.43585
+Version: 1.9.0.9.2386
 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:
- d632529595215b2e62222340c71e36ad85b23948 1072568 libosmocore_1.9.0.8.43585.tar.xz
+ f6f20322ff6dac895346362256ff49ea0b6e9bf7 1073148 libosmocore_1.9.0.9.2386.tar.xz
 Checksums-Sha256:
- 9bc84fe9fc5678c96e360fa53437e007d8d2b79882c266b66ca3e62db32d1755 1072568 libosmocore_1.9.0.8.43585.tar.xz
+ 84f09b178f8406afa8cd7d4e0f6e429d36c9278e16e7ad0001d6ba4c7aaa9b63 1073148 libosmocore_1.9.0.9.2386.tar.xz
 Files:
- 05613951a7914faf5df463a6b79f7d91 1072568 libosmocore_1.9.0.8.43585.tar.xz
+ 58ecb103c2a2f5784f4400d09b9f468f 1073148 libosmocore_1.9.0.9.2386.tar.xz

libosmocore_1.9.0.8.43585.tar.xz/.tarball-version -> libosmocore_1.9.0.9.2386.tar.xz/.tarball-version Changed

libosmocore_1.9.0.8.43585.tar.xz/debian/changelog -> libosmocore_1.9.0.9.2386.tar.xz/debian/changelog Changed

libosmocore_1.9.0.8.43585.tar.xz/src/core/osmo_io.c -> libosmocore_1.9.0.9.2386.tar.xz/src/core/osmo_io.c Changed

@@ -355,6 +355,12 @@
 int osmo_iofd_write_msgb(struct osmo_io_fd *iofd, struct msgb *msg)
 {
 	int rc;
+
+	if (OSMO_UNLIKELY(!iofd->io_ops.write_cb)) {
+		LOGPIO(iofd, LOGL_ERROR, "write_cb not set, Rejecting msgb\n");
+		return -EINVAL;
+	}
+
 	struct iofd_msghdr *msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_WRITE, msg);
 	if (!msghdr)
 		return -ENOMEM;
@@ -392,6 +398,10 @@
 	int rc;
 
 	OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_RECVFROM_SENDTO);
+	if (OSMO_UNLIKELY(!iofd->io_ops.sendto_cb)) {
+		LOGPIO(iofd, LOGL_ERROR, "sendto_cb not set, Rejecting msgb\n");
+		return -EINVAL;
+	}
 
 	struct iofd_msghdr *msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_SENDTO, msg);
 	if (!msghdr)
@@ -477,7 +487,8 @@
 		return rc;
 
 	IOFD_FLAG_UNSET(iofd, IOFD_FLAG_CLOSED);
-	osmo_iofd_ops.read_enable(iofd);
+	if (iofd->io_ops.read_cb)
+		osmo_iofd_ops.read_enable(iofd);
 
 	if (iofd->tx_queue.current_length > 0)
 		osmo_iofd_ops.write_enable(iofd);
@@ -658,6 +669,24 @@
 void osmo_iofd_set_ioops(struct osmo_io_fd *iofd, const struct osmo_io_ops *ioops)
 {
 	iofd->io_ops = *ioops;
+
+	switch (iofd->mode) {
+	case OSMO_IO_FD_MODE_READ_WRITE:
+		if (iofd->io_ops.read_cb)
+			osmo_iofd_ops.read_enable(iofd);
+		else
+			osmo_iofd_ops.read_disable(iofd);
+		break;
+	case OSMO_IO_FD_MODE_RECVFROM_SENDTO:
+		if (iofd->io_ops.recvfrom_cb)
+			osmo_iofd_ops.read_enable(iofd);
+		else
+			osmo_iofd_ops.read_disable(iofd);
+		break;
+	case OSMO_IO_FD_MODE_SCTP_RECVMSG_SENDMSG:
+	default:
+		OSMO_ASSERT(0);
+	}
 }
 
 /*! Notify the user if/when the socket is connected.

Changes of Revision 236