diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-02-21 12:05:07 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-02-21 12:05:07 +0000 |
commit | 49d8fa1058aaf23c29e074b2314492ae40d2f557 (patch) | |
tree | 393f884d5a99f984e992a0f35f1b02ac43536217 /src/libstddjb/socket_recv6.c | |
parent | fdffefb8032922ce7ffe4c00816072a8ff2148fc (diff) | |
download | skalibs-49d8fa1058aaf23c29e074b2314492ae40d2f557.tar.xz |
Types change: big pass on libstddjb and libunixonacid
libdatastruct still missing, library still not functional
Diffstat (limited to 'src/libstddjb/socket_recv6.c')
-rw-r--r-- | src/libstddjb/socket_recv6.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libstddjb/socket_recv6.c b/src/libstddjb/socket_recv6.c index 6b2b4fc..be6ce3f 100644 --- a/src/libstddjb/socket_recv6.c +++ b/src/libstddjb/socket_recv6.c @@ -4,29 +4,30 @@ #include <sys/socket.h> #include <netinet/in.h> #include <errno.h> +#include <stdint.h> +#include <string.h> #include <skalibs/uint16.h> -#include <skalibs/bytestr.h> #include <skalibs/ip46.h> #include <skalibs/socket.h> #ifdef SKALIBS_IPV6_ENABLED -int socket_recv6 (int s, char *buf, unsigned int len, char *ip6, uint16 *port) +ssize_t socket_recv6 (int s, char *buf, size_t len, char *ip6, uint16_t *port) { struct sockaddr_in6 sa ; socklen_t dummy = sizeof sa ; - register int r ; + ssize_t r ; do r = recvfrom(s, buf, len, 0, (struct sockaddr *)&sa, &dummy) ; while ((r == -1) && (errno == EINTR)) ; if (r == -1) return -1 ; - byte_copy(ip6, 16, (char const *)sa.sin6_addr.s6_addr) ; + memcpy(ip6, sa.sin6_addr.s6_addr, 16) ; uint16_unpack_big((char *)&sa.sin6_port, port) ; return r ; } #else -int socket_recv6 (int s, char *buf, unsigned int len, char *ip6, uint16 *port) +ssize_t socket_recv6 (int s, char *buf, size_t len, char *ip6, uint16_t *port) { (void)s ; (void)buf ; |