X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Fsocket.c;h=d025e070e017091e1f796178c139e8ff44c7cf48;hb=1c1e09a;hp=653853549e45b29627eb5be44c631460679da098;hpb=7057e733c1465661c410b65d90e4c5d0939f1617;p=deb_libnfs.git

diff --git a/lib/socket.c b/lib/socket.c
index 6538535..d025e07 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -24,10 +24,11 @@
 
 #ifdef WIN32
 #include "win32_compat.h"
-#else
+#endif
+
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
-#include <netdb.h>
-#endif/*WIN32*/
+#endif
 
 #ifdef HAVE_POLL_H
 #include <poll.h>
@@ -45,18 +46,28 @@
 #include <sys/socket.h>
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
+#ifdef HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
+#endif
+
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
 #ifdef HAVE_SYS_FILIO_H
 #include <sys/filio.h>
 #endif
+
 #ifdef HAVE_SYS_SOCKIO_H
 #include <sys/sockio.h>
 #endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
 #include <sys/types.h>
 #include "libnfs-zdr.h"
 #include "libnfs.h"
@@ -69,7 +80,6 @@
 #include "win32_errnowrapper.h"
 #endif
 
-
 static int rpc_reconnect_requeue(struct rpc_context *rpc);
 static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_storage *s);
 
@@ -85,6 +95,26 @@ static void set_nonblocking(int fd)
 #endif //FIXME
 }
 
