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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Set local IP in ipa_server_link properly<br><br>When creating IPA link for server we might be called without explicit<br>address (which is legit - it means bind to all available<br>addresses). However in this case we won't have 'addr' field of<br>ipa_server_link initialized properly.<br><br>Fix this by following changes:<br><br>* don't copy NULL value as address<br>* use socket's local IP when no address set explicitly<br><br>Change-Id: I33679bb35f426d4cafb223b9200fccbf407e0cf6<br>---<br>M src/input/ipa.c<br>1 file changed, 10 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/input/ipa.c b/src/input/ipa.c</span><br><span>index 09e3426..9853ffa 100644</span><br><span>--- a/src/input/ipa.c</span><br><span>+++ b/src/input/ipa.c</span><br><span>@@ -248,6 +248,7 @@</span><br><span> static int ipa_server_fd_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span> {</span><br><span>  int fd, ret;</span><br><span style="color: hsl(120, 100%, 40%);">+  char ipbuf[INET6_ADDRSTRLEN + 1];</span><br><span>    struct sockaddr_in sa;</span><br><span>       socklen_t sa_len = sizeof(sa);</span><br><span>       struct ipa_server_link *link = ofd->data;</span><br><span>@@ -258,6 +259,13 @@</span><br><span>                  "peer, reason=`%s'\n", strerror(errno));</span><br><span>               return fd;</span><br><span>   }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   if (!link->addr) {</span><br><span style="color: hsl(120, 100%, 40%);">+         ret = osmo_sock_get_local_ip(fd, ipbuf, INET6_ADDRSTRLEN + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+                if (ret == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                 link->addr = talloc_strdup(link, ipbuf);</span><br><span style="color: hsl(120, 100%, 40%);">+   }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  LOGP(DLINP, LOGL_NOTICE, "accept()ed new link from %s to port %u\n",</span><br><span>               inet_ntoa(sa.sin_addr), link->port);</span><br><span> </span><br><span>@@ -290,7 +298,8 @@</span><br><span>    ipa_link->ofd.when |= BSC_FD_READ | BSC_FD_WRITE;</span><br><span>         ipa_link->ofd.cb = ipa_server_fd_cb;</span><br><span>      ipa_link->ofd.data = ipa_link;</span><br><span style="color: hsl(0, 100%, 40%);">-       ipa_link->addr = talloc_strdup(ipa_link, addr);</span><br><span style="color: hsl(120, 100%, 40%);">+    if (addr)</span><br><span style="color: hsl(120, 100%, 40%);">+             ipa_link->addr = talloc_strdup(ipa_link, addr);</span><br><span>   ipa_link->port = port;</span><br><span>    ipa_link->accept_cb = accept_cb;</span><br><span>  ipa_link->line = line;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12653">change 12653</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/12653"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I33679bb35f426d4cafb223b9200fccbf407e0cf6 </div>
<div style="display:none"> Gerrit-Change-Number: 12653 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </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: Max <msuraev@sysmocom.de> </div>