add support for opensolaris

[deb_libnfs.git] / lib / socket.c

diff --git a/lib/socket.c b/lib/socket.c
index dcbd1c177fd9be1d998399630ad8787be8deb441..e96636ae7fa4198774ee14e5b2ac8c4e53d703b5 100644 (file)
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -31,6 +31,9 @@
 #ifdef HAVE_SYS_FILIO_H
 #include <sys/filio.h>
 #endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -40,6 +43,8 @@
 #include "libnfs-private.h"
 #include "slist.h"
 
+static int rpc_disconnect_requeue(struct rpc_context *rpc);
+
 static void set_nonblocking(int fd)
 {
        unsigned v;
@@ -267,16 +272,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;
                }
        }
@@ -311,7 +316,7 @@ 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);
@@ -350,6 +355,29 @@ 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) {
+               close(rpc->fd);
+       }
+       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)
 {