<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12980">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  osmith: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Stream client: add disconnect callback<br><br>It's similar to connect_cb() but called once client has been<br>disconnected.<br><br>Change-Id: I905adb2d6191216551a3bcdcd1aec1f96f01612a<br>---<br>M examples/ipa-stream-client.c<br>M examples/stream-client.c<br>M include/osmocom/netif/stream.h<br>M src/stream.c<br>4 files changed, 31 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/examples/ipa-stream-client.c b/examples/ipa-stream-client.c</span><br><span>index 2151090..ec7d2b3 100644</span><br><span>--- a/examples/ipa-stream-client.c</span><br><span>+++ b/examples/ipa-stream-client.c</span><br><span>@@ -54,6 +54,13 @@</span><br><span>    exit(EXIT_SUCCESS);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int disconnect_cb(struct osmo_stream_cli *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+       LOGP(DIPATEST, LOGL_NOTICE, "disconnected\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int connect_cb(struct osmo_stream_cli *conn)</span><br><span> {</span><br><span>   int *__num_msgs = osmo_stream_cli_get_data(conn);</span><br><span>@@ -176,6 +183,7 @@</span><br><span>      osmo_stream_cli_set_addr(conn, "127.0.0.1");</span><br><span>       osmo_stream_cli_set_port(conn, 10000);</span><br><span>       osmo_stream_cli_set_connect_cb(conn, connect_cb);</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_stream_cli_set_disconnect_cb(conn, disconnect_cb);</span><br><span>      osmo_stream_cli_set_read_cb(conn, read_cb);</span><br><span>  osmo_stream_cli_set_data(conn, &num_msgs);</span><br><span> </span><br><span>diff --git a/examples/stream-client.c b/examples/stream-client.c</span><br><span>index e2fb901..f590f25 100644</span><br><span>--- a/examples/stream-client.c</span><br><span>+++ b/examples/stream-client.c</span><br><span>@@ -43,6 +43,13 @@</span><br><span>         return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int disconnect_cb(struct osmo_stream_cli *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSTREAMTEST, LOGL_NOTICE, "disconnected: %s\n", osmo_stream_cli_get_sockname(conn));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int read_cb(struct osmo_stream_cli *conn)</span><br><span> {</span><br><span>      int bytes;</span><br><span>@@ -121,6 +128,7 @@</span><br><span>     osmo_stream_cli_set_addr(conn, "127.0.0.1");</span><br><span>       osmo_stream_cli_set_port(conn, 10000);</span><br><span>       osmo_stream_cli_set_connect_cb(conn, connect_cb);</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_stream_cli_set_disconnect_cb(conn, disconnect_cb);</span><br><span>      osmo_stream_cli_set_read_cb(conn, read_cb);</span><br><span> </span><br><span>      if (osmo_stream_cli_open(conn) < 0) {</span><br><span>diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h</span><br><span>index 3044511..56162e4 100644</span><br><span>--- a/include/osmocom/netif/stream.h</span><br><span>+++ b/include/osmocom/netif/stream.h</span><br><span>@@ -64,6 +64,7 @@</span><br><span> char *osmo_stream_cli_get_sockname(const struct osmo_stream_cli *cli);</span><br><span> struct osmo_fd *osmo_stream_cli_get_ofd(struct osmo_stream_cli *cli);</span><br><span> void osmo_stream_cli_set_connect_cb(struct osmo_stream_cli *cli, int (*connect_cb)(struct osmo_stream_cli *cli));</span><br><span style="color: hsl(120, 100%, 40%);">+void osmo_stream_cli_set_disconnect_cb(struct osmo_stream_cli *cli, int (*disconnect_cb)(struct osmo_stream_cli *cli));</span><br><span> void osmo_stream_cli_set_read_cb(struct osmo_stream_cli *cli, int (*read_cb)(struct osmo_stream_cli *cli));</span><br><span> void osmo_stream_cli_reconnect(struct osmo_stream_cli *cli);</span><br><span> </span><br><span>diff --git a/src/stream.c b/src/stream.c</span><br><span>index 1880e25..c4db3d7 100644</span><br><span>--- a/src/stream.c</span><br><span>+++ b/src/stream.c</span><br><span>@@ -155,6 +155,7 @@</span><br><span>     uint16_t                        local_port;</span><br><span>  uint16_t                        proto;</span><br><span>       int (*connect_cb)(struct osmo_stream_cli *srv);</span><br><span style="color: hsl(120, 100%, 40%);">+       int (*disconnect_cb)(struct osmo_stream_cli *srv);</span><br><span>   int (*read_cb)(struct osmo_stream_cli *srv);</span><br><span>         int (*write_cb)(struct osmo_stream_cli *srv);</span><br><span>        void                            *data;</span><br><span>@@ -194,8 +195,11 @@</span><br><span>        close(cli->ofd.fd);</span><br><span>       cli->ofd.fd = -1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        if (cli->state == STREAM_CLI_STATE_CONNECTED)</span><br><span style="color: hsl(120, 100%, 40%);">+      if (cli->state == STREAM_CLI_STATE_CONNECTED) {</span><br><span>           LOGSCLI(cli, LOGL_DEBUG, "connection closed\n");</span><br><span style="color: hsl(120, 100%, 40%);">+            if (cli->disconnect_cb)</span><br><span style="color: hsl(120, 100%, 40%);">+                    cli->disconnect_cb(cli);</span><br><span style="color: hsl(120, 100%, 40%);">+   }</span><br><span> </span><br><span>        cli->state = STREAM_CLI_STATE_NONE;</span><br><span> }</span><br><span>@@ -442,6 +446,15 @@</span><br><span>   cli->connect_cb = connect_cb;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief Set the call-back function called on disconnect of the stream client socket</span><br><span style="color: hsl(120, 100%, 40%);">+ *  \param[in] cli Stream Client to modify</span><br><span style="color: hsl(120, 100%, 40%);">+ *  \param[in] disconnect_cb Call-back function to be called upon disconnect */</span><br><span style="color: hsl(120, 100%, 40%);">+void osmo_stream_cli_set_disconnect_cb(struct osmo_stream_cli *cli,</span><br><span style="color: hsl(120, 100%, 40%);">+                                  int (*disconnect_cb)(struct osmo_stream_cli *cli))</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+  cli->disconnect_cb = disconnect_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! \brief Set the call-back function called to read from the stream client socket</span><br><span>  *  \param[in] cli Stream Client to modify</span><br><span>  *  \param[in] read_cb Call-back function to be called when we want to read */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12980">change 12980</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12980"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I905adb2d6191216551a3bcdcd1aec1f96f01612a </div>
<div style="display:none"> Gerrit-Change-Number: 12980 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>