aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Yanitskiy <axilirator@gmail.com>2020-02-29 19:21:44 +0700
committerVadim Yanitskiy <axilirator@gmail.com>2020-03-04 20:43:02 +0700
commit3f35ab258d4b715c3429fa47beb801db32652e83 (patch)
tree3e50e38daf482ceb75a53da65c3d629ccc596037
parentf9e7ccce27ec46f00eb77ca5e6f9854abd12304d (diff)
osmo-bts-virtual: do not log GSMTAP message sending failure twice
-rw-r--r--src/osmo-bts-virtual/scheduler_virtbts.c3
-rw-r--r--src/osmo-bts-virtual/virtual_um.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c
index 91d91539..90288d1a 100644
--- a/src/osmo-bts-virtual/scheduler_virtbts.c
+++ b/src/osmo-bts-virtual/scheduler_virtbts.c
@@ -21,6 +21,7 @@
*/
#include <stdlib.h>
#include <unistd.h>
+#include <string.h>
#include <errno.h>
#include <stdint.h>
#include <ctype.h>
@@ -91,7 +92,7 @@ static void tx_to_virt_um(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn,
rc = virt_um_write_msg(pinst->phy_link->u.virt.virt_um, outmsg);
if (rc < 0)
LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn,
- "GSMTAP msg could not send to virtual Um\n");
+ "GSMTAP msg could not send to virtual Um: %s\n", strerror(-rc));
else if (rc == 0)
bts_shutdown(l1t->trx->bts, "VirtPHY write socket died\n");
else
diff --git a/src/osmo-bts-virtual/virtual_um.c b/src/osmo-bts-virtual/virtual_um.c
index fd0940f0..752e4b61 100644
--- a/src/osmo-bts-virtual/virtual_um.c
+++ b/src/osmo-bts-virtual/virtual_um.c
@@ -27,7 +27,9 @@
#include <osmocom/core/talloc.h>
#include "osmo_mcast_sock.h"
#include "virtual_um.h"
+
#include <unistd.h>
+#include <errno.h>
/**
* Virtual UM interface file descriptor callback.
@@ -93,7 +95,7 @@ int virt_um_write_msg(struct virt_um_inst *vui, struct msgb *msg)
rc = mcast_bidir_sock_tx(vui->mcast_sock, msgb_data(msg),
msgb_length(msg));
if (rc < 0)
- perror("Writing to multicast socket");
+ rc = -errno;
msgb_free(msg);
return rc;