<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-netif/+/19762">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stream: Fix log of IPv6 during accept()<br><br>Change-Id: Ib13db8d135138059a70d18a8bba14e53c6514fa7<br>---<br>M src/stream.c<br>1 file changed, 9 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/62/19762/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/stream.c b/src/stream.c</span><br><span>index e265ee1..8f83113 100644</span><br><span>--- a/src/stream.c</span><br><span>+++ b/src/stream.c</span><br><span>@@ -834,7 +834,9 @@</span><br><span> {</span><br><span> int ret;</span><br><span> int sock_fd;</span><br><span style="color: hsl(0, 100%, 40%);">- struct sockaddr_in sa;</span><br><span style="color: hsl(120, 100%, 40%);">+ char addrstr[128];</span><br><span style="color: hsl(120, 100%, 40%);">+ bool is_ipv6;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sockaddr_storage sa;</span><br><span> socklen_t sa_len = sizeof(sa);</span><br><span> struct osmo_stream_srv_link *link = ofd->data;</span><br><span> </span><br><span>@@ -844,8 +846,13 @@</span><br><span> "peer, reason=`%s'\n", strerror(errno));</span><br><span> return ret;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ is_ipv6 = sa_len == sizeof(struct sockaddr_in6);</span><br><span> LOGP(DLINP, LOGL_DEBUG, "accept()ed new link from %s to port %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- inet_ntoa(sa.sin_addr), link->port);</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(is_ipv6 ? AF_INET6 : AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ is_ipv6 ? (void*)&(((struct sockaddr_in6 *)&sa)->sin6_addr) :</span><br><span style="color: hsl(120, 100%, 40%);">+ (void*)&(((struct sockaddr_in *)&sa)->sin_addr),</span><br><span style="color: hsl(120, 100%, 40%);">+ addrstr, sizeof(addrstr)),</span><br><span style="color: hsl(120, 100%, 40%);">+ link->port);</span><br><span> sock_fd = ret;</span><br><span> </span><br><span> if (link->proto == IPPROTO_SCTP) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-netif/+/19762">change 19762</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-netif/+/19762"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib13db8d135138059a70d18a8bba14e53c6514fa7 </div>
<div style="display:none"> Gerrit-Change-Number: 19762 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>