diff options
Diffstat (limited to 'src/libstddjb/socket_recv4.c')
-rw-r--r-- | src/libstddjb/socket_recv4.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libstddjb/socket_recv4.c b/src/libstddjb/socket_recv4.c index 02354e9..09572d9 100644 --- a/src/libstddjb/socket_recv4.c +++ b/src/libstddjb/socket_recv4.c @@ -3,20 +3,21 @@ #include <skalibs/nonposix.h> #include <sys/socket.h> #include <netinet/in.h> +#include <stdint.h> +#include <string.h> #include <errno.h> #include <skalibs/uint16.h> -#include <skalibs/bytestr.h> #include <skalibs/socket.h> -int socket_recv4 (int s, char *buf, unsigned int len, char *ip, uint16 *port) +ssize_t socket_recv4 (int s, char *buf, size_t len, char *ip, uint16_t *port) { struct sockaddr_in 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(ip, 4, (char *)&sa.sin_addr) ; + memcpy(ip, &sa.sin_addr, 4) ; uint16_unpack_big((char *)&sa.sin_port, port) ; return r ; } |