New accept/connect code.

Better error checking.
Better tests.
__tostring implemented.

1 files changed, 118 insertions, 63 deletions

diff --git a/src/usocket.c b/src/usocket.c
index 5afa1bf..bece354 100644
--- a/src/usocket.c
+++ b/src/usocket.c
@@ -20,9 +20,11 @@
 
 #include "socket.h"
 
-static const char *sock_createstrerror(void);
-static const char *sock_bindstrerror(void);
-static const char *sock_connectstrerror(void);
+static const char *sock_createstrerror(int err);
+static const char *sock_bindstrerror(int err);
+static const char *sock_connectstrerror(int err);
+static const char *sock_acceptstrerror(int err);
+static const char *sock_listenstrerror(int err);
 
 /*-------------------------------------------------------------------------*\
 * Initializes module 
@@ -46,19 +48,31 @@ int sock_open(void)
 void sock_destroy(p_sock ps)
 {
     if (*ps != SOCK_INVALID) {
+        sock_setblocking(ps);
         close(*ps);
         *ps = SOCK_INVALID;
     }
 }
 
 /*-------------------------------------------------------------------------*\
+* Select with int timeout in ms
+\*-------------------------------------------------------------------------*/
+int sock_select(int n, fd_set *rfds, fd_set *wfds, fd_set *efds, int timeout)
+{
+    struct timeval tv;
+    tv.tv_sec = timeout / 1000;
+    tv.tv_usec = (timeout % 1000) * 1000;
+    return select(n, rfds, wfds, efds, timeout >= 0? &tv: NULL);
+}
+
+/*-------------------------------------------------------------------------*\
 * Creates and sets up a socket
 \*-------------------------------------------------------------------------*/
 const char *sock_create(p_sock ps, int domain, int type, int protocol)
 {
     int val = 1;
     t_sock sock = socket(domain, type, protocol);
-    if (sock == SOCK_INVALID) return sock_createstrerror();
+    if (sock == SOCK_INVALID) return sock_createstrerror(errno);
     *ps = sock;
     sock_setnonblocking(ps);
     setsockopt(*ps, SOL_SOCKET, SO_REUSEADDR, (char *) &val, sizeof(val));
@@ -79,27 +93,22 @@ const char *sock_connect(p_sock ps, SA *addr, socklen_t addr_len, p_tm tm)
     /* if no error, we're done */
     if (err == 0) return NULL; 
     /* make sure the system is trying to connect */
-    if (errno != EINPROGRESS) return io_strerror(IO_ERROR);
+    if (errno != EINPROGRESS) return sock_connectstrerror(errno);
     /* wait for a timeout or for the system's answer */
     for ( ;; ) {
-        struct timeval tv;
         fd_set rfds, wfds, efds;
-        int timeout = tm_getretry(tm);
-        tv.tv_sec = timeout / 1000;
-        tv.tv_usec = (timeout % 1000) * 1000;
         FD_ZERO(&rfds); FD_SET(sock, &rfds);
         FD_ZERO(&wfds); FD_SET(sock, &wfds);
         FD_ZERO(&efds); FD_SET(sock, &efds);
         /* we run select to avoid busy waiting */
-        err = select(sock+1, &rfds, &wfds, &efds, timeout >= 0? &tv: NULL);
-        /* if select was interrupted, try again */
-        if (err < 0 && errno == EINTR) continue;
+        do err = sock_select(sock+1, &rfds, &wfds, &efds, tm_getretry(tm));
+        while (err < 0 && errno == EINTR); 
         /* if selects readable, try reading */
         if (err > 0) {
             char dummy;
             /* recv will set errno to the value a blocking connect would set */
-            if (recv(sock, &dummy, 0, 0) < 0 && errno != EAGAIN)
-                return sock_connectstrerror();
+            if (recv(sock, &dummy, 0, 0) < 0 && errno != EWOULDBLOCK)
+                return sock_connectstrerror(errno);
             else 
                 return NULL;
         /* if no event happened, there was a timeout */
@@ -113,16 +122,24 @@ const char *sock_connect(p_sock ps, SA *addr, socklen_t addr_len, p_tm tm)
 \*-------------------------------------------------------------------------*/
 const char *sock_bind(p_sock ps, SA *addr, socklen_t addr_len)
 {
-    if (bind(*ps, addr, addr_len) < 0) return sock_bindstrerror();
-    else return NULL;
+    const char *err = NULL;
+    sock_setblocking(ps);
+    if (bind(*ps, addr, addr_len) < 0) err = sock_bindstrerror(errno);
+    sock_setnonblocking(ps);
+    return err;
 }
 
 /*-------------------------------------------------------------------------*\
 * 
 \*-------------------------------------------------------------------------*/
-void sock_listen(p_sock ps, int backlog)
+const char* sock_listen(p_sock ps, int backlog)
 {
-    listen(*ps, backlog);
+    const char *err = NULL;
+    sock_setblocking(ps);
+    if (listen(*ps, backlog))
+        err = sock_listenstrerror(errno);
+    sock_setnonblocking(ps);
+    return err;
 }
 
 /*-------------------------------------------------------------------------*\
@@ -130,35 +147,40 @@ void sock_listen(p_sock ps, int backlog)
 \*-------------------------------------------------------------------------*/
 void sock_shutdown(p_sock ps, int how)
 {
+    sock_setblocking(ps);
     shutdown(*ps, how);
+    sock_setnonblocking(ps);
 }
 
 /*-------------------------------------------------------------------------*\
 * Accept with timeout
 \*-------------------------------------------------------------------------*/
-int sock_accept(p_sock ps, p_sock pa, SA *addr, socklen_t *addr_len, p_tm tm)
+const char *sock_accept(p_sock ps, p_sock pa, SA *addr, 
+        socklen_t *addr_len, p_tm tm)
 {
     t_sock sock = *ps;
     SA dummy_addr;
     socklen_t dummy_len = sizeof(dummy_addr);
-    if (sock == SOCK_INVALID) return IO_CLOSED;
+    if (sock == SOCK_INVALID) return io_strerror(IO_CLOSED);
     if (!addr) addr = &dummy_addr;
     if (!addr_len) addr_len = &dummy_len;
     for (;;) {
-        int timeout = tm_getretry(tm);
-        struct timeval tv;
+        int err;
         fd_set fds;
         *pa = accept(sock, addr, addr_len);
-        if (*pa != SOCK_INVALID) return IO_DONE;
-        if (timeout == 0) return IO_TIMEOUT;
-        tv.tv_sec = timeout / 1000;
-        tv.tv_usec = (timeout % 1000) * 1000;
+        /* if result is valid, we are done */
+        if (*pa != SOCK_INVALID) return NULL;
+        /* find out if we failed for a fatal reason */
+        if (errno != EWOULDBLOCK && errno != ECONNABORTED)
+            return sock_acceptstrerror(errno);
+        /* call select just to avoid busy-wait. */
         FD_ZERO(&fds);
         FD_SET(sock, &fds);
-        /* call select just to avoid busy-wait. */
-        select(sock+1, &fds, NULL, NULL, timeout >= 0? &tv: NULL);
+        do err = sock_select(sock+1, &fds, NULL, NULL, tm_getretry(tm));
+        while (err < 0 && errno == EINTR);
+        if (err == 0) return io_strerror(IO_TIMEOUT);
     } 
-    return IO_TIMEOUT; /* can't get here */
+    return io_strerror(IO_TIMEOUT); /* can't get here */
 }
 
 /*-------------------------------------------------------------------------*\
@@ -176,18 +198,15 @@ int sock_send(p_sock ps, const char *data, size_t count, size_t *sent,
     while (put < 0 && errno == EINTR);
     /* deal with failure */
     if (put <= 0) {
-        struct timeval tv;
         fd_set fds;
         /* in any case, nothing has been sent */
         *sent = 0;
         /* here we know the connection has been closed */
         if (errno == EPIPE) return IO_CLOSED;
         /* run select to avoid busy wait */
-        tv.tv_sec = timeout / 1000;
-        tv.tv_usec = (timeout % 1000) * 1000;
         FD_ZERO(&fds);
         FD_SET(sock, &fds);
-        if (select(sock+1, NULL, &fds, NULL, timeout >= 0? &tv: NULL) <= 0) {
+        if (sock_select(sock+1, NULL, &fds, NULL, timeout) <= 0) {
             /* here the call was interrupted. calling again might work */
             if (errno == EINTR) return IO_RETRY;
             /* here there was no data before timeout */
@@ -213,15 +232,12 @@ int sock_sendto(p_sock ps, const char *data, size_t count, size_t *sent,
     do put = sendto(sock, data, count, 0, addr, addr_len);  
     while (put < 0 && errno == EINTR);
     if (put <= 0) {
-        struct timeval tv;
         fd_set fds;
         *sent = 0;
         if (errno == EPIPE) return IO_CLOSED;
-        tv.tv_sec = timeout / 1000;
-        tv.tv_usec = (timeout % 1000) * 1000;
         FD_ZERO(&fds);
         FD_SET(sock, &fds);
-        if (select(sock+1, NULL, &fds, NULL, timeout >= 0? &tv: NULL) <= 0) {
+        if (sock_select(sock+1, NULL, &fds, NULL, timeout) <= 0) {
             if (errno == EINTR) return IO_RETRY;
             else return IO_TIMEOUT;
         } else return IO_DONE;
@@ -242,16 +258,13 @@ int sock_recv(p_sock ps, char *data, size_t count, size_t *got, int timeout)
     do taken = read(sock, data, count);  
     while (taken < 0 && errno == EINTR);
     if (taken <= 0) {
-        struct timeval tv;
         fd_set fds;
         int ret;
         *got = 0;
         if (taken == 0) return IO_CLOSED;
-        tv.tv_sec = timeout / 1000;
-        tv.tv_usec = (timeout % 1000) * 1000;
         FD_ZERO(&fds);
         FD_SET(sock, &fds);
-        ret = select(sock+1, &fds, NULL, NULL, timeout >= 0 ? &tv : NULL);
+        ret = sock_select(sock+1, &fds, NULL, NULL, timeout);
         if (ret < 0 && errno == EINTR) return IO_RETRY;
         if (ret == 0) return IO_TIMEOUT;
         else return IO_DONE;
@@ -273,16 +286,13 @@ int sock_recvfrom(p_sock ps, char *data, size_t count, size_t *got,
     do taken = recvfrom(sock, data, count, 0, addr, addr_len);  
     while (taken < 0 && errno == EINTR);
     if (taken <= 0) {
-        struct timeval tv;
         fd_set fds;
         int ret;
         *got = 0;
         if (taken == 0) return IO_CLOSED;
-        tv.tv_sec = timeout / 1000;
-        tv.tv_usec = (timeout % 1000) * 1000;
         FD_ZERO(&fds);
         FD_SET(sock, &fds);
-        ret = select(sock+1, &fds, NULL, NULL, timeout >= 0 ? &tv : NULL);
+        ret = sock_select(sock+1, &fds, NULL, NULL, timeout);
         if (ret < 0 && errno == EINTR) return IO_RETRY;
         if (ret == 0) return IO_TIMEOUT;
         else return IO_DONE;
@@ -315,53 +325,98 @@ void sock_setnonblocking(p_sock ps)
 /*-------------------------------------------------------------------------*\
 * Error translation functions
 \*-------------------------------------------------------------------------*/
+/* return error messages for the known errors reported by gethostbyname */
 const char *sock_hoststrerror(void)
 {
     switch (h_errno) {
         case HOST_NOT_FOUND: return "host not found";
-        case NO_ADDRESS: return "unable to resolve host name";
+        case NO_ADDRESS: return "valid host but no ip found";
         case NO_RECOVERY: return "name server error";
         case TRY_AGAIN: return "name server unavailable, try again later";
         default: return "unknown error";
     }
 }
 
-static const char *sock_createstrerror(void)
+/* return error messages for the known errors reported by socket */
+static const char *sock_createstrerror(int err)
 {
-    switch (errno) {
+    switch (err) {
+        case EPROTONOSUPPORT: return "protocol not supported";
         case EACCES: return "access denied";
-        case EMFILE: return "descriptor table is full";
-        case ENFILE: return "too many open files";
+        case EMFILE: return "process file table is full";
+        case ENFILE: return "kernel file table is full";
+        case EINVAL: return "unknown protocol or family";
         case ENOBUFS: return "insuffucient buffer space";
         default: return "unknown error";
     }
 }
 
-static const char *sock_bindstrerror(void)
+/* return error messages for the known errors reported by accept */
+static const char *sock_acceptstrerror(int err)
 {
-    switch (errno) {
+    switch (err) {
+        case EWOULDBLOCK: return io_strerror(IO_RETRY);
         case EBADF: return "invalid descriptor";
-        case EINVAL: return "socket already bound";
-        case EACCES: return "access denied";
-        case ENOTSOCK: return "not a socket descriptor";
+        case ENOBUFS: case ENOMEM: return "insuffucient buffer space";
+        case ENOTSOCK: return "descriptor not a socket";
+        case EOPNOTSUPP: return "not supported";
+        case EINTR: return "call interrupted";
+        case ECONNABORTED: return "connection aborted";
+        case EINVAL: return "not listening";
+        case EMFILE: return "process file table is full";
+        case ENFILE: return "kernel file table is full";
+        case EFAULT: return "invalid memory address";
+        default: return "unknown error";
+    }
+}
+
+
+/* return error messages for the known errors reported by bind */
+static const char *sock_bindstrerror(int err)
+{
+    switch (err) {
+        case EBADF: return "invalid descriptor";
+        case ENOTSOCK: return "descriptor not a socket";
+        case EADDRNOTAVAIL: return "address unavailable in local host";
         case EADDRINUSE: return "address already in use";
-        case EADDRNOTAVAIL: return "address unavailable";
+        case EINVAL: return "already bound";
+        case EACCES: return "access denied";
+        case EFAULT: return "invalid memory address";
         case ENOMEM: return "out of memory";
         default: return "unknown error";
     }
 }
 
-static const char *sock_connectstrerror(void)
+/* return error messages for the known errors reported by listen */
+static const char *sock_listenstrerror(int err)
 {
-    switch (errno) {
+    switch (err) {
+        case EADDRINUSE: return "local address already in use";
         case EBADF: return "invalid descriptor";
-        case ENOTSOCK: return "not a socket descriptor";
-        case EADDRNOTAVAIL: return "address not availabe";
-        case ETIMEDOUT: return "connection timed out";
+        case ENOTSOCK: return "descriptor not a socket";
+        case EOPNOTSUPP: return "not supported";
+        default: return "unknown error";
+    }
+}
+
+/* return error messages for the known errors reported by connect */
+static const char *sock_connectstrerror(int err)
+{
+    switch (err) {
+        case EBADF: return "invalid descriptor";
+        case EFAULT: return "invalid memory address";
+        case ENOTSOCK: return "descriptor not a socket";
+        case EADDRNOTAVAIL: return "address not available in local host";
+        case EISCONN: return "already connected";
         case ECONNREFUSED: return "connection refused";
-        case EACCES: return "access denied";
+        case ETIMEDOUT: return io_strerror(IO_TIMEOUT);
         case ENETUNREACH: return "network is unreachable";
-        case EADDRINUSE: return "address already in use";
+        case EADDRINUSE: return "local address already in use";
+        case EINPROGRESS: return "would block";
+        case EALREADY: return "connect already in progress";
+        case EAGAIN: return "not enough free ports";
+        case EAFNOSUPPORT: return "address family not supported";
+        case EPERM: return "broadcast not enabled or firewall block";
         default: return "unknown error";
     }
 }