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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">e1d: Don't connect to e1d at program start time<br><br>Let's not print an error at program/library start time if osmo-e1d<br>cannot be reached.  This error is confusing to everyone who may<br>have a libosmo-abis with e1d support compiled in, but who is not<br>(currently) using any lines via this driver, but others drivers.<br><br>Change-Id: If0d033f8a2ab4f0e72549a811ffccc66b91fb0a8<br>---<br>M src/input/e1d.c<br>1 file changed, 8 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/input/e1d.c b/src/input/e1d.c</span><br><span>index 2b67141..c32e330 100644</span><br><span>--- a/src/input/e1d.c</span><br><span>+++ b/src/input/e1d.c</span><br><span>@@ -186,6 +186,14 @@</span><br><span>         if (line->driver != &e1d_driver)</span><br><span>              return -EINVAL;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+   if (!g_e1d) {</span><br><span style="color: hsl(120, 100%, 40%);">+         /* Connect to daemon */</span><br><span style="color: hsl(120, 100%, 40%);">+               g_e1d = osmo_e1dp_client_create(NULL, "/tmp/osmo-e1d.ctl");</span><br><span style="color: hsl(120, 100%, 40%);">+         if (!g_e1d) {</span><br><span style="color: hsl(120, 100%, 40%);">+                 LOGPIL(line, DLINP, LOGL_ERROR, "Unable to connect to osmo-e1d daemon\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                  return -EPIPE;</span><br><span style="color: hsl(120, 100%, 40%);">+                }</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span> </span><br><span>        LOGPIL(line, DLINP, LOGL_NOTICE, "Line update %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr,</span><br><span>              e1d_intf, e1d_line, line->num_ts);</span><br><span>@@ -259,13 +267,6 @@</span><br><span> int</span><br><span> e1inp_e1d_init(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        /* Connect to daemon */</span><br><span style="color: hsl(0, 100%, 40%);">- g_e1d = osmo_e1dp_client_create(NULL, "/tmp/osmo-e1d.ctl");</span><br><span style="color: hsl(0, 100%, 40%);">-   if (!g_e1d) {</span><br><span style="color: hsl(0, 100%, 40%);">-           LOGP(DLINP, LOGL_ERROR, "Unable to connect to osmo-e1d daemon\n");</span><br><span style="color: hsl(0, 100%, 40%);">-            return -EPIPE;</span><br><span style="color: hsl(0, 100%, 40%);">-  }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>    /* register the driver with the core */</span><br><span>      return e1inp_driver_register(&e1d_driver);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-abis/+/16824">change 16824</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/libosmo-abis/+/16824"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-abis </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If0d033f8a2ab4f0e72549a811ffccc66b91fb0a8 </div>
<div style="display:none"> Gerrit-Change-Number: 16824 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Assignee: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>