<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/19763">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo_sock_get_ip_and_port(): Support IPv6 sockets<br><br>Change-Id: I255a71cf047fd022285fc9aa2f24e5070aa3920b<br>---<br>M src/socket.c<br>1 file changed, 3 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/63/19763/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/socket.c b/src/socket.c</span><br><span>index 03c932c..50d59e5 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -1072,16 +1072,16 @@</span><br><span>  */</span><br><span> int osmo_sock_get_ip_and_port(int fd, char *ip, size_t ip_len, char *port, size_t port_len, bool local)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   struct sockaddr sa;</span><br><span style="color: hsl(120, 100%, 40%);">+   struct sockaddr_storage sa;</span><br><span>  socklen_t len = sizeof(sa);</span><br><span>  char ipbuf[INET6_ADDRSTRLEN], portbuf[6];</span><br><span>    int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     rc = local ? getsockname(fd, &sa, &len) : getpeername(fd, &sa, &len);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = local ? getsockname(fd, (struct sockaddr*)&sa, &len) : getpeername(fd, (struct sockaddr*)&sa, &len);</span><br><span>    if (rc < 0)</span><br><span>               return rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  rc = getnameinfo(&sa, len, ipbuf, sizeof(ipbuf),</span><br><span style="color: hsl(120, 100%, 40%);">+  rc = getnameinfo((const struct sockaddr*)&sa, len, ipbuf, sizeof(ipbuf),</span><br><span>                          portbuf, sizeof(portbuf),</span><br><span>                    NI_NUMERICHOST | NI_NUMERICSERV);</span><br><span>   if (rc < 0)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/19763">change 19763</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/libosmocore/+/19763"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I255a71cf047fd022285fc9aa2f24e5070aa3920b </div>
<div style="display:none"> Gerrit-Change-Number: 19763 </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>