<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-netif/+/19725">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stream: Support creating sockets with IPv6 addresses<br><br>In the case of SCTP, an association supports now containing both IPv4<br>and v6 addresses.<br><br>Depends: libosmocore.git Change-Id I36d8ab85d92bba4d6adb83bc1875eb61094ed2ef<br>Change-Id: Ie6bb17a9af6ca21d5e350f9c9d2d74c97c5a00af<br>---<br>M TODO-RELEASE<br>M src/stream.c<br>2 files changed, 7 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index d0852fc..c89dec9 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -7,3 +7,4 @@</span><br><span> # If any interfaces have been added since the last public release: c:r:a + 1.</span><br><span> # If any interfaces have been removed or changed since the last public release: c:r:0.</span><br><span> #library what description / commit summary line</span><br><span style="color: hsl(120, 100%, 40%);">+libosmo-netif ipv6 Depends on libosmocore > 1.4.0 for IPv6 osmo_sock_inti2_multiaddr AF_UNSPEC (IPv6) support.</span><br><span>diff --git a/src/stream.c b/src/stream.c</span><br><span>index cfe8cfe..e265ee1 100644</span><br><span>--- a/src/stream.c</span><br><span>+++ b/src/stream.c</span><br><span>@@ -658,14 +658,14 @@</span><br><span> switch (cli->proto) {</span><br><span> #ifdef HAVE_LIBSCTP</span><br><span> case IPPROTO_SCTP:</span><br><span style="color: hsl(0, 100%, 40%);">- ret = osmo_sock_init2_multiaddr(AF_INET, SOCK_STREAM, cli->proto,</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = osmo_sock_init2_multiaddr(AF_UNSPEC, SOCK_STREAM, cli->proto,</span><br><span> (const char **)cli->local_addr, cli->local_addrcnt, cli->local_port,</span><br><span> (const char **)cli->addr, cli->addrcnt, cli->port,</span><br><span> OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK);</span><br><span> break;</span><br><span> #endif</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- ret = osmo_sock_init2(AF_INET, SOCK_STREAM, cli->proto,</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = osmo_sock_init2(AF_UNSPEC, SOCK_STREAM, cli->proto,</span><br><span> cli->local_addr[0], cli->local_port,</span><br><span> cli->addr[0], cli->port,</span><br><span> OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK);</span><br><span>@@ -731,14 +731,14 @@</span><br><span> switch (cli->proto) {</span><br><span> #ifdef HAVE_LIBSCTP</span><br><span> case IPPROTO_SCTP:</span><br><span style="color: hsl(0, 100%, 40%);">- ret = osmo_sock_init2_multiaddr(AF_INET, SOCK_STREAM, cli->proto,</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = osmo_sock_init2_multiaddr(AF_UNSPEC, SOCK_STREAM, cli->proto,</span><br><span> (const char **)cli->local_addr, cli->local_addrcnt, cli->local_port,</span><br><span> (const char **)cli->addr, cli->addrcnt, cli->port,</span><br><span> OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK);</span><br><span> break;</span><br><span> #endif</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- ret = osmo_sock_init2(AF_INET, SOCK_STREAM, cli->proto,</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = osmo_sock_init2(AF_UNSPEC, SOCK_STREAM, cli->proto,</span><br><span> cli->local_addr[0], cli->local_port,</span><br><span> cli->addr[0], cli->port,</span><br><span> OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK);</span><br><span>@@ -1055,13 +1055,13 @@</span><br><span> switch (link->proto) {</span><br><span> #ifdef HAVE_LIBSCTP</span><br><span> case IPPROTO_SCTP:</span><br><span style="color: hsl(0, 100%, 40%);">- ret = osmo_sock_init2_multiaddr(AF_INET, SOCK_STREAM, link->proto,</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = osmo_sock_init2_multiaddr(AF_UNSPEC, SOCK_STREAM, link->proto,</span><br><span> (const char **)link->addr, link->addrcnt, link->port,</span><br><span> NULL, 0, 0, OSMO_SOCK_F_BIND);</span><br><span> break;</span><br><span> #endif</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- ret = osmo_sock_init(AF_INET, SOCK_STREAM, link->proto,</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = osmo_sock_init(AF_UNSPEC, SOCK_STREAM, link->proto,</span><br><span> link->addr[0], link->port, OSMO_SOCK_F_BIND);</span><br><span> }</span><br><span> if (ret < 0)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-netif/+/19725">change 19725</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/+/19725"/><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: Ie6bb17a9af6ca21d5e350f9c9d2d74c97c5a00af </div>
<div style="display:none"> Gerrit-Change-Number: 19725 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>