X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fsocket.c;h=c746c76affeb2efe123aa3ec752040eec281be34;hb=ac559609a3893e80cd7390f0c6c9ab10ae1ca635;hp=bc101e7a6821b01b78d987bd5e8aad917ecfe126;hpb=1e1b70a24a025f6102357d1c6293e3064d31ee2a;p=deb_libnfs.git

diff --git a/lib/socket.c b/lib/socket.c
index bc101e7..c746c76 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -53,7 +53,8 @@
 #endif
 
 
-static int rpc_disconnect_requeue(struct rpc_context *rpc);
+static int rpc_reconnect_requeue(struct rpc_context *rpc);
+static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_storage *s);
 
 static void set_nonblocking(int fd)
 {
@@ -89,7 +90,7 @@ int rpc_which_events(struct rpc_context *rpc)
 
 static int rpc_write_to_socket(struct rpc_context *rpc)
 {
-	ssize_t count;
+	int64_t count;
 
 	if (rpc == NULL) {
 		return -1;
@@ -100,7 +101,7 @@ static int rpc_write_to_socket(struct rpc_context *rpc)
 	}
 
 	while (rpc->outqueue != NULL) {
-		ssize_t total;
+		int64_t total;
 
 		total = rpc->outqueue->outdata.size;
 
@@ -133,7 +134,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 	int available;
 	int size;
 	int pdu_size;
-	ssize_t count;
+	int64_t count;
 
 #if defined(WIN32)
 	if (ioctlsocket(rpc->fd, FIONREAD, &available) != 0) {
@@ -277,12 +278,16 @@ int rpc_service(struct rpc_context *rpc, int revents)
 			rpc_set_error(rpc, "rpc_service: POLLERR, "
 						"Unknown socket error.");
 		}
-		rpc->connect_cb(rpc, RPC_STATUS_ERROR, rpc->error_string, rpc->connect_data);
+		if (rpc->connect_cb != NULL) {
+			rpc->connect_cb(rpc, RPC_STATUS_ERROR, rpc->error_string, rpc->connect_data);
+		}
 		return -1;
 	}
 	if (revents & POLLHUP) {
 		rpc_set_error(rpc, "Socket failed with POLLHUP");
-		rpc->connect_cb(rpc, RPC_STATUS_ERROR, rpc->error_string, rpc->connect_data);
+		if (rpc->connect_cb != NULL) {
+			rpc->connect_cb(rpc, RPC_STATUS_ERROR, rpc->error_string, rpc->connect_data);
+		}
 		return -1;
 	}
 
@@ -298,19 +303,23 @@ int rpc_service(struct rpc_context *rpc, int revents)
 			rpc_set_error(rpc, "rpc_service: socket error "
 				  	"%s(%d) while connecting.",
 					strerror(err), err);
-			rpc->connect_cb(rpc, RPC_STATUS_ERROR,
+			if (rpc->connect_cb != NULL) {
+				rpc->connect_cb(rpc, RPC_STATUS_ERROR,
 					NULL, rpc->connect_data);
+			}
 			return -1;
 		}
 
 		rpc->is_connected = 1;
-		rpc->connect_cb(rpc, RPC_STATUS_SUCCESS, NULL, rpc->connect_data);
+		if (rpc->connect_cb != NULL) {
+			rpc->connect_cb(rpc, RPC_STATUS_SUCCESS, NULL, rpc->connect_data);
+		}
 		return 0;
 	}
 
 	if (revents & POLLIN) {
 		if (rpc_read_from_socket(rpc) != 0) {
-		  	rpc_disconnect_requeue(rpc);
+		  	rpc_reconnect_requeue(rpc);
 			return 0;
 		}
 	}
@@ -325,37 +334,28 @@ 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)
+void rpc_set_autoreconnect(struct rpc_context *rpc)
 {
-	struct sockaddr_storage s;
-	struct sockaddr_in *sin = (struct sockaddr_in *)&s;
-	int socksize;
-
-	if (rpc->fd != -1) {
-		rpc_set_error(rpc, "Trying to connect while already connected");
-		return -1;
-	}
+	rpc->auto_reconnect = 1;
+}
 
