X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Fsocket.c;h=e96636ae7fa4198774ee14e5b2ac8c4e53d703b5;hb=647d2ea11cccea1e96629142abbe25de8ef1c7b5;hp=a0ededa61a625f7cc463b1a2d4da8cca78dcf1de;hpb=070287e5162654027f63525c66de7a6598514222;p=deb_libnfs.git

diff --git a/lib/socket.c b/lib/socket.c
index a0ededa..e96636a 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -15,6 +15,9 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -25,12 +28,23 @@
 #include <rpc/rpc.h>
 #include <rpc/xdr.h>
 #include <arpa/inet.h>
+#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>
+#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)
 {
 	unsigned v;
@@ -258,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;
 		}
 	}
@@ -302,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);
@@ -340,3 +354,110 @@ 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)
+{
+	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;
+	}
+
+	snprintf(service, 6, "%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;
+	}
+
+	snprintf(service, 6, "%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, &is_broadcast, sizeof(is_broadcast));
+
+	return 0;
+}
+
+struct sockaddr *rpc_get_recv_sockaddr(struct rpc_context *rpc)
+{
+	return (struct sockaddr *)&rpc->udp_src;
+}