Change in libosmocore[master]: osmo_sock_get_ip_and_port(): Support IPv6 sockets

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19763 )

Change subject: osmo_sock_get_ip_and_port(): Support IPv6 sockets
......................................................................

osmo_sock_get_ip_and_port(): Support IPv6 sockets

Change-Id: I255a71cf047fd022285fc9aa2f24e5070aa3920b
---
M src/socket.c
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/src/socket.c b/src/socket.c
index 03c932c..50d59e5 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -1072,16 +1072,16 @@
  */
 int osmo_sock_get_ip_and_port(int fd, char *ip, size_t ip_len, char *port, size_t port_len, bool local)
 {
-	struct sockaddr sa;
+	struct sockaddr_storage sa;
 	socklen_t len = sizeof(sa);
 	char ipbuf[INET6_ADDRSTRLEN], portbuf[6];
 	int rc;
 
-	rc = local ? getsockname(fd, &sa, &len) : getpeername(fd, &sa, &len);
+	rc = local ? getsockname(fd, (struct sockaddr*)&sa, &len) : getpeername(fd, (struct sockaddr*)&sa, &len);
 	if (rc < 0)
 		return rc;
 
-	rc = getnameinfo(&sa, len, ipbuf, sizeof(ipbuf),
+	rc = getnameinfo((const struct sockaddr*)&sa, len, ipbuf, sizeof(ipbuf),
 			 portbuf, sizeof(portbuf),
 			 NI_NUMERICHOST | NI_NUMERICSERV);
 	if (rc < 0)

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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I255a71cf047fd022285fc9aa2f24e5070aa3920b
Gerrit-Change-Number: 19763
Gerrit-PatchSet: 2
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/901a0d28/attachment.htm>