-	if (rpc->is_udp != 0) {
-		rpc_set_error(rpc, "Trying to connect on UDP socket");
-		return -1;
-	}
+void rpc_unset_autoreconnect(struct rpc_context *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");
-		return -1;
-	}
+static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_storage *s)
+{
+	int socksize;
 
-	switch (s.ss_family) {
+	switch (s->ss_family) {
 	case AF_INET:
 		socksize = sizeof(struct sockaddr_in);
-#ifdef HAVE_SOCKADDR_LEN
-		sin->sin_len = socksize;
-#endif
 		rpc->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 		break;
+	default:
+		rpc_set_error(rpc, "Can not handle AF_FAMILY:%d", s->ss_family);
+		return -1;
 	}
 
 	if (rpc->fd == -1) {
@@ -363,11 +363,6 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
 		return -1;
 	}
 
-	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.
@@ -382,47 +377,100 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
 	 * On linux, use
 	 *    sudo setcap 'cap_net_bind_service=+ep' /path/executable
 	 * to make the executable able to bind to a system port.
+	 *
+	 * On Windows, there is no concept of privileged ports. Thus
+	 * binding will usually succeed.
 	 */
-	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;
+	{
+		struct sockaddr_in sin;
+		static int portOfs = 0;
+		const int firstPort = 512;	/* >= 512 according to Sun docs */
+		const int portCount = IPPORT_RESERVED - firstPort;
+		int startOfs = portOfs, port, rc;
+
+		do {
+			rc = -1;
+			port = htons(firstPort + portOfs);
+			portOfs = (portOfs + 1) % portCount;
+
+			/* 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;
+
+				rc = bind(rpc->fd, (struct sockaddr *)&sin, sizeof(struct sockaddr_in));
+#if !defined(WIN32)
+				/* we got EACCES, so don't try again */
+				if (rc != 0 && errno == EACCES)
+					break;
+#endif
 			}
-			break;
-		}
+		} while (rc != 0 && portOfs != startOfs);
 	}
-#endif
 
 	set_nonblocking(rpc->fd);
 
 #if defined(WIN32)
-	if (connect(rpc->fd, (struct sockaddr *)&s, socksize) == 0 && errno != EINPROGRESS   )
+	if (connect(rpc->fd, (struct sockaddr *)s, socksize) == 0 && errno != EINPROGRESS   )
 #else
-	if (connect(rpc->fd, (struct sockaddr *)&s, socksize) != 0 && errno != EINPROGRESS) 
+	if (connect(rpc->fd, (struct sockaddr *)s, socksize) != 0 && errno != EINPROGRESS) 
 #endif
 	{
-		rpc_set_error(rpc, "connect() to server failed");
+	  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;
+
+	if (rpc->fd != -1) {
+		rpc_set_error(rpc, "Trying to connect while already connected");
+		return -1;
+	}
+
+	if (rpc->is_udp != 0) {
+		rpc_set_error(rpc, "Trying to connect on UDP socket");
+		return -1;
+	}
+
+	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");
+		return -1;
+	}
+
+
+	switch (rpc->s.ss_family) {
+	case AF_INET:
+#ifdef HAVE_SOCKADDR_LEN
+		sin->sin_len = sizeof(struct sockaddr_in);
+#endif
+		break;
+	}
+
+	rpc->connect_cb  = cb;
+	rpc->connect_data = private_data;
+
+	if (rpc_connect_sockaddr_async(rpc, &rpc->s) != 0) {
+		return -1;
+	}
+
+	return 0;
+}	    
+
 int rpc_disconnect(struct rpc_context *rpc, char *error)
 {
+	rpc_unset_autoreconnect(rpc);
+
 	if (rpc->fd != -1) {
 #if defined(WIN32)
 		closesocket(rpc->fd);
@@ -439,8 +487,19 @@ 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)
+static void reconnect_cb(struct rpc_context *rpc, int status, void *data _U_, void *private_data)
+{
+	if (status != RPC_STATUS_SUCCESS) {
+		rpc_error_all_pdus(rpc, "RPC ERROR: Failed to reconnect async");
+		return;
+	}
+
+	rpc->is_connected = 1;
+	rpc->connect_cb   = NULL;
+}
+
+/* disconnect but do not error all PDUs, just move pdus in-flight back to the outqueue and reconnect */
+static int rpc_reconnect_requeue(struct rpc_context *rpc)
 {
 	struct rpc_pdu *pdu;
 
@@ -461,6 +520,17 @@ static int rpc_disconnect_requeue(struct rpc_context *rpc)
 	for (pdu=rpc->waitpdu; pdu; pdu=pdu->next) {
 		SLIST_REMOVE(&rpc->waitpdu, pdu);
 		SLIST_ADD(&rpc->outqueue, pdu);
+		/* we have to re-send the whole pdu again */
+		pdu->written = 0;
+	}
+
+	if (rpc->auto_reconnect != 0) {
+		rpc->connect_cb  = reconnect_cb;
+
+		if (rpc_connect_sockaddr_async(rpc, &rpc->s) != 0) {
+			rpc_error_all_pdus(rpc, "RPC ERROR: Failed to reconnect async");
+			return -1;
+		}
 	}
 
 	return 0;