Change in libosmo-netif[master]: stream: Support creating sockets with IPv6 addresses

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/19725 )

Change subject: stream: Support creating sockets with IPv6 addresses
......................................................................

stream: Support creating sockets with IPv6 addresses

In the case of SCTP, an association supports now containing both IPv4
and v6 addresses.

Depends: libosmocore.git Change-Id I36d8ab85d92bba4d6adb83bc1875eb61094ed2ef
Change-Id: Ie6bb17a9af6ca21d5e350f9c9d2d74c97c5a00af
---
M TODO-RELEASE
M src/stream.c
2 files changed, 7 insertions(+), 6 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/TODO-RELEASE b/TODO-RELEASE
index d0852fc..c89dec9 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,3 +7,4 @@
 # If any interfaces have been added since the last public release: c:r:a + 1.
 # If any interfaces have been removed or changed since the last public release: c:r:0.
 #library	what		description / commit summary line
+libosmo-netif   ipv6            Depends on libosmocore > 1.4.0 for IPv6 osmo_sock_inti2_multiaddr AF_UNSPEC (IPv6) support.
diff --git a/src/stream.c b/src/stream.c
index cfe8cfe..e265ee1 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -658,14 +658,14 @@
 	switch (cli->proto) {
 #ifdef HAVE_LIBSCTP
 	case IPPROTO_SCTP:
-		ret = osmo_sock_init2_multiaddr(AF_INET, SOCK_STREAM, cli->proto,
+		ret = osmo_sock_init2_multiaddr(AF_UNSPEC, SOCK_STREAM, cli->proto,
 						(const char **)cli->local_addr, cli->local_addrcnt, cli->local_port,
 						(const char **)cli->addr, cli->addrcnt, cli->port,
 						OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK);
 		break;
 #endif
 	default:
-		ret = osmo_sock_init2(AF_INET, SOCK_STREAM, cli->proto,
+		ret = osmo_sock_init2(AF_UNSPEC, SOCK_STREAM, cli->proto,
 				      cli->local_addr[0], cli->local_port,
 				      cli->addr[0], cli->port,
 				      OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK);
@@ -731,14 +731,14 @@
 	switch (cli->proto) {
 #ifdef HAVE_LIBSCTP
 	case IPPROTO_SCTP:
-		ret = osmo_sock_init2_multiaddr(AF_INET, SOCK_STREAM, cli->proto,
+		ret = osmo_sock_init2_multiaddr(AF_UNSPEC, SOCK_STREAM, cli->proto,
 						(const char **)cli->local_addr, cli->local_addrcnt, cli->local_port,
 						(const char **)cli->addr, cli->addrcnt, cli->port,
 						OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK);
 		break;
 #endif
 	default:
-		ret = osmo_sock_init2(AF_INET, SOCK_STREAM, cli->proto,
+		ret = osmo_sock_init2(AF_UNSPEC, SOCK_STREAM, cli->proto,
 				      cli->local_addr[0], cli->local_port,
 				      cli->addr[0], cli->port,
 				      OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK);
@@ -1055,13 +1055,13 @@
 	switch (link->proto) {
 #ifdef HAVE_LIBSCTP
 	case IPPROTO_SCTP:
-		ret = osmo_sock_init2_multiaddr(AF_INET, SOCK_STREAM, link->proto,
+		ret = osmo_sock_init2_multiaddr(AF_UNSPEC, SOCK_STREAM, link->proto,
 						(const char **)link->addr, link->addrcnt, link->port,
 						NULL, 0, 0, OSMO_SOCK_F_BIND);
 		break;
 #endif
 	default:
-		ret = osmo_sock_init(AF_INET, SOCK_STREAM, link->proto,
+		ret = osmo_sock_init(AF_UNSPEC, SOCK_STREAM, link->proto,
 					link->addr[0], link->port, OSMO_SOCK_F_BIND);
 	}
 	if (ret < 0)

-- 
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/19725
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: Ie6bb17a9af6ca21d5e350f9c9d2d74c97c5a00af
Gerrit-Change-Number: 19725
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200824/bd124a58/attachment.htm>