Osmocom Open Build Service

libosmo-netif.spec Changed

commit_54d17d664aad318b1f468f6fc15c629fa7d81ea4.txt Deleted

commit_d467b6348cacfab8e3103362f583294531245563.txt Added

libosmo-netif_1.4.0.23.54d1.dsc -> libosmo-netif_1.4.0.25.d467.dsc Changed

@@ -2,7 +2,7 @@
 Source: libosmo-netif
 Binary: libosmonetif11, libosmo-netif-dev, libosmo-netif-doc, libosmo-netif-dbg
 Architecture: any all
-Version: 1.4.0.23.54d1
+Version: 1.4.0.25.d467
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/libosmo-netif
 Standards-Version: 3.9.6
@@ -15,8 +15,8 @@
  libosmo-netif-doc deb doc optional arch=all
  libosmonetif11 deb libs optional arch=any
 Checksums-Sha1:
- 0fddc2cd182093f0ed9485493ad5892b340b41b8 190020 libosmo-netif_1.4.0.23.54d1.tar.xz
+ 4f14de854cfea9aa0446bb86ba18a281d9ad6269 190648 libosmo-netif_1.4.0.25.d467.tar.xz
 Checksums-Sha256:
- f5375ddd3e8c0f4fcf9360adf86bc714e571f2aec42323dc815526321d08dd55 190020 libosmo-netif_1.4.0.23.54d1.tar.xz
+ ef32f4075ddcba704001078d7f6297ad1eb5322aa3a4ed08a0a113be95f7bac2 190648 libosmo-netif_1.4.0.25.d467.tar.xz
 Files:
- 60a748c6f5cb6facb62fee77789551d5 190020 libosmo-netif_1.4.0.23.54d1.tar.xz
+ f3ae0bedd36f23c5f0b53624428dfe95 190648 libosmo-netif_1.4.0.25.d467.tar.xz

libosmo-netif_1.4.0.23.54d1.tar.xz/.tarball-version -> libosmo-netif_1.4.0.25.d467.tar.xz/.tarball-version Changed

libosmo-netif_1.4.0.23.54d1.tar.xz/TODO-RELEASE -> libosmo-netif_1.4.0.25.d467.tar.xz/TODO-RELEASE Changed

libosmo-netif_1.4.0.23.54d1.tar.xz/debian/changelog -> libosmo-netif_1.4.0.25.d467.tar.xz/debian/changelog Changed

libosmo-netif_1.4.0.23.54d1.tar.xz/examples/stream-client.c -> libosmo-netif_1.4.0.25.d467.tar.xz/examples/stream-client.c Changed

libosmo-netif_1.4.0.23.54d1.tar.xz/examples/stream-server.c -> libosmo-netif_1.4.0.25.d467.tar.xz/examples/stream-server.c Changed

libosmo-netif_1.4.0.23.54d1.tar.xz/include/osmocom/netif/stream_private.h -> libosmo-netif_1.4.0.25.d467.tar.xz/include/osmocom/netif/stream_private.h Changed

libosmo-netif_1.4.0.23.54d1.tar.xz/src/stream.c -> libosmo-netif_1.4.0.25.d467.tar.xz/src/stream.c Changed

@@ -209,25 +209,19 @@
 }
 
 #ifdef HAVE_LIBSCTP
