<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10802">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;">osmocon: 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: I3ab69a971be555c9f9b5b7a7e5da53008a119504<br>---<br>M src/host/osmocon/osmocon.c<br>1 file changed, 4 insertions(+), 41 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/osmocon/osmocon.c b/src/host/osmocon/osmocon.c</span><br><span>index 6075e61..26416f7 100644</span><br><span>--- a/src/host/osmocon/osmocon.c</span><br><span>+++ b/src/host/osmocon/osmocon.c</span><br><span>@@ -1,6 +1,6 @@</span><br><span> /* osmocon */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* (C) 2010 by Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(120, 100%, 40%);">+/* (C) 2010,2018 by Harald Welte <laforge@gnumonks.org></span><br><span> * (C) 2010 by Holger Hans Peter Freyther <zecke@selfish.org></span><br><span> * (C) 2010 by Steve Markgraf <steve@steve-m.de></span><br><span> *</span><br><span>@@ -45,6 +45,7 @@</span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/core/timer.h></span><br><span> #include <osmocom/core/application.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/socket.h></span><br><span> </span><br><span> #include <arpa/inet.h></span><br><span> </span><br><span>@@ -1333,47 +1334,14 @@</span><br><span> uint8_t dlci)</span><br><span> {</span><br><span> struct osmo_fd *bfd = &ts->bfd;</span><br><span style="color: hsl(0, 100%, 40%);">- struct sockaddr_un local;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int namelen;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->fd = socket(AF_UNIX, SOCK_STREAM, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (bfd->fd < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_sock_unix_init_ofd(bfd, SOCK_STREAM, 0, path, OSMO_SOCK_F_BIND);</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> return -1;</span><br><span> }</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, 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%);">- unlink(local.sun_path);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* we use the same magic that X11 uses in Xtranssock.c for</span><br><span style="color: hsl(0, 100%, 40%);">- * calculating the proper length of the sockaddr */</span><br><span style="color: hsl(0, 100%, 40%);">-#if defined(BSD44SOCKETS) || defined(__UNIXWARE__)</span><br><span style="color: hsl(0, 100%, 40%);">- local.sun_len = strlen(local.sun_path);</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-#if defined(BSD44SOCKETS) || defined(SUN_LEN)</span><br><span style="color: hsl(0, 100%, 40%);">- namelen = SUN_LEN(&local);</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">- namelen = strlen(local.sun_path) +</span><br><span style="color: hsl(0, 100%, 40%);">- offsetof(struct sockaddr_un, sun_path);</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = bind(bfd->fd, (struct sockaddr *) &local, namelen);</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 bind the unix domain socket. '%s'\n",</span><br><span style="color: hsl(0, 100%, 40%);">- local.sun_path);</span><br><span style="color: hsl(0, 100%, 40%);">- return -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%);">- if (listen(bfd->fd, 0) != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Failed to listen.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -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%);">- bfd->when = BSC_FD_READ;</span><br><span> bfd->cb = tool_accept;</span><br><span> bfd->data = ts;</span><br><span> </span><br><span>@@ -1384,11 +1352,6 @@</span><br><span> </span><br><span> sercomm_register_rx_cb(dlci, hdlc_tool_cb);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_fd_register(bfd) != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Failed to register the bfd.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 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/10802">change 10802</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/10802"/><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: I3ab69a971be555c9f9b5b7a7e5da53008a119504 </div>
<div style="display:none"> Gerrit-Change-Number: 10802 </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>