Merge branch 'win32' into win32-3

[deb_libnfs.git] / lib / socket.c

diff --git a/lib/socket.c b/lib/socket.c
index a26afe1e6b194e46bea861e1974705b9d56a5bd1..e9c103e55b0cd124ce04baaeef1721fb43d5e5fd 100644 (file)
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -15,30 +15,53 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#if defined(WIN32)
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <basetsd.h>
+#define ssize_t SSIZE_T
+#define MSG_DONTWAIT 0
+#else
+#include <unistd.h>
+#include <poll.h>
+#include <arpa/inet.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <fcntl.h>
-#include <poll.h>
 #include <string.h>
 #include <errno.h>
 #include <rpc/rpc.h>
 #include <rpc/xdr.h>
-#include <arpa/inet.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_SYS_FILIO_H
+#include <sys/filio.h>
+#endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-private.h"
 #include "slist.h"
 
+static int rpc_disconnect_requeue(struct rpc_context *rpc);
+
 static void set_nonblocking(int fd)
 {
+#if defined(WIN32)
+#else
        unsigned v;
        v = fcntl(fd, F_GETFL, 0);
         fcntl(fd, F_SETFL, v | O_NONBLOCK);
+#endif
 }
 
 int rpc_get_fd(struct rpc_context *rpc)
@@ -78,7 +101,11 @@ static int rpc_write_to_socket(struct rpc_context *rpc)
 
                total = rpc->outqueue->outdata.size;
 
+#if defined(WIN32)
+               count = send(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written, 0);
+#else
                count = write(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written);
+#endif
                if (count == -1) {
                        if (errno == EAGAIN || errno == EWOULDBLOCK) {
                                return 0;
@@ -105,7 +132,11 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
        int pdu_size;
        ssize_t count;
 
+#if defined(WIN32)
+       if (ioctlsocket(rpc->fd, FIONREAD, &available) != 0) {
+#else
        if (ioctl(rpc->fd, FIONREAD, &available) != 0) {
+#endif
                rpc_set_error(rpc, "Ioctl FIONREAD returned error : %d. Closing socket.", errno);
                return -1;
        }
@@ -149,7 +180,11 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
        if (rpc->inpos < 4) {
                size = 4 - rpc->inpos;
 
+#if defined(WIN32)
+               count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
+#else
                count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
+#endif
                if (count == -1) {
                        if (errno == EINTR) {
                                return 0;
@@ -185,7 +220,11 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
                size = rpc->insize - rpc->inpos;
        }
 
+#if defined(WIN32)
+       count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
+#else
        count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
+#endif
        if (count == -1) {
                if (errno == EINTR) {
                        return 0;
@@ -261,16 +300,16 @@ int rpc_service(struct rpc_context *rpc, int revents)
                return 0;
        }
 
-       if (revents & POLLOUT && rpc->outqueue != NULL) {
-               if (rpc_write_to_socket(rpc) != 0) {
-                       rpc_set_error(rpc, "write to socket failed");
-                       return -1;
+       if (revents & POLLIN) {
+               if (rpc_read_from_socket(rpc) != 0) {
+                       rpc_disconnect_requeue(rpc);
+                       return 0;
                }
        }
 
-       if (revents & POLLIN) {
-               if (rpc_read_from_socket(rpc) != 0) {
-                       rpc_disconnect(rpc, rpc_get_error(rpc));
+       if (revents & POLLOUT && rpc->outqueue != NULL) {
+               if (rpc_write_to_socket(rpc) != 0) {
+                       rpc_set_error(rpc, "write to socket failed");
                        return -1;
                }
        }
@@ -305,10 +344,10 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
        switch (s.ss_family) {
        case AF_INET:
                socksize = sizeof(struct sockaddr_in);
-#ifdef HAVE_SOCK_SIN_LEN
+#ifdef HAVE_SOCKADDR_LEN
                sin->sin_len = socksize;
 #endif
-               rpc->fd = socket(AF_INET, SOCK_STREAM, 0);
+               rpc->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
                break;
        }
 
@@ -333,7 +372,11 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
 int rpc_disconnect(struct rpc_context *rpc, char *error)
 {
        if (rpc->fd != -1) {
+#if defined(WIN32)
+               closesocket(rpc->fd);
+#else
                close(rpc->fd);
+#endif
        }
        rpc->fd  = -1;
 
@@ -344,6 +387,33 @@ int rpc_disconnect(struct rpc_context *rpc, char *error)
        return 0;
 }
 
+/* disconnect but do not error all PDUs, just move pdus in-flight back to the outqueue */
+static int rpc_disconnect_requeue(struct rpc_context *rpc)
+{
+       struct rpc_pdu *pdu;
+
+       if (rpc->fd != -1) {
+#if defined(WIN32)
+               closesocket(rpc->fd);
+#else
+               close(rpc->fd);
+#endif
+       }
+       rpc->fd  = -1;
+
+       rpc->is_connected = 0;
+
+       /* socket is closed so we will not get any replies to any commands
+        * in flight. Move them all over from the waitpdu queue back to the out queue
+        */
+       for (pdu=rpc->waitpdu; pdu; pdu=pdu->next) {
+               SLIST_REMOVE(&rpc->waitpdu, pdu);
+               SLIST_ADD(&rpc->outqueue, pdu);
+       }
+
+       return 0;
+}
+
 
 int rpc_bind_udp(struct rpc_context *rpc, char *addr, int port)
 {
@@ -355,7 +425,7 @@ int rpc_bind_udp(struct rpc_context *rpc, char *addr, int port)
                return -1;
        }
 
-       snprintf(service, 6, "%d", port);
+       sprintf(service, "%d", port);
        if (getaddrinfo(addr, service, NULL, &ai) != 0) {
                rpc_set_error(rpc, "Invalid address:%s. "
                        "Can not resolv into IPv4/v6 structure.");
@@ -398,7 +468,7 @@ int rpc_set_udp_destination(struct rpc_context *rpc, char *addr, int port, int i
                return -1;
        }
 
-       snprintf(service, 6, "%d", port);
+       sprintf(service, "%d", port);
        if (getaddrinfo(addr, service, NULL, &ai) != 0) {
                rpc_set_error(rpc, "Invalid address:%s. "
                        "Can not resolv into IPv4/v6 structure.");
@@ -422,3 +492,8 @@ int rpc_set_udp_destination(struct rpc_context *rpc, char *addr, int port, int i
 
        return 0;
 }
+
+struct sockaddr *rpc_get_recv_sockaddr(struct rpc_context *rpc)
+{
+       return (struct sockaddr *)&rpc->udp_src;
+}