Osmocom Open Build Service

commit_305a1ad9e90756cb4190a9d34a0b0b170436d0c6.txt Deleted

commit_75813dd7dc0dcb98ad9e44febc22c31e392fd710.txt Added

libosmo-netif_1.5.1.6.305a.dsc -> libosmo-netif_1.5.1.7.7581.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.5.1.6.305a
+Version: 1.5.1.7.7581
 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:
- 8f2cff255bb4ea7a8b8bdd66aa7c738320defb24 193564 libosmo-netif_1.5.1.6.305a.tar.xz
+ 189630fd999f945004884a3cd25e812c3ba0ea3d 193672 libosmo-netif_1.5.1.7.7581.tar.xz
 Checksums-Sha256:
- 55c0d8ef11f0a906bbdf400171608b9883a1103b2c14ea9621311eebdd918cc4 193564 libosmo-netif_1.5.1.6.305a.tar.xz
+ 3e0fa0e31cee6e59e0a88aac03a2c1a20a13a3497f47aa9fac76f8bceecb9eeb 193672 libosmo-netif_1.5.1.7.7581.tar.xz
 Files:
- c1df8746449405e1d024707cc3f0367c 193564 libosmo-netif_1.5.1.6.305a.tar.xz
+ 68780d15d9fa2320a52d4b845462397c 193672 libosmo-netif_1.5.1.7.7581.tar.xz

libosmo-netif_1.5.1.6.305a.tar.xz/.tarball-version -> libosmo-netif_1.5.1.7.7581.tar.xz/.tarball-version Changed

libosmo-netif_1.5.1.6.305a.tar.xz/debian/changelog -> libosmo-netif_1.5.1.7.7581.tar.xz/debian/changelog Changed

libosmo-netif_1.5.1.6.305a.tar.xz/src/stream_cli.c -> libosmo-netif_1.5.1.7.7581.tar.xz/src/stream_cli.c Changed

@@ -148,6 +148,17 @@
 	return cli->state == STREAM_CLI_STATE_CONNECTED;
 }
 
+/*! Check if Osmocom Stream Client is opened (has an FD available) according to
+ *  its current state.
+ *  \paramin cli Osmocom Stream Client
+ *  \return true if fd is available (osmo_stream_cli_get_fd()), false otherwise
+ */
+static bool stream_cli_is_opened(const struct osmo_stream_cli *cli)
+{
+	return cli->state == STREAM_CLI_STATE_CONNECTING ||
+	       cli->state == STREAM_CLI_STATE_CONNECTED;
+}
+
 static void osmo_stream_cli_close_iofd(struct osmo_stream_cli *cli)
 {
 	if (!cli->iofd)
@@ -911,17 +922,29 @@
 /*! Set the NODELAY socket option to avoid Nagle-like behavior.
  *  Setting this to nodelay=true will automatically set the NODELAY
  *  socket option on any socket established via \ref osmo_stream_cli_open
- *  or any re-connect.  You have to set this _before_ opening the
+ *  or any re-connect. This can be set either before or after opening the
  *  socket.
  *  \paramin cli Stream client whose sockets are to be configured
  *  \paramin nodelay whether to set (true) NODELAY before connect()
  */
 void osmo_stream_cli_set_nodelay(struct osmo_stream_cli *cli, bool nodelay)
 {
+	int fd;
 	if (nodelay)
 		cli->flags |= OSMO_STREAM_CLI_F_NODELAY;
 	else
 		cli->flags &= ~OSMO_STREAM_CLI_F_NODELAY;
+
+	if (!stream_cli_is_opened(cli))
+		return; /* Config will be applied upon open() time */
+
+	if ((fd = osmo_stream_cli_get_fd(cli)) < 0) {
+		LOGSCLI(cli, LOGL_ERROR, "set_nodelay(%u): failed obtaining socket\n", nodelay);
+		return;
+	}
+	if (stream_setsockopt_nodelay(fd, cli->proto, nodelay ? 1 : 0) < 0)
+		LOGSCLI(cli, LOGL_ERROR, "set_nodelay(%u): failed setsockopt err=%d\n",
+			nodelay, errno);
 }
 
 /*! Open connection of an Osmocom stream client.

Changes of Revision 111