Change in libosmo-abis[master]: e1d: Don't connect to e1d at program start time

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16824 )

Change subject: e1d: Don't connect to e1d at program start time
......................................................................

e1d: Don't connect to e1d at program start time

Let's not print an error at program/library start time if osmo-e1d
cannot be reached.  This error is confusing to everyone who may
have a libosmo-abis with e1d support compiled in, but who is not
(currently) using any lines via this driver, but others drivers.

Change-Id: If0d033f8a2ab4f0e72549a811ffccc66b91fb0a8
---
M src/input/e1d.c
1 file changed, 8 insertions(+), 7 deletions(-)

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



diff --git a/src/input/e1d.c b/src/input/e1d.c
index 2b67141..c32e330 100644
--- a/src/input/e1d.c
+++ b/src/input/e1d.c
@@ -186,6 +186,14 @@
 	if (line->driver != &e1d_driver)
 		return -EINVAL;
 
+	if (!g_e1d) {
+		/* Connect to daemon */
+		g_e1d = osmo_e1dp_client_create(NULL, "/tmp/osmo-e1d.ctl");
+		if (!g_e1d) {
+			LOGPIL(line, DLINP, LOGL_ERROR, "Unable to connect to osmo-e1d daemon\n");
+			return -EPIPE;
+		}
+	}
 
 	LOGPIL(line, DLINP, LOGL_NOTICE, "Line update %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr,
 		e1d_intf, e1d_line, line->num_ts);
@@ -259,13 +267,6 @@
 int
 e1inp_e1d_init(void)
 {
-	/* Connect to daemon */
-	g_e1d = osmo_e1dp_client_create(NULL, "/tmp/osmo-e1d.ctl");
-	if (!g_e1d) {
-		LOGP(DLINP, LOGL_ERROR, "Unable to connect to osmo-e1d daemon\n");
-		return -EPIPE;
-	}
-
 	/* register the driver with the core */
 	return e1inp_driver_register(&e1d_driver);
 }

-- 
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16824
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: If0d033f8a2ab4f0e72549a811ffccc66b91fb0a8
Gerrit-Change-Number: 16824
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Assignee: tnt <tnt at 246tNt.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: tnt <tnt at 246tNt.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200112/9901498e/attachment.htm>