-#define LOGPFX(pfx, level, fmt, args...) \
-	LOGP(DLINP, level, "%s " fmt, pfx, ## args)
-int stream_sctp_recvmsg_wrapper(int fd, struct msgb *msg, const char *log_pfx)
+static int stream_sctp_recvmsg_trailer(const char *log_pfx, struct msgb *msg, int ret, const struct sctp_sndrcvinfo *sinfo, int flags)
 {
-	struct sctp_sndrcvinfo sinfo;
-	int flags = 0;
-	int ret;
-	uint8_t *data = msg->tail;
-
-	ret = sctp_recvmsg(fd, data, msgb_tailroom(msg), NULL, NULL, &sinfo, &flags);
 	msgb_sctp_msg_flags(msg) = 0;
-	msgb_sctp_ppid(msg) = ntohl(sinfo.sinfo_ppid);
-	msgb_sctp_stream(msg) = sinfo.sinfo_stream;
+	if (OSMO_LIKELY(sinfo)) {
+		msgb_sctp_ppid(msg) = ntohl(sinfo->sinfo_ppid);
+		msgb_sctp_stream(msg) = sinfo->sinfo_stream;
+	}
 
 	if (flags & MSG_NOTIFICATION) {
 		char buf512;
 		struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) };
 		int logl = LOGL_INFO;
-		union sctp_notification *notif = (union sctp_notification *)data;
+		union sctp_notification *notif = (union sctp_notification *) msg->data;
 
 		OSMO_STRBUF_PRINTF(sb, "%s NOTIFICATION %s flags=0x%x", log_pfx,
 				   osmo_sctp_sn_type_str(notif->sn_header.sn_type), notif->sn_header.sn_flags);
@@ -283,8 +277,76 @@
 		LOGP(DLINP, logl, "%s\n", buf);
 		return ret;
 	}
+
+	if (OSMO_UNLIKELY(ret > 0 && !sinfo))
+		LOGP(DLINP, LOGL_ERROR, "%s sctp_recvmsg without SNDRCV cmsg?!?\n", log_pfx);
+
 	return ret;
 }
+
+/*! wrapper for regular synchronous sctp_recvmsg(3) */
+int stream_sctp_recvmsg_wrapper(int fd, struct msgb *msg, const char *log_pfx)
+{
+	struct sctp_sndrcvinfo sinfo;
+	int flags = 0;
+	int ret;
+
+	ret = sctp_recvmsg(fd, msg->tail, msgb_tailroom(msg), NULL, NULL, &sinfo, &flags);
+	return stream_sctp_recvmsg_trailer(log_pfx, msg, ret, &sinfo, flags);
+}
+
+/*! wrapper for osmo_io asynchronous recvmsg response */
+int stream_iofd_sctp_recvmsg_trailer(struct osmo_io_fd *iofd, struct msgb *msg, int ret, const struct msghdr *msgh)
+{
+	const struct sctp_sndrcvinfo *sinfo = NULL;
+	struct cmsghdr *cmsg = NULL;
+
+	for (cmsg = CMSG_FIRSTHDR((struct msghdr *) msgh); cmsg != NULL;
+		cmsg = CMSG_NXTHDR((struct msghdr *) msgh, cmsg)) {
+		if (cmsg->cmsg_level == IPPROTO_SCTP && cmsg->cmsg_type == SCTP_SNDRCV) {
+			sinfo = (const struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
+			break;
+		}
+	}
+
+	return stream_sctp_recvmsg_trailer(osmo_iofd_get_name(iofd), msg, ret, sinfo, msgh->msg_flags);
+}
+
+/*! Send a message through a connected SCTP socket, similar to sctp_sendmsg().
+ *
+ *  Appends the message to the internal transmit queue.
+ *  If the function returns success (0), it will take ownership of the msgb and
+ *  internally call msgb_free() after the write request completes.
+ *  In case of an error the msgb needs to be freed by the caller.
+ *
+ *  \paramin iofd file descriptor to write to
+ *  \paramin msg message buffer to send; uses msgb_sctp_ppid/msg_sctp_stream
+ *  \paramin sendmsg_flags Flags to pass to the send call
+ *  \returns 0 in case of success; a negative value in case of error
+ */
+int stream_iofd_sctp_send_msgb(struct osmo_io_fd *iofd, struct msgb *msg, int sendmsg_flags)
+{
+	struct msghdr outmsg = {};
+	char outcmsgCMSG_SPACE(sizeof(struct sctp_sndrcvinfo));
+	struct sctp_sndrcvinfo *sinfo;
+	struct cmsghdr *cmsg;
+
+	outmsg.msg_control = outcmsg;
+	outmsg.msg_controllen = sizeof(outcmsg);
+
+	cmsg = CMSG_FIRSTHDR(&outmsg);
+	cmsg->cmsg_level = IPPROTO_SCTP;
+	cmsg->cmsg_type = SCTP_SNDRCV;
+	cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo));
+
+	outmsg.msg_controllen = cmsg->cmsg_len;
+	sinfo = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
+	memset(sinfo, 0, sizeof(struct sctp_sndrcvinfo));
+	sinfo->sinfo_ppid =  htonl(msgb_sctp_ppid(msg));
+	sinfo->sinfo_stream = msgb_sctp_stream(msg);
+
+	return osmo_iofd_sendmsg_msgb(iofd, msg, sendmsg_flags, &outmsg);
+}
 #endif

