diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2019-05-07 09:42:46 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2019-05-07 09:42:46 +0000 |
| commit | ab0416faed65154c408e4fb5066cd8433a4bfa11 (patch) | |
| tree | 18e69a05261c7051465255f7ea7da1b672127f8f /src/libstddjb | |
| parent | 8052d3396ddcbbbfabd0a06ea66c36cec8439ea4 (diff) | |
| download | skalibs-ab0416faed65154c408e4fb5066cd8433a4bfa11.tar.xz | |
bugfix: proper sockaddr storage in socket_remote46
Diffstat (limited to 'src/libstddjb')
| -rw-r--r-- | src/libstddjb/socket_remote46.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstddjb/socket_remote46.c b/src/libstddjb/socket_remote46.c index 7ae077d..5681ce3 100644 --- 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) ; |