<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12723">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Stream examples: log sent/received bytes<br><br>Make client and server examples more verbose by logging actual bytes<br>sent/received.<br><br>Change-Id: I6979b2f92c96c2366f18bf31e4bc495a6709133a<br>---<br>M examples/stream-client.c<br>M examples/stream-server.c<br>2 files changed, 23 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/23/12723/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/examples/stream-client.c b/examples/stream-client.c</span><br><span>index 3c3416f..6178dcd 100644</span><br><span>--- a/examples/stream-client.c</span><br><span>+++ b/examples/stream-client.c</span><br><span>@@ -45,19 +45,26 @@</span><br><span> </span><br><span> static int read_cb(struct osmo_stream_cli *conn)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+      int bytes;</span><br><span>   struct msgb *msg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   LOGP(DSTREAMTEST, LOGL_NOTICE, "received message from stream\n");</span><br><span style="color: hsl(120, 100%, 40%);">+   LOGP(DSTREAMTEST, LOGL_NOTICE, "receiving message from stream... ");</span><br><span> </span><br><span>   msg = msgb_alloc(1024, "STREAMCLIENT/test");</span><br><span>       if (msg == NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">-              LOGP(DSTREAMTEST, LOGL_ERROR, "cannot allocate message\n");</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot allocate message\n");</span><br><span>               return 0;</span><br><span>    }</span><br><span style="color: hsl(0, 100%, 40%);">-       if (osmo_stream_cli_recv(conn, msg) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-           LOGP(DSTREAMTEST, LOGL_ERROR, "cannot receive message\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        bytes = osmo_stream_cli_recv(conn, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    if (bytes < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+           LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot receive message\n");</span><br><span>                return 0;</span><br><span>    }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   LOGPC(DSTREAMTEST, LOGL_NOTICE, "got %d (%d) bytes: %s\n", bytes, msg->len, msgb_hexdump(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       msgb_free(msg);</span><br><span>      return 0;</span><br><span> }</span><br><span>@@ -86,7 +93,7 @@</span><br><span> </span><br><span>       osmo_stream_cli_send(conn, msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    LOGP(DSTREAMTEST, LOGL_NOTICE, "message of %d bytes sent\n", msg->len);</span><br><span style="color: hsl(120, 100%, 40%);">+  LOGP(DSTREAMTEST, LOGL_NOTICE, "sent %d bytes message: %s\n", msg->len, msgb_hexdump(msg));</span><br><span> </span><br><span>         return 0;</span><br><span> }</span><br><span>diff --git a/examples/stream-server.c b/examples/stream-server.c</span><br><span>index 08c3d2a..cd6dc57 100644</span><br><span>--- a/examples/stream-server.c</span><br><span>+++ b/examples/stream-server.c</span><br><span>@@ -43,19 +43,25 @@</span><br><span> </span><br><span> int read_cb(struct osmo_stream_srv *conn)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+       int bytes;</span><br><span>   struct msgb *msg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   LOGP(DSTREAMTEST, LOGL_NOTICE, "received message from stream\n");</span><br><span style="color: hsl(120, 100%, 40%);">+   LOGP(DSTREAMTEST, LOGL_NOTICE, "receiving message from stream... ");</span><br><span> </span><br><span>   msg = msgb_alloc(1024, "STREAMSERVER/test");</span><br><span>       if (msg == NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">-              LOGP(DSTREAMTEST, LOGL_ERROR, "cannot allocate message\n");</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot allocate message\n");</span><br><span>               return 0;</span><br><span>    }</span><br><span style="color: hsl(0, 100%, 40%);">-       if (osmo_stream_srv_recv(conn, msg) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-           LOGP(DSTREAMTEST, LOGL_ERROR, "cannot receive message\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        bytes = osmo_stream_srv_recv(conn, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    if (bytes < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+           LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot receive message: %s\n", strerror(-bytes));</span><br><span>          return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-       }</span><br><span style="color: hsl(120, 100%, 40%);">+     } else</span><br><span style="color: hsl(120, 100%, 40%);">+                LOGPC(DSTREAMTEST, LOGL_NOTICE, "got %d (%d) bytes: %s\n", bytes, msg->len, msgb_hexdump(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       msgb_free(msg);</span><br><span>      return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12723">change 12723</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/12723"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I6979b2f92c96c2366f18bf31e4bc495a6709133a </div>
<div style="display:none"> Gerrit-Change-Number: 12723 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>