skalibs

commit ab0416faed65154c408e4fb5066cd8433a4bfa11
parent 8052d3396ddcbbbfabd0a06ea66c36cec8439ea4
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Tue,  7 May 2019 09:42:46 +0000

 bugfix: proper sockaddr storage in socket_remote46

Diffstat:
M
src/libstddjb/socket_remote46.c
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/libstddjb/socket_remote46.c b/src/libstddjb/socket_remote46.c
@@ -12,17 +12,17 @@
 
 int socket_remote46 (int s, ip46_t *ip, uint16_t *port)
 {
-  struct sockaddr sa ;
+  struct sockaddr_storage sa ;
   socklen_t dummy = sizeof sa ;
-  if (getpeername(s, &sa, &dummy) < 0) return -1 ;
-  if (sa.sa_family == AF_INET6)
+  if (getpeername(s, (struct sockaddr *)&sa, &dummy) < 0) return -1 ;
+  if (sa.ss_family == AF_INET6)
   {
     struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)&sa ;
     memcpy(ip->ip, sa6->sin6_addr.s6_addr, 16) ;
     uint16_unpack_big((char *)&sa6->sin6_port, port) ;
     ip->is6 = 1 ;
   }
-  else if (sa.sa_family == AF_INET)
+  else if (sa.ss_family == AF_INET)
   {
     struct sockaddr_in *sa4 = (struct sockaddr_in *)&sa ;
     memcpy(ip->ip, &sa4->sin_addr.s_addr, 4) ;