X-Git-Url: https://git.piment-noir.org/?p=deb_libnfs.git;a=blobdiff_plain;f=lib%2Fsocket.c;h=dcbd1c177fd9be1d998399630ad8787be8deb441;hp=96bc695c60c105f518d0a56663f0f55cac19be5f;hb=2e4db0d14597fdb0013fb16f24b3f872d1217397;hpb=c3d740919fa978037a9b4ff3266d116ac99fa821

diff --git a/lib/socket.c b/lib/socket.c
index 96bc695..dcbd1c1 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -32,6 +32,9 @@
 #include <sys/filio.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"
@@ -53,6 +56,11 @@ int rpc_which_events(struct rpc_context *rpc)
 {
 	int events = rpc->is_connected ? POLLIN : POLLOUT;
 
+	if (rpc->is_udp != 0) {
+		/* for udp sockets we only wait for pollin */
+		return POLLIN;
+	}
+
 	if (rpc->outqueue) {
 		events |= POLLOUT;
 	}
@@ -112,6 +120,29 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 		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;
@@ -265,6 +296,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) {
@@ -313,3 +349,87 @@ int rpc_disconnect(struct rpc_context *rpc, char *error)
 
 	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;
+}