diff options
Diffstat (limited to 'src/libstddjb/socket_local46.c')
| -rw-r--r-- | src/libstddjb/socket_local46.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/libstddjb/socket_local46.c b/src/libstddjb/socket_local46.c index 0eeed8c..2483996 100644 --- a/src/libstddjb/socket_local46.c +++ b/src/libstddjb/socket_local46.c @@ -4,28 +4,29 @@ #include <errno.h> #include <sys/socket.h> #include <netinet/in.h> +#include <stdint.h> +#include <string.h> #include <skalibs/uint16.h> -#include <skalibs/bytestr.h> #include <skalibs/ip46.h> #ifdef SKALIBS_IPV6_ENABLED -int socket_local46 (int s, ip46_t *ip, uint16 *port) +int socket_local46 (int s, ip46_t *ip, uint16_t *port) { struct sockaddr_storage sa ; socklen_t dummy = sizeof sa ; if (getsockname(s, (struct sockaddr *)&sa, &dummy) < 0) return -1 ; if (sa.ss_family == AF_INET6) { - register struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)&sa ; - byte_copy(ip->ip, 16, (char const *)sa6->sin6_addr.s6_addr) ; + 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.ss_family == AF_INET) { - register struct sockaddr_in *sa4 = (struct sockaddr_in *)&sa ; - byte_copy(ip->ip, 4, (char const *)&sa4->sin_addr.s_addr) ; + struct sockaddr_in *sa4 = (struct sockaddr_in *)&sa ; + memcpy(ip->ip, &sa4->sin_addr.s_addr, 4) ; uint16_unpack_big((char *)&sa4->sin_port, port) ; ip->is6 = 0 ; } |