X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=inline;f=lib%2Fsocket.c;h=bc101e7a6821b01b78d987bd5e8aad917ecfe126;hb=5a1f14543499d49219245b3c0c274ca8c35919c1;hp=2c77ef64c549d3de2f1731a7a691d2a07d74e613;hpb=5911f3e8ab7aafe22da1268116c19f4d1658be48;p=deb_libnfs.git
diff --git a/lib/socket.c b/lib/socket.c
index 2c77ef6..bc101e7 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -14,28 +14,57 @@
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*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include
#include
-#include
#include
-#include
#include
#include
#include
#include
-#include
-#include
+#ifdef HAVE_SYS_FILIO_H
+#include
+#endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include
+#endif
+#include
#include "libnfs.h"
#include "libnfs-raw.h"
#include "libnfs-private.h"
#include "slist.h"
+#ifdef WIN32
+//has to be included after stdlib!!
+#include "win32_errnowrapper.h"
+#endif
+
+
+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)
@@ -75,7 +104,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;
@@ -102,15 +135,43 @@ 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;
}
+ if (rpc->is_udp) {
+ char *buf;
+ socklen_t socklen = sizeof(rpc->udp_src);
+
+ buf = malloc(available);
+ if (buf == NULL) {
+ rpc_set_error(rpc, "Failed to malloc buffer for recvfrom");
+ return -1;
+ }
+ count = recvfrom(rpc->fd, buf, available, MSG_DONTWAIT, (struct sockaddr *)&rpc->udp_src, &socklen);
+ if (count < 0) {
+ rpc_set_error(rpc, "Failed recvfrom: %s", strerror(errno));
+ free(buf);
+ }
+ if (rpc_process_pdu(rpc, buf, count) != 0) {
+ rpc_set_error(rpc, "Invalid/garbage pdu received from server. Ignoring PDU");
+ free(buf);
+ return -1;
+ }
+ free(buf);
+ return 0;
+ }
+
/* read record marker, 4 bytes at the beginning of every pdu */
if (rpc->inbuf == NULL) {
rpc->insize = 4;
@@ -123,7 +184,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;
@@ -159,7 +224,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;
@@ -189,11 +258,15 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
int rpc_service(struct rpc_context *rpc, int revents)
{
if (revents & POLLERR) {
+#ifdef WIN32
+ char err = 0;
+#else
int err = 0;
+#endif
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;
}
@@ -218,7 +291,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;
}
@@ -235,16 +308,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;
}
}
@@ -252,7 +325,6 @@ int rpc_service(struct rpc_context *rpc, int revents)
return 0;
}
-
int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc_cb cb, void *private_data)
{
struct sockaddr_storage s;
@@ -264,6 +336,11 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
return -1;
}
+ if (rpc->is_udp != 0) {
+ rpc_set_error(rpc, "Trying to connect on UDP socket");
+ return -1;
+ }
+
sin->sin_family = AF_INET;
sin->sin_port = htons(port);
if (inet_pton(AF_INET, server, &sin->sin_addr) != 1) {
@@ -274,10 +351,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;
}
@@ -289,9 +366,54 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
rpc->connect_cb = cb;
rpc->connect_data = private_data;
+
+#if !defined(WIN32)
+ /* Some systems allow you to set capabilities on an executable
+ * to allow the file to be executed with privilege to bind to
+ * privileged system ports, even if the user is not root.
+ *
+ * Opportunistically try to bind the socket to a low numbered
+ * system port in the hope that the user is either root or the
+ * executable has the CAP_NET_BIND_SERVICE.
+ *
+ * As soon as we fail the bind() with EACCES we know we will never
+ * be able to bind to a system port so we terminate the loop.
+ *
+ * On linux, use
+ * sudo setcap 'cap_net_bind_service=+ep' /path/executable
+ * to make the executable able to bind to a system port.
+ */
+ if (1) {
+ int port;
+ int one = 1;
+
+ setsockopt(rpc->fd, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one));
+
+ for (port = 200; port < 500; port++) {
+ struct sockaddr_in sin;
+
+ memset(&sin, 0, sizeof(sin));
+ sin.sin_port = htons(port);
+ sin.sin_family = AF_INET;
+ sin.sin_addr.s_addr = 0;
+
+ if (bind(rpc->fd, (struct sockaddr *)&sin, sizeof(struct sockaddr_in)) != 0 && errno != EACCES) {
+ /* we didnt get EACCES, so try again */
+ continue;
+ }
+ break;
+ }
+ }
+#endif
+
set_nonblocking(rpc->fd);
- if (connect(rpc->fd, (struct sockaddr *)&s, socksize) != 0 && errno != EINPROGRESS) {
+#if defined(WIN32)
+ if (connect(rpc->fd, (struct sockaddr *)&s, socksize) == 0 && errno != EINPROGRESS )
+#else
+ if (connect(rpc->fd, (struct sockaddr *)&s, socksize) != 0 && errno != EINPROGRESS)
+#endif
+ {
rpc_set_error(rpc, "connect() to server failed");
return -1;
}
@@ -302,7 +424,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;
@@ -312,3 +438,128 @@ 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)
+{
+ struct addrinfo *ai = NULL;
+ char service[6];
+
+ if (rpc->is_udp == 0) {
+ rpc_set_error(rpc, "Cant not bind UDP. Not UDP context");
+ return -1;
+ }
+
+ 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.");
+ return -1;
+ }
+
+ switch(ai->ai_family) {
+ case AF_INET:
+ rpc->fd = socket(ai->ai_family, SOCK_DGRAM, 0);
+ if (rpc->fd == -1) {
+ rpc_set_error(rpc, "Failed to create UDP socket: %s", strerror(errno));
+ freeaddrinfo(ai);
+ return -1;
+ }
+
+ if (bind(rpc->fd, (struct sockaddr *)ai->ai_addr, sizeof(struct sockaddr_in)) != 0) {
+ rpc_set_error(rpc, "Failed to bind to UDP socket: %s",strerror(errno));
+ freeaddrinfo(ai);
+ return -1;
+ }
+ break;
+ default:
+ rpc_set_error(rpc, "Can not handle UPD sockets of family %d yet", ai->ai_family);
+ freeaddrinfo(ai);
+ return -1;
+ }
+
+ freeaddrinfo(ai);
+
+ return 0;
+}
+
+int rpc_set_udp_destination(struct rpc_context *rpc, char *addr, int port, int is_broadcast)
+{
+ struct addrinfo *ai = NULL;
+ char service[6];
+
+ if (rpc->is_udp == 0) {
+ rpc_set_error(rpc, "Can not set destination sockaddr. Not UDP context");
+ return -1;
+ }
+
+ 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.");
+ return -1;
+ }
+
+ if (rpc->udp_dest) {
+ free(rpc->udp_dest);
+ rpc->udp_dest = NULL;
+ }
+ rpc->udp_dest = malloc(ai->ai_addrlen);
+ if (rpc->udp_dest == NULL) {
+ rpc_set_error(rpc, "Out of memory. Failed to allocate sockaddr structure");
+ return -1;
+ }
+ memcpy(rpc->udp_dest, ai->ai_addr, ai->ai_addrlen);
+ freeaddrinfo(ai);
+
+ rpc->is_broadcast = is_broadcast;
+ setsockopt(rpc->fd, SOL_SOCKET, SO_BROADCAST, (char *)&is_broadcast, sizeof(is_broadcast));
+
+ return 0;
+}
+
+struct sockaddr *rpc_get_recv_sockaddr(struct rpc_context *rpc)
+{
+ return (struct sockaddr *)&rpc->udp_src;
+}
+
+int rpc_queue_length(struct rpc_context *rpc)
+{
+ int i=0;
+ struct rpc_pdu *pdu;
+
+ for(pdu = rpc->outqueue; pdu; pdu = pdu->next) {
+ i++;
+ }
+ for(pdu = rpc->waitpdu; pdu; pdu = pdu->next) {
+ i++;
+ }
+ return i;
+}