<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/17300">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-virtual: do not log GSMTAP message sending failure twice<br><br>Change-Id: I39e9edf35240ef31e3432412b459c2b8fb0de054<br>---<br>M src/osmo-bts-virtual/scheduler_virtbts.c<br>M src/osmo-bts-virtual/virtual_um.c<br>2 files changed, 5 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c</span><br><span>index 91d9153..90288d1 100644</span><br><span>--- a/src/osmo-bts-virtual/scheduler_virtbts.c</span><br><span>+++ b/src/osmo-bts-virtual/scheduler_virtbts.c</span><br><span>@@ -21,6 +21,7 @@</span><br><span>  */</span><br><span> #include <stdlib.h></span><br><span> #include <unistd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <string.h></span><br><span> #include <errno.h></span><br><span> #include <stdint.h></span><br><span> #include <ctype.h></span><br><span>@@ -91,7 +92,7 @@</span><br><span>             rc = virt_um_write_msg(pinst->phy_link->u.virt.virt_um, outmsg);</span><br><span>               if (rc < 0)</span><br><span>                       LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn,</span><br><span style="color: hsl(0, 100%, 40%);">-                            "GSMTAP msg could not send to virtual Um\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                               "GSMTAP msg could not send to virtual Um: %s\n", strerror(-rc));</span><br><span>            else if (rc == 0)</span><br><span>                    bts_shutdown(l1t->trx->bts, "VirtPHY write socket died\n");</span><br><span>          else</span><br><span>diff --git a/src/osmo-bts-virtual/virtual_um.c b/src/osmo-bts-virtual/virtual_um.c</span><br><span>index fd0940f..752e4b6 100644</span><br><span>--- a/src/osmo-bts-virtual/virtual_um.c</span><br><span>+++ b/src/osmo-bts-virtual/virtual_um.c</span><br><span>@@ -27,7 +27,9 @@</span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include "osmo_mcast_sock.h"</span><br><span> #include "virtual_um.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <unistd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span> </span><br><span> /**</span><br><span>  * Virtual UM interface file descriptor callback.</span><br><span>@@ -93,7 +95,7 @@</span><br><span>      rc = mcast_bidir_sock_tx(vui->mcast_sock, msgb_data(msg),</span><br><span>                         msgb_length(msg));</span><br><span>   if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">-          perror("Writing to multicast socket");</span><br><span style="color: hsl(120, 100%, 40%);">+              rc = -errno;</span><br><span>         msgb_free(msg);</span><br><span> </span><br><span>  return rc;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/17300">change 17300</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/c/osmo-bts/+/17300"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I39e9edf35240ef31e3432412b459c2b8fb0de054 </div>
<div style="display:none"> Gerrit-Change-Number: 17300 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>