X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Fsocket.c;h=efe87393108d5038e37869f0d354f87aedeb0a06;hb=99c14c9b8195e9b79e47ca6c059340afc01d2578;hp=e4de894c854e3e752271b1a3cb6833b400ec1a2c;hpb=f7f931c7e3a382b964ed6464125cf261e7358bf8;p=deb_libnfs.git
diff --git a/lib/socket.c b/lib/socket.c
index e4de894..efe8739 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -14,37 +14,66 @@
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, see .
*/
+#ifdef WIN32
+#include "win32_compat.h"
+#else
+#include
+#include
+#include
+#include
+#include
+#include
+#endif/*WIN32*/
+
+#if defined(WIN32)
+#include
+#include
+#include
+#define ssize_t SSIZE_T
+#define MSG_DONTWAIT 0
+#else
+#include
+#include
+#include
+#include
+#include
+#include
+#endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include
#include
-#include
#include
-#include
#include
#include
#include
#include
-#include
#ifdef HAVE_SYS_FILIO_H
#include
#endif
-#include
+#ifdef HAVE_SYS_SOCKIO_H
+#include
+#endif
#include
-#include
-#include
#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)
{
- unsigned v;
+ int v = 0;
+#if defined(WIN32)
+ long nonblocking=1;
+ v = ioctlsocket(fd, FIONBIO,&nonblocking);
+#else
v = fcntl(fd, F_GETFL, 0);
fcntl(fd, F_SETFL, v | O_NONBLOCK);
+#endif //FIXME
}
int rpc_get_fd(struct rpc_context *rpc)
@@ -84,7 +113,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;
@@ -111,10 +144,15 @@ 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;
}
+
if (available == 0) {
rpc_set_error(rpc, "Socket has been closed");
return -1;
@@ -155,7 +193,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;
@@ -191,7 +233,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;
@@ -221,11 +267,11 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
int rpc_service(struct rpc_context *rpc, int revents)
{
if (revents & POLLERR) {
- int err = 0;
+ char err = 0;
socklen_t err_size = sizeof(err);
if (getsockopt(rpc->fd, SOL_SOCKET, SO_ERROR,
- &err, &err_size) != 0 || err != 0) {
+ (char *)&err, &err_size) != 0 || err != 0) {
if (err == 0) {
err = errno;
}
@@ -250,7 +296,7 @@ int rpc_service(struct rpc_context *rpc, int revents)
socklen_t err_size = sizeof(err);
if (getsockopt(rpc->fd, SOL_SOCKET, SO_ERROR,
- &err, &err_size) != 0 || err != 0) {
+ (char *)&err, &err_size) != 0 || err != 0) {
if (err == 0) {
err = errno;
}
@@ -267,16 +313,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;
}
}
@@ -314,7 +360,7 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
#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;
}
@@ -339,7 +385,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;
@@ -350,6 +400,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)
{
@@ -361,7 +438,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.");
@@ -404,7 +481,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.");
@@ -424,7 +501,7 @@ int rpc_set_udp_destination(struct rpc_context *rpc, char *addr, int port, int i
freeaddrinfo(ai);
rpc->is_broadcast = is_broadcast;
- setsockopt(rpc->fd, SOL_SOCKET, SO_BROADCAST, &is_broadcast, sizeof(is_broadcast));
+ setsockopt(rpc->fd, SOL_SOCKET, SO_BROADCAST, (char *)&is_broadcast, sizeof(is_broadcast));
return 0;
}