X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=libatalk%2Futil%2Fsocket.c;h=6a78c8e22a9a10fd7a802e024c92cf53063c4af3;hp=9edeb6c55c0cf34f380c121b77826a43d7c71972;hb=88fba6fbb4201f715f2700bd3637ec6a57861a1b;hpb=327257d3290c7a2723791c9b755a5b05a6b7ce74 diff --git a/libatalk/util/socket.c b/libatalk/util/socket.c index 9edeb6c5..6a78c8e2 100644 --- a/libatalk/util/socket.c +++ b/libatalk/util/socket.c @@ -21,21 +21,15 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#ifndef _XOPEN_SOURCE -# define _XOPEN_SOURCE 600 -#endif -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ -#endif -#ifndef _GNU_SOURCE -# define _GNU_SOURCE -#endif +#include + #include #include #include #include -#include +#include #include +#include #include #include #include @@ -87,7 +81,7 @@ int setnonblock(int fd, int cmd) * io mode for the socket * @param timeout (r) number of seconds to try reading * - * @returns number of bytes actually read or -1 on fatal error + * @returns number of bytes actually read or -1 on timeout or error */ ssize_t readt(int socket, void *data, const size_t length, int setnonblocking, int timeout) { @@ -97,6 +91,8 @@ ssize_t readt(int socket, void *data, const size_t length, int setnonblocking, i fd_set rfds; int ret; + FD_ZERO(&rfds); + if (setnonblocking) { if (setnonblock(socket, 1) != 0) return -1; @@ -108,13 +104,12 @@ ssize_t readt(int socket, void *data, const size_t length, int setnonblocking, i end.tv_sec += timeout; while (stored < length) { - len = read(socket, (char *) data + stored, length - stored); + len = recv(socket, (char *) data + stored, length - stored, 0); if (len == -1) { switch (errno) { case EINTR: continue; case EAGAIN: - FD_ZERO(&rfds); FD_SET(socket, &rfds); tv.tv_usec = 0; tv.tv_sec = timeout; @@ -122,14 +117,18 @@ ssize_t readt(int socket, void *data, const size_t length, int setnonblocking, i while ((ret = select(socket + 1, &rfds, NULL, NULL, &tv)) < 1) { switch (ret) { case 0: - LOG(log_warning, logtype_afpd, "select timeout %d s", timeout); + LOG(log_debug, logtype_dsi, "select timeout %d s", timeout); + errno = EAGAIN; goto exit; default: /* -1 */ - if (errno == EINTR) { + switch (errno) { + case EINTR: (void)gettimeofday(&now, NULL); - if (now.tv_sec >= end.tv_sec && now.tv_usec >= end.tv_usec) { - LOG(log_warning, logtype_afpd, "select timeout %d s", timeout); + if (now.tv_sec > end.tv_sec + || + (now.tv_sec == end.tv_sec && now.tv_usec >= end.tv_usec)) { + LOG(log_debug, logtype_afpd, "select timeout %d s", timeout); goto exit; } if (now.tv_usec > end.tv_usec) { @@ -139,13 +138,18 @@ ssize_t readt(int socket, void *data, const size_t length, int setnonblocking, i tv.tv_usec = end.tv_usec - now.tv_usec; tv.tv_sec = end.tv_sec - now.tv_sec; } - FD_ZERO(&rfds); FD_SET(socket, &rfds); continue; + case EBADF: + /* possibly entered disconnected state, don't spam log here */ + LOG(log_debug, logtype_afpd, "select: %s", strerror(errno)); + stored = -1; + goto exit; + default: + LOG(log_error, logtype_afpd, "select: %s", strerror(errno)); + stored = -1; + goto exit; } - LOG(log_error, logtype_afpd, "select: %s", strerror(errno)); - stored = -1; - goto exit; } } /* while (select) */ continue; @@ -407,19 +411,16 @@ int compare_ip(const struct sockaddr *sa1, const struct sockaddr *sa2) return ret; } -#define POLL_FD_SET_STARTSIZE 512 -#define POLL_FD_SET_INCREASE 128 /*! * Add a fd to a dynamic pollfd array that is allocated and grown as needed * * This uses an additional array of struct polldata which stores type information * (enum fdtype) and a pointer to anciliary user data. * - * 1. Allocate the arrays with an intial size of [POLL_FD_SET_STARTSIZE] if - * *fdsetp is NULL. - * 2. Grow array as needed - * 3. Fill in both array elements and increase count of used elements + * 1. Allocate the arrays with the size of "maxconns" if *fdsetp is NULL. + * 2. Fill in both array elements and increase count of used elements * + * @param maxconns (r) maximum number of connections, determines array size * @param fdsetp (rw) pointer to callers pointer to the pollfd array * @param polldatap (rw) pointer to callers pointer to the polldata array * @param fdset_usedp (rw) pointer to an int with the number of used elements @@ -428,7 +429,8 @@ int compare_ip(const struct sockaddr *sa1, const struct sockaddr *sa2) * @param fdtype (r) type of fd, currently IPC_FD or LISTEN_FD * @param data (rw) pointer to data the caller want to associate with an fd */ -void fdset_add_fd(struct pollfd **fdsetp, +void fdset_add_fd(int maxconns, + struct pollfd **fdsetp, struct polldata **polldatap, int *fdset_usedp, int *fdset_sizep, @@ -443,37 +445,26 @@ void fdset_add_fd(struct pollfd **fdsetp, LOG(log_debug, logtype_default, "fdset_add_fd: adding fd %i in slot %i", fd, *fdset_usedp); if (fdset == NULL) { /* 1 */ - /* Initialize with space for 512 fds */ - fdset = calloc(POLL_FD_SET_STARTSIZE, sizeof(struct pollfd)); + /* Initialize with space for all possibly active fds */ + fdset = calloc(maxconns, sizeof(struct pollfd)); if (! fdset) exit(EXITERR_SYS); - polldata = calloc(POLL_FD_SET_STARTSIZE, sizeof(struct polldata)); + polldata = calloc(maxconns, sizeof(struct polldata)); if (! polldata) exit(EXITERR_SYS); - fdset_size = 512; - *fdset_sizep = fdset_size; - *fdsetp = fdset; - *polldatap = polldata; - } + fdset_size = maxconns; - if (*fdset_usedp >= fdset_size) { /* 2 */ - fdset = realloc(fdset, sizeof(struct pollfd) * (fdset_size + POLL_FD_SET_INCREASE)); - if (fdset == NULL) - exit(EXITERR_SYS); - - polldata = realloc(polldata, sizeof(struct polldata) * (fdset_size + POLL_FD_SET_INCREASE)); - if (polldata == NULL) - exit(EXITERR_SYS); - - fdset_size += POLL_FD_SET_INCREASE; *fdset_sizep = fdset_size; *fdsetp = fdset; *polldatap = polldata; + + LOG(log_debug, logtype_default, "fdset_add_fd: initialized with space for %i conncections", + maxconns); } - /* 3 */ + /* 2 */ fdset[*fdset_usedp].fd = fd; fdset[*fdset_usedp].events = POLLIN; polldata[*fdset_usedp].fdtype = fdtype; @@ -485,7 +476,8 @@ void fdset_add_fd(struct pollfd **fdsetp, * Remove a fd from our pollfd array * * 1. Search fd - * 2. If we remove the last array elemnt, just decrease count + * 2a Matched last (or only) in the set ? null it and return + * 2b If we remove the last array elemnt, just decrease count * 3. If found move all following elements down by one * 4. Decrease count of used elements in array * @@ -506,11 +498,21 @@ void fdset_del_fd(struct pollfd **fdsetp, struct pollfd *fdset = *fdsetp; struct polldata *polldata = *polldatap; + if (*fdset_usedp < 1) + return; + for (int i = 0; i < *fdset_usedp; i++) { if (fdset[i].fd == fd) { /* 1 */ - if (i < (*fdset_usedp - 1)) { /* 2 */ - memmove(&fdset[i], &fdset[i+1], (*fdset_usedp - 1) * sizeof(struct pollfd)); /* 3 */ - memmove(&polldata[i], &polldata[i+1], (*fdset_usedp - 1) * sizeof(struct polldata)); /* 3 */ + if ((i + 1) == *fdset_usedp) { /* 2a */ + fdset[i].fd = -1; + memset(&polldata[i], 0, sizeof(struct polldata)); + } else if (i < (*fdset_usedp - 1)) { /* 2b */ + memmove(&fdset[i], + &fdset[i+1], + (*fdset_usedp - i - 1) * sizeof(struct pollfd)); /* 3 */ + memmove(&polldata[i], + &polldata[i+1], + (*fdset_usedp - i - 1) * sizeof(struct polldata)); /* 3 */ } (*fdset_usedp)--; break;