+#ifdef HAVE_NETINET_TCP_H
+int set_tcp_sockopt(int sockfd, int optname, int value)
+{
+	int level;
+
+	#if defined(__FreeBSD__) || defined(__sun) || (defined(__APPLE__) && defined(__MACH__))
+	struct protoent *buf;
+
+	if ((buf = getprotobyname("tcp")) != NULL)
+		level = buf->p_proto;
+	else
+		return -1;
+	#else
+		level = SOL_TCP;
+	#endif
+
+	return setsockopt(sockfd, level, optname, (char *)&value, sizeof(value));
+}
+#endif
+
 int rpc_get_fd(struct rpc_context *rpc)
 {
 	assert(rpc->magic == RPC_CONTEXT_MAGIC);
@@ -156,8 +186,6 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 
 	assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
-	assert(rpc->magic == RPC_CONTEXT_MAGIC);
-
 	if (ioctl(rpc->fd, FIONREAD, &available) != 0) {
 		rpc_set_error(rpc, "Ioctl FIONREAD returned error : %d. Closing socket.", errno);
 		return -1;
@@ -181,6 +209,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 		if (count < 0) {
 			rpc_set_error(rpc, "Failed recvfrom: %s", strerror(errno));
 			free(buf);
+			return -1;
 		}
 		if (rpc_process_pdu(rpc, buf, count) != 0) {
 			rpc_set_error(rpc, "Invalid/garbage pdu received from server. Ignoring PDU");
@@ -222,7 +251,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 	pdu_size = rpc_get_pdu_size(rpc->inbuf);
 	if (rpc->insize < pdu_size) {
 		unsigned char *buf;
-		
+
 		buf = malloc(pdu_size);
 		if (buf == NULL) {
 			rpc_set_error(rpc, "Failed to allocate buffer of %d bytes for pdu, errno:%d. Closing socket.", pdu_size, errno);
@@ -251,14 +280,17 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 	rpc->inpos += count;
 
 	if (rpc->inpos == rpc->insize) {
-		if (rpc_process_pdu(rpc, rpc->inbuf, pdu_size) != 0) {
-			rpc_set_error(rpc, "Invalid/garbage pdu received from server. Closing socket");
-			return -1;
-		}
-		free(rpc->inbuf);
+		char *buf = rpc->inbuf;
+
 		rpc->inbuf  = NULL;
 		rpc->insize = 0;
 		rpc->inpos  = 0;
+
+		if (rpc_process_pdu(rpc, buf, pdu_size) != 0) {
+			rpc_set_error(rpc, "Invalid/garbage pdu received from server. Closing socket");
+			return -1;
+		}
+		free(buf);
 	}
 
 	return 0;
@@ -360,6 +392,17 @@ void rpc_unset_autoreconnect(struct rpc_context *rpc)
 	rpc->auto_reconnect = 0;
 }
 
+void rpc_set_tcp_syncnt(struct rpc_context *rpc, int v)
+{
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	rpc->tcp_syncnt = v;
+}
+
+#ifndef TCP_SYNCNT
+#define TCP_SYNCNT        7
+#endif
+
 static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_storage *s)
 {
 	int socksize;
@@ -370,6 +413,20 @@ static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_s
 	case AF_INET:
 		socksize = sizeof(struct sockaddr_in);
 		rpc->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+#ifdef HAVE_NETINET_TCP_H
+		if (rpc->tcp_syncnt != RPC_PARAM_UNDEFINED) {
+			set_tcp_sockopt(rpc->fd, TCP_SYNCNT, rpc->tcp_syncnt);
+		}
+#endif
+		break;
+	case AF_INET6:
+		socksize = sizeof(struct sockaddr_in6);
+		rpc->fd = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
+#ifdef HAVE_NETINET_TCP_H
+		if (rpc->tcp_syncnt != RPC_PARAM_UNDEFINED) {
+			set_tcp_sockopt(rpc->fd, TCP_SYNCNT, rpc->tcp_syncnt);
+		}
+#endif
 		break;
 	default:
 		rpc_set_error(rpc, "Can not handle AF_FAMILY:%d", s->ss_family);
@@ -400,7 +457,7 @@ static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_s
 	 * binding will usually succeed.
 	 */
 	{
-		struct sockaddr_in sin;
+		struct sockaddr_storage ss;
 		static int portOfs = 0;
 		const int firstPort = 512;	/* >= 512 according to Sun docs */
 		const int portCount = IPPORT_RESERVED - firstPort;
@@ -417,12 +474,26 @@ static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_s
 
 			/* skip well-known ports */
 			if (!getservbyport(port, "tcp")) {
-				memset(&sin, 0, sizeof(sin));
-				sin.sin_port        = port;
-				sin.sin_family      = AF_INET;
-				sin.sin_addr.s_addr = 0;
+				memset(&ss, 0, sizeof(ss));
+
+				switch (s->ss_family) {
+				case AF_INET:
+					((struct sockaddr_in *)&ss)->sin_port = port;
+					((struct sockaddr_in *)&ss)->sin_family      = AF_INET;
+#ifdef HAVE_SOCKADDR_LEN
+					((struct sockaddr_in *)&ss)->sin_len = sizeof(struct sockaddr_in);
+#endif
+					break;
+				case AF_INET6:
+					((struct sockaddr_in6 *)&ss)->sin6_port = port;
+					((struct sockaddr_in6 *)&ss)->sin6_family      = AF_INET6;
+#ifdef HAVE_SOCKADDR_LEN
+					((struct sockaddr_in6 *)&ss)->sin6_len = sizeof(struct sockaddr_in);
+#endif
+					break;
+				}
 
-				rc = bind(rpc->fd, (struct sockaddr *)&sin, sizeof(struct sockaddr_in));
+				rc = bind(rpc->fd, (struct sockaddr *)&ss, socksize);
 #if !defined(WIN32)
 				/* we got EACCES, so don't try again */
 				if (rc != 0 && errno == EACCES)
@@ -437,14 +508,14 @@ static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_s
 	if (connect(rpc->fd, (struct sockaddr *)s, socksize) != 0 && errno != EINPROGRESS) {
 		rpc_set_error(rpc, "connect() to server failed. %s(%d)", strerror(errno), errno);
 		return -1;
-	}		
+	}
 
 	return 0;
-}	    
+}
 
 int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc_cb cb, void *private_data)
 {
-	struct sockaddr_in *sin = (struct sockaddr_in *)&rpc->s;
+	struct addrinfo *ai = NULL;
 
 	assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
@@ -460,18 +531,25 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
 
 	rpc->auto_reconnect = 0;
 
-	sin->sin_family = AF_INET;
-	sin->sin_port   = htons(port);
-	if (inet_pton(AF_INET, server, &sin->sin_addr) != 1) {
-		rpc_set_error(rpc, "Not a valid server ip address");
+	if (getaddrinfo(server, NULL, NULL, &ai) != 0) {
+		rpc_set_error(rpc, "Invalid address:%s. "
+			      "Can not resolv into IPv4/v6 structure.", server);
 		return -1;
-	}
-
+ 	}
 
-	switch (rpc->s.ss_family) {
+	switch (ai->ai_family) {
 	case AF_INET:
+		((struct sockaddr_in *)&rpc->s)->sin_family = ai->ai_family;
+		((struct sockaddr_in *)&rpc->s)->sin_port   = htons(port);
 #ifdef HAVE_SOCKADDR_LEN
-		sin->sin_len = sizeof(struct sockaddr_in);
+		((struct sockaddr_in *)&rpc->s)->sin_len = sizeof(struct sockaddr_in);
+#endif
+		break;
+	case AF_INET6:
+		((struct sockaddr_in6 *)&rpc->s)->sin6_family = ai->ai_family;
+		((struct sockaddr_in6 *)&rpc->s)->sin6_port   = htons(port);
+#ifdef HAVE_SOCKADDR_LEN
+		((struct sockaddr_in6 *)&rpc->s)->sin6_len = sizeof(struct sockaddr_in6);
 #endif
 		break;
 	}
@@ -479,12 +557,14 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
 	rpc->connect_cb  = cb;
 	rpc->connect_data = private_data;
 
+	freeaddrinfo(ai);
+
 	if (rpc_connect_sockaddr_async(rpc, &rpc->s) != 0) {
 		return -1;
 	}
 
 	return 0;
-}	    
+}
 
 int rpc_disconnect(struct rpc_context *rpc, char *error)
 {
@@ -569,7 +649,7 @@ int rpc_bind_udp(struct rpc_context *rpc, char *addr, int 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.");
+			      "Can not resolv into IPv4/v6 structure.", addr);
 		return -1;
  	}
 
@@ -577,13 +657,13 @@ int rpc_bind_udp(struct rpc_context *rpc, char *addr, int port)
 	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)); 
+			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)); 
+			rpc_set_error(rpc, "Failed to bind to UDP socket: %s",strerror(errno));
 			freeaddrinfo(ai);
 			return -1;
 		}
@@ -614,7 +694,7 @@ int rpc_set_udp_destination(struct rpc_context *rpc, char *addr, int port, int i
 	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.");
+			      "Can not resolv into IPv4/v6 structure.", addr);
 		return -1;
  	}
 
@@ -659,3 +739,10 @@ int rpc_queue_length(struct rpc_context *rpc)
 	}
 	return i;
 }
+
+void rpc_set_fd(struct rpc_context *rpc, int fd)
+{
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	rpc->fd = fd;
+}