<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-abis/+/24514">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ipa: add optional connect timeout to ipa_client_conn_open<br><br>The function ipa_client_conn_open opens an osmo-socket using<br>osmo_sock_init2 and sets the OSMO_SOCK_F_NONBLOCK. This means that it<br>returns while the TCP connection is still in progress and it is not<br>clear yet if the connection will succeed or not. In cases where an<br>established connection is critical the API user may specify a timeout in<br>the IPA line options. ipa_client_conn_open() will then wait until the<br>the connection is established (or failed).<br><br>Change-Id: I7bc4345876e3c20266985270d0ddfa770437a053<br>Related: SYS#4971<br>---<br>M TODO-RELEASE<br>M include/osmocom/abis/e1_input.h<br>M src/input/ipa.c<br>3 files changed, 15 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/14/24514/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index 8c417cd..e7a2891 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -10,3 +10,4 @@</span><br><span> update libosmocore dependency to > 1.5.1 for OSMO_SOCK_F_{DSCP,PRIO}()</span><br><span> libosmo-abis new member ipa_client_conn new struct members dscp, priority</span><br><span> libosmo-abis new member ipa_server_link new struct members dscp, priority</span><br><span style="color: hsl(120, 100%, 40%);">+libosmo-abis new member e1inp_line_ops new struct member cfg.ipa.timeout_msec</span><br><span>diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h</span><br><span>index 9c3fe56..ba5033f 100644</span><br><span>--- a/include/osmocom/abis/e1_input.h</span><br><span>+++ b/include/osmocom/abis/e1_input.h</span><br><span>@@ -181,6 +181,7 @@</span><br><span> struct {</span><br><span> enum e1inp_line_role role; /* BSC or BTS mode. */</span><br><span> const char *addr; /* IP address .*/</span><br><span style="color: hsl(120, 100%, 40%);">+ int timeout_msec; /* connect timeout (optional, only valid in BTS mode) */</span><br><span> void *dev; /* device parameters. */</span><br><span> } ipa;</span><br><span> struct {</span><br><span>diff --git a/src/input/ipa.c b/src/input/ipa.c</span><br><span>index c121987..298369a 100644</span><br><span>--- a/src/input/ipa.c</span><br><span>+++ b/src/input/ipa.c</span><br><span>@@ -10,6 +10,7 @@</span><br><span> #include <sys/socket.h></span><br><span> #include <sys/ioctl.h></span><br><span> #include <arpa/inet.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <netinet/tcp.h></span><br><span> </span><br><span> #include <osmocom/core/select.h></span><br><span> #include <osmocom/gsm/tlv.h></span><br><span>@@ -219,6 +220,7 @@</span><br><span> int ipa_client_conn_open(struct ipa_client_conn *link)</span><br><span> {</span><br><span> int ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ int timeout_msec;</span><br><span> </span><br><span> link->state = IPA_CLIENT_LINK_STATE_CONNECTING;</span><br><span> ret = osmo_sock_init2(AF_INET, SOCK_STREAM, IPPROTO_TCP,</span><br><span>@@ -228,6 +230,7 @@</span><br><span> OSMO_SOCK_F_DSCP(link->dscp) | OSMO_SOCK_F_PRIO(link->priority));</span><br><span> if (ret < 0)</span><br><span> return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> link->ofd->fd = ret;</span><br><span> osmo_fd_write_enable(link->ofd);</span><br><span> if (osmo_fd_register(link->ofd) < 0) {</span><br><span>@@ -236,6 +239,16 @@</span><br><span> return -EIO;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* If a connect timeout is specified we will wait until the file</span><br><span style="color: hsl(120, 100%, 40%);">+ * descriptor becomes writeable (connection successful) or enters</span><br><span style="color: hsl(120, 100%, 40%);">+ * an errornous state. */</span><br><span style="color: hsl(120, 100%, 40%);">+ timeout_msec = link->line->ops->cfg.ipa.timeout_msec;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (timeout_msec) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = osmo_sock_wait(link->ofd->fd, timeout_msec);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-abis/+/24514">change 24514</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/+/24514"/><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: I7bc4345876e3c20266985270d0ddfa770437a053 </div>
<div style="display:none"> Gerrit-Change-Number: 24514 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>