<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10803">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmoload: Use osmo_sock_unix_init_ofd() from libosmocore<br><br>We don't need to hand-code unix domain socket initialization but<br>can simply use our library function for it.  As an added benefit,<br>the library code already contains corner case handling for non-NUL<br>terminated unix domain socket path.<br><br>Change-Id: Iedcec4591cf0fcbd6f956ed022169eae10a9b16e<br>---<br>M src/host/osmocon/osmoload.c<br>1 file changed, 4 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/osmocon/osmoload.c b/src/host/osmocon/osmoload.c</span><br><span>index 1c20382..b1b48e2 100644</span><br><span>--- a/src/host/osmocon/osmoload.c</span><br><span>+++ b/src/host/osmocon/osmoload.c</span><br><span>@@ -1,6 +1,7 @@</span><br><span> /* control utility for the Calypso bootloader */</span><br><span> </span><br><span> /* (C) 2010 by Ingo Albrecht <prom@berlin.ccc.de></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2018 by Harald Welte <laforge@gnumonks.org></span><br><span>  *</span><br><span>  * All Rights Reserved</span><br><span>  *</span><br><span>@@ -39,6 +40,7 @@</span><br><span> #include <osmocom/core/select.h></span><br><span> #include <osmocom/core/timer.h></span><br><span> #include <osmocom/core/crc16.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/socket.h></span><br><span> </span><br><span> #include <loader/protocol.h></span><br><span> </span><br><span>@@ -493,34 +495,16 @@</span><br><span> static void</span><br><span> loader_connect(const char *socket_path) {</span><br><span>  int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- struct sockaddr_un local;</span><br><span>    struct osmo_fd *conn = &connection;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     local.sun_family = AF_UNIX;</span><br><span style="color: hsl(0, 100%, 40%);">-     strncpy(local.sun_path, socket_path, sizeof(local.sun_path));</span><br><span style="color: hsl(0, 100%, 40%);">-   local.sun_path[sizeof(local.sun_path) - 1] = '\0';</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-      conn->fd = socket(AF_UNIX, SOCK_STREAM, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-  if (conn->fd < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+     rc = osmo_sock_unix_init_ofd(conn, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span>             fprintf(stderr, "Failed to create unix domain socket.\n");</span><br><span>                 exit(1);</span><br><span>     }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   rc = connect(conn->fd, (struct sockaddr *) &local,</span><br><span style="color: hsl(0, 100%, 40%);">-                                sizeof(local.sun_family) + strlen(local.sun_path));</span><br><span style="color: hsl(0, 100%, 40%);">-    if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                fprintf(stderr, "Failed to connect to '%s'.\n", local.sun_path);</span><br><span style="color: hsl(0, 100%, 40%);">-              exit(1);</span><br><span style="color: hsl(0, 100%, 40%);">-        }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       conn->when = BSC_FD_READ;</span><br><span>         conn->cb = loader_read_cb;</span><br><span>        conn->data = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-   if (osmo_fd_register(conn) != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-              fprintf(stderr, "Failed to register fd.\n");</span><br><span style="color: hsl(0, 100%, 40%);">-          exit(1);</span><br><span style="color: hsl(0, 100%, 40%);">-        }</span><br><span> }</span><br><span> </span><br><span> static void</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10803">change 10803</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/10803"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iedcec4591cf0fcbd6f956ed022169eae10a9b16e </div>
<div style="display:none"> Gerrit-Change-Number: 10803 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>