From 3f35ab258d4b715c3429fa47beb801db32652e83 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Sat, 29 Feb 2020 19:21:44 +0700 Subject: osmo-bts-virtual: do not log GSMTAP message sending failure twice Change-Id: I39e9edf35240ef31e3432412b459c2b8fb0de054 --- src/osmo-bts-virtual/scheduler_virtbts.c | 3 ++- src/osmo-bts-virtual/virtual_um.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src') 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 #include +#include #include #include #include @@ -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 #include "osmo_mcast_sock.h" #include "virtual_um.h" + #include +#include /** * 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; -- cgit v1.2.3