diff options
Diffstat (limited to 'src/libstddjb/socket_accept4.c')
| -rw-r--r-- | src/libstddjb/socket_accept4.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libstddjb/socket_accept4.c b/src/libstddjb/socket_accept4.c index e504375..a50ade0 100644 --- a/src/libstddjb/socket_accept4.c +++ b/src/libstddjb/socket_accept4.c @@ -4,17 +4,18 @@ #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/djbunix.h> #include <skalibs/socket.h> -int socket_accept4_internal (int s, char *ip, uint16 *port, unsigned int options) +int socket_accept4_internal (int s, char *ip, uint16_t *port, unsigned int options) { struct sockaddr_in sa ; socklen_t dummy = sizeof sa ; - register int fd ; + int fd ; do #ifdef SKALIBS_HASACCEPT4 fd = accept4(s, (struct sockaddr *)&sa, &dummy, ((options & DJBUNIX_FLAG_NB) ? SOCK_NONBLOCK : 0) | ((options & DJBUNIX_FLAG_COE) ? SOCK_CLOEXEC : 0)) ; @@ -27,13 +28,13 @@ int socket_accept4_internal (int s, char *ip, uint16 *port, unsigned int options if ((((options & DJBUNIX_FLAG_NB) ? ndelay_on(fd) : ndelay_off(fd)) < 0) || (((options & DJBUNIX_FLAG_COE) ? coe(fd) : uncoe(fd)) < 0)) { - register int e = errno ; + int e = errno ; fd_close(fd) ; errno = e ; return -1 ; } #endif - byte_copy(ip, 4, (char *)&sa.sin_addr.s_addr) ; + memcpy(ip, &sa.sin_addr.s_addr, 4) ; uint16_unpack_big((char *)&sa.sin_port, port) ; return fd ; } |