Change in osmo-bts[master]: osmo-bts-virtual: do not log GSMTAP message sending failure twice

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/17300 )

Change subject: osmo-bts-virtual: do not log GSMTAP message sending failure twice
......................................................................

osmo-bts-virtual: do not log GSMTAP message sending failure twice

Change-Id: I39e9edf35240ef31e3432412b459c2b8fb0de054
---
M src/osmo-bts-virtual/scheduler_virtbts.c
M src/osmo-bts-virtual/virtual_um.c
2 files changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c
index 91d9153..90288d1 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 @@
 		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 fd0940f..752e4b6 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 @@
 	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;

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/17300
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I39e9edf35240ef31e3432412b459c2b8fb0de054
Gerrit-Change-Number: 17300
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200308/93b06584/attachment.htm>