libosmo-netif_1.4.0.23.54d1.tar.xz/src/stream_cli.c -> libosmo-netif_1.4.0.25.d467.tar.xz/src/stream_cli.c Changed

@@ -470,13 +470,45 @@
 	}
 }
 
-static struct osmo_io_ops osmo_stream_cli_ioops = {
+static const struct osmo_io_ops osmo_stream_cli_ioops = {
 	.read_cb = stream_cli_iofd_read_cb,
 	.write_cb = stream_cli_iofd_write_cb,
 
 	.segmentation_cb = NULL,
 };
 
+#ifdef HAVE_LIBSCTP
+static void stream_cli_iofd_recvmsg_cb(struct osmo_io_fd *iofd, int res, struct msgb *msg, const struct msghdr *msgh)
+{
+	struct osmo_stream_cli *cli  = osmo_iofd_get_data(iofd);
+
+	res = stream_iofd_sctp_recvmsg_trailer(iofd, msg, res, msgh);
+
+	switch (cli->state) {
+	case STREAM_CLI_STATE_CONNECTING:
+		stream_cli_handle_connecting(cli, res);
+		break;
+	case STREAM_CLI_STATE_CONNECTED:
+		if (res == 0)
+			osmo_stream_cli_reconnect(cli);
+		/* Forward message to read callback, also if the connection failed. */
+		if (cli->iofd_read_cb)
+			cli->iofd_read_cb(cli, msg);
+		break;
+	default:
+		osmo_panic("%s() called with unexpected state %d\n", __func__, cli->state);
+	}
+}
+
+static const struct osmo_io_ops osmo_stream_cli_ioops_sctp = {
+	.recvmsg_cb = stream_cli_iofd_recvmsg_cb,
+	.sendmsg_cb = stream_cli_iofd_write_cb,
+
+	.segmentation_cb = NULL,
+};
+#endif
+
+
 /*! \brief Set a name on the cli object (used during logging)
  *  \paramin cli stream_cli whose name is to be set
  *  \paramin name the name to be set on cli
@@ -592,14 +624,18 @@
 }
 
 /* Configure client side segmentation for the iofd */
-static void configure_cli_segmentation_cb(struct osmo_io_fd *iofd,
+static void configure_cli_segmentation_cb(struct osmo_stream_cli *cli,
 					       int (*segmentation_cb)(struct msgb *msg))
 {
 	/* Copy default settings */
-	struct osmo_io_ops client_ops = osmo_stream_cli_ioops;
+	struct osmo_io_ops client_ops;
+	if (cli->proto == IPPROTO_SCTP)
+		client_ops = osmo_stream_cli_ioops_sctp;
+	else
+		client_ops = osmo_stream_cli_ioops;
 	/* Set segmentation cb for this client */
 	client_ops.segmentation_cb = segmentation_cb;
-	osmo_iofd_set_ioops(iofd, &client_ops);
+	osmo_iofd_set_ioops(cli->iofd, &client_ops);
 }
 
 /*! \brief Set the segmentation callback for the client
@@ -611,7 +647,7 @@
 {
 	cli->segmentation_cb = segmentation_cb;
 	if (cli->iofd) /* Otherwise, this will be done in osmo_stream_cli_open() */
-		configure_cli_segmentation_cb(cli->iofd, segmentation_cb);
+		configure_cli_segmentation_cb(cli, segmentation_cb);
 }
 
 /*! \brief Set the socket type for the stream server link
@@ -904,11 +940,23 @@
 			goto error_close_socket;
 		break;
 	case OSMO_STREAM_MODE_OSMO_IO:
-		if (!cli->iofd)
-			cli->iofd = osmo_iofd_setup(cli, fd, cli->name, OSMO_IO_FD_MODE_READ_WRITE, &osmo_stream_cli_ioops, cli);
+#ifdef HAVE_LIBSCTP
+		if (cli->proto == IPPROTO_SCTP) {
+			cli->iofd = osmo_iofd_setup(cli, fd, cli->name, OSMO_IO_FD_MODE_RECVMSG_SENDMSG,
+						    &osmo_stream_cli_ioops_sctp, cli);
+			if (cli->iofd)
+				osmo_iofd_set_cmsg_size(cli->iofd, CMSG_SPACE(sizeof(struct sctp_sndrcvinfo)));
+		} else {
+#else
+		if (true) {
+#endif
+			cli->iofd = osmo_iofd_setup(cli, fd, cli->name, OSMO_IO_FD_MODE_READ_WRITE,
+						    &osmo_stream_cli_ioops, cli);
+		}
 		if (!cli->iofd)
 			goto error_close_socket;
-		configure_cli_segmentation_cb(cli->iofd, cli->segmentation_cb);
+
+		configure_cli_segmentation_cb(cli, cli->segmentation_cb);
 
 		if (osmo_iofd_register(cli->iofd, fd) < 0)
 			goto error_close_socket;
@@ -942,6 +990,8 @@
  *  \paramin msg Message buffer to enqueue in transmit queue */
 void osmo_stream_cli_send(struct osmo_stream_cli *cli, struct msgb *msg)
 {
+	int rc;
+
 	OSMO_ASSERT(cli);
 	OSMO_ASSERT(msg);
 
@@ -951,7 +1001,12 @@
 		osmo_fd_write_enable(&cli->ofd);
 		break;
 	case OSMO_STREAM_MODE_OSMO_IO:
-		osmo_iofd_write_msgb(cli->iofd, msg);
+		if (cli->proto == IPPROTO_SCTP)
+			rc = stream_iofd_sctp_send_msgb(cli->iofd, msg, MSG_NOSIGNAL);
+		else
+			rc = osmo_iofd_write_msgb(cli->iofd, msg);
+		if (rc < 0)
+			msgb_free(msg);
 		break;
 	default:
 		OSMO_ASSERT(false);

libosmo-netif_1.4.0.23.54d1.tar.xz/src/stream_srv.c -> libosmo-netif_1.4.0.25.d467.tar.xz/src/stream_srv.c Changed

@@ -592,10 +592,46 @@
 			osmo_stream_srv_destroy(conn);
 }
 
-static struct osmo_io_ops srv_ioops = {
+static const struct osmo_io_ops srv_ioops = {
 	.read_cb = stream_srv_iofd_read_cb,
 	.write_cb = stream_srv_iofd_write_cb,
 };
+
+#ifdef HAVE_LIBSCTP
+static void stream_srv_iofd_recvmsg_cb(struct osmo_io_fd *iofd, int res, struct msgb *msg, const struct msghdr *msgh)
+{
+	struct osmo_stream_srv *conn = osmo_iofd_get_data(iofd);
+	LOGSSRV(conn, LOGL_DEBUG, "message received (res=%d)\n", res);
+
+	res = stream_iofd_sctp_recvmsg_trailer(iofd, msg, res, msgh);
+	if (res == -EAGAIN)
+		return;
+
+	if (OSMO_UNLIKELY(res <= 0)) {
+		/* This connection is dead, destroy it. */
+		osmo_stream_srv_destroy(conn);
+	} else {
+		if (conn->flags & OSMO_STREAM_SRV_F_FLUSH_DESTROY) {
+			LOGSSRV(conn, LOGL_INFO, "Connection is being flushed and closed; ignoring received message\n");
+			msgb_free(msg);
+			if (osmo_iofd_txqueue_len(iofd) == 0)
+				osmo_stream_srv_destroy(conn);
+			return;
+		}
+
+		if (conn->iofd_read_cb)
+			conn->iofd_read_cb(conn, msg);
+		else
+			msgb_free(msg);
+	}
+}
+
+static const struct osmo_io_ops srv_ioops_sctp = {
+	.recvmsg_cb = stream_srv_iofd_recvmsg_cb,
+	.sendmsg_cb = stream_srv_iofd_write_cb,
+};
+#endif
+
 static int osmo_stream_srv_read(struct osmo_stream_srv *conn)
 {
 	int rc = 0;
@@ -764,8 +800,15 @@
 
 	osmo_sock_get_name_buf(conn->sockname, sizeof(conn->sockname), fd);
 
-	conn->iofd = osmo_iofd_setup(conn, fd, conn->sockname,
-				     OSMO_IO_FD_MODE_READ_WRITE, &srv_ioops, conn);
+	if (link->proto == IPPROTO_SCTP) {
+		conn->iofd = osmo_iofd_setup(conn, fd, conn->sockname, OSMO_IO_FD_MODE_RECVMSG_SENDMSG,
+					     &srv_ioops_sctp, conn);
+		if (conn->iofd)
+			osmo_iofd_set_cmsg_size(conn->iofd, CMSG_SPACE(sizeof(struct sctp_sndrcvinfo)));
+	} else {
+		conn->iofd = osmo_iofd_setup(conn, fd, conn->sockname, OSMO_IO_FD_MODE_READ_WRITE,
+					     &srv_ioops, conn);
+	}
 	if (!conn->iofd) {
 		talloc_free(conn);
 		return NULL;
@@ -842,7 +885,11 @@
 	 * osmo_stream_srv_create2() creates the iofd member, too */
 	OSMO_ASSERT(conn->mode == OSMO_STREAM_MODE_OSMO_IO);
 	/* Copy default settings */
-	struct osmo_io_ops conn_ops = srv_ioops;
+	struct osmo_io_ops conn_ops;
+	if (conn->srv->proto == IPPROTO_SCTP)
+		conn_ops = srv_ioops_sctp;
+	else
+		conn_ops = srv_ioops;
 	/* Set segmentation cb for this connection */
 	conn_ops.segmentation_cb = segmentation_cb;
 	osmo_iofd_set_ioops(conn->iofd, &conn_ops);
@@ -937,6 +984,8 @@
  *  \paramin msg Message buffer to enqueue in transmit queue */
 void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg)
 {
+	int rc;
+
 	OSMO_ASSERT(conn);
 	OSMO_ASSERT(msg);
 	if (conn->flags & OSMO_STREAM_SRV_F_FLUSH_DESTROY) {
@@ -951,7 +1000,12 @@
 		osmo_fd_write_enable(&conn->ofd);
 		break;
 	case OSMO_STREAM_MODE_OSMO_IO:
-		osmo_iofd_write_msgb(conn->iofd, msg);
+		if (conn->srv->proto == IPPROTO_SCTP)
+			rc = stream_iofd_sctp_send_msgb(conn->iofd, msg, MSG_NOSIGNAL);
+		else
+			rc = osmo_iofd_write_msgb(conn->iofd, msg);
+		if (rc < 0)
+			msgb_free(msg);
 		break;
 	default:
 		OSMO_ASSERT(false);

Changes of Revision 82