X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs-sync.c;h=cfeb5759989ae3835172001e6719efca138758e0;hb=41d82d7d825b9b4e73bb227f5b2fafa86067cba0;hp=0a57c7b97e562c1844fd0b183271d1ff8fea2b7f;hpb=41a6209bef3ab460c1da36d8ba23c2b77da30bf1;p=deb_libnfs.git

diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index 0a57c7b..cfeb575 100644
--- a/lib/libnfs-sync.c
+++ b/lib/libnfs-sync.c
@@ -18,22 +18,38 @@
  * High level api to nfs filesystems
  */
 
+#if defined (WIN32)
+#include <winsock2.h>
+#define DllExport
+#else
+#include <strings.h>
+#include <unistd.h>
+#include <sys/statvfs.h>
+#include <poll.h>
+#include <sys/ioctl.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#endif
+
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/statvfs.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <poll.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <netdb.h>
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-raw-mount.h"
@@ -53,13 +69,10 @@ static void wait_for_reply(struct rpc_context *rpc, struct sync_cb_data *cb_data
 {
 	struct pollfd pfd;
 
-	for (;;) {
-		if (cb_data->is_finished) {
-			break;
-		}
+	while (!cb_data->is_finished) {
+
 		pfd.fd = rpc_get_fd(rpc);
 		pfd.events = rpc_which_events(rpc);
-
 		if (poll(&pfd, 1, -1) < 0) {
 			rpc_set_error(rpc, "Poll failed");
 			cb_data->status = -EIO;
@@ -70,6 +83,44 @@ static void wait_for_reply(struct rpc_context *rpc, struct sync_cb_data *cb_data
 			cb_data->status = -EIO;
 			break;
 		}
+		if (rpc_get_fd(rpc) == -1) {
+			rpc_set_error(rpc, "Socket closed\n");
+			break;
+		}
+	}
+}
+
+static void wait_for_nfs_reply(struct nfs_context *nfs, struct sync_cb_data *cb_data)
+{
+	struct pollfd pfd;
+
+	while (!cb_data->is_finished) {
+
+		pfd.fd = nfs_get_fd(nfs);
+		pfd.events = nfs_which_events(nfs);
+		if (poll(&pfd, 1, -1) < 0) {
+			nfs_set_error(nfs, "Poll failed");
+			cb_data->status = -EIO;
+			break;
+		}
+		if (nfs_service(nfs, pfd.revents) < 0) {
+			nfs_set_error(nfs, "nfs_service failed");
+			cb_data->status = -EIO;
+			break;
+		}
+		if (nfs_get_fd(nfs) == -1) {
+			char *server = strdup(nfs_get_server(nfs));
+			char *export = strdup(nfs_get_export(nfs));
+
+			if (nfs_mount(nfs, server, export) != 0) {
+				nfs_set_error(nfs, "Failed to reconnect to nfs server %s", nfs_get_error(nfs));
+				free(server);
+				free(export);
+				break;
+			}
+			free(server);
+			free(export);
+		}
 	}
 }
 
@@ -105,7 +156,7 @@ int nfs_mount(struct nfs_context *nfs, const char *server, const char *export)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -141,7 +192,7 @@ int nfs_stat(struct nfs_context *nfs, const char *path, struct stat *st)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -182,7 +233,7 @@ int nfs_open(struct nfs_context *nfs, const char *path, int mode, struct nfsfh *
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -221,7 +272,7 @@ int nfs_pread(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -260,7 +311,7 @@ int nfs_close(struct nfs_context *nfs, struct nfsfh *nfsfh)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -283,7 +334,7 @@ int nfs_fstat(struct nfs_context *nfs, struct nfsfh *nfsfh, struct stat *st)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -315,7 +366,7 @@ int nfs_pwrite(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -355,7 +406,7 @@ int nfs_fsync(struct nfs_context *nfs, struct nfsfh *nfsfh)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -389,7 +440,7 @@ int nfs_ftruncate(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t length)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -422,7 +473,7 @@ int nfs_truncate(struct nfs_context *nfs, const char *path, off_t length)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -457,7 +508,7 @@ int nfs_mkdir(struct nfs_context *nfs, const char *path)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -492,7 +543,7 @@ int nfs_rmdir(struct nfs_context *nfs, const char *path)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -532,7 +583,7 @@ int nfs_creat(struct nfs_context *nfs, const char *path, int mode, struct nfsfh
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -567,7 +618,7 @@ int nfs_unlink(struct nfs_context *nfs, const char *path)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -607,7 +658,7 @@ int nfs_opendir(struct nfs_context *nfs, const char *path, struct nfsdir **nfsdi
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -645,7 +696,7 @@ int nfs_lseek(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, int wh
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -682,7 +733,7 @@ int nfs_statvfs(struct nfs_context *nfs, const char *path, struct statvfs *svfs)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -728,7 +779,7 @@ int nfs_readlink(struct nfs_context *nfs, const char *path, char *buf, int bufsi
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -762,7 +813,7 @@ int nfs_chmod(struct nfs_context *nfs, const char *path, int mode)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -797,7 +848,7 @@ int nfs_fchmod(struct nfs_context *nfs, struct nfsfh *nfsfh, int mode)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -832,7 +883,7 @@ int nfs_chown(struct nfs_context *nfs, const char *path, int uid, int gid)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -864,7 +915,7 @@ int nfs_fchown(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int gid)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -898,7 +949,7 @@ int nfs_utimes(struct nfs_context *nfs, const char *path, struct timeval *times)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -932,7 +983,7 @@ int nfs_utime(struct nfs_context *nfs, const char *path, struct utimbuf *times)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -967,7 +1018,7 @@ int nfs_access(struct nfs_context *nfs, const char *path, int mode)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -1001,7 +1052,7 @@ int nfs_symlink(struct nfs_context *nfs, const char *oldpath, const char *newpat
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -1035,7 +1086,7 @@ int nfs_rename(struct nfs_context *nfs, const char *oldpath, const char *newpath
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -1069,7 +1120,7 @@ int nfs_link(struct nfs_context *nfs, const char *oldpath, const char *newpath)
 		return -1;
 	}
 
-	wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -1136,7 +1187,7 @@ void mount_free_export_list(struct exportnode *exports)
 
 
 
-
+#if !defined(WIN32)
 void free_nfs_srvr_list(struct nfs_server_list *srv)
 {
 	while (srv != NULL) {
@@ -1180,8 +1231,14 @@ void callit_cb(struct rpc_context *rpc, int status, void *data _U_, void *privat
 		srv_data->status = -1;
 		return;
 	}
-
 	
+	/* check for dupes */
+	for (srvr = srv_data->srvrs; srvr; srvr = srvr->next) {
+		if (!strcmp(hostdd, srvr->addr)) {
+			return;
+		}
+	}
+
 	srvr = malloc(sizeof(struct nfs_server_list));
 	if (srvr == NULL) {
 		rpc_set_error(rpc, "Malloc failed when allocating server structure");	
@@ -1201,47 +1258,11 @@ void callit_cb(struct rpc_context *rpc, int status, void *data _U_, void *privat
 	srv_data->srvrs = srvr;
 }
 
-struct nfs_server_list *nfs_find_local_servers(void)
+static int send_nfsd_probes(struct rpc_context *rpc, struct ifconf *ifc, struct nfs_list_data *data)
 {
-	struct rpc_context *rpc;
-	struct nfs_list_data data = {0, NULL};
-	struct timeval tv_start, tv_current;
-	struct ifconf ifc;
-	int size;
-	struct pollfd pfd;
 	char *ptr;
 
-	rpc = rpc_init_udp_context();
-	if (rpc == NULL) {
-		return NULL;
-	}
-
-	if (rpc_bind_udp(rpc, "0.0.0.0", 0) < 0) {
-		rpc_destroy_context(rpc);
-		return NULL;
-	}
-
-
-	/* get list of all interfaces */
-	size = sizeof(struct ifreq);
-	ifc.ifc_buf = NULL;
-	ifc.ifc_len = size;
-
-	while(ifc.ifc_len > (size - sizeof(struct ifreq))) {
-		size *= 2;
-
-		free(ifc.ifc_buf);	
-		ifc.ifc_len = size;
-		ifc.ifc_buf = malloc(size);
-		memset(ifc.ifc_buf, 0, size);
-		if (ioctl(rpc_get_fd(rpc), SIOCGIFCONF, (caddr_t)&ifc) < 0) {
-			rpc_destroy_context(rpc);
-			free(ifc.ifc_buf);	
-			return NULL;
-		}
-	}	
-
-	for (ptr =(char *)ifc.ifc_buf; ptr < ((char *)ifc.ifc_buf) + ifc.ifc_len; ) {
+	for (ptr =(char *)(ifc->ifc_buf); ptr < (char *)(ifc->ifc_buf) + ifc->ifc_len; ) {
 		struct ifreq *ifr;
 		char bcdd[16];
 
@@ -1260,9 +1281,7 @@ struct nfs_server_list *nfs_find_local_servers(void)
 			continue;
 		}
 		if (ioctl(rpc_get_fd(rpc), SIOCGIFFLAGS, ifr) < 0) {
-			rpc_destroy_context(rpc);
-			free(ifc.ifc_buf);	
-			return NULL;
+			return -1;
 		}
 		if (!(ifr->ifr_flags & IFF_UP)) {
 			continue;
@@ -1280,45 +1299,91 @@ struct nfs_server_list *nfs_find_local_servers(void)
 			continue;
 		}
 		if (rpc_set_udp_destination(rpc, bcdd, 111, 1) < 0) {
-			rpc_destroy_context(rpc);
-			free(ifc.ifc_buf);	
-			return NULL;
+			return -1;
 		}
 
-		if (rpc_pmap_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, callit_cb, &data) < 0) {
-			rpc_destroy_context(rpc);
-			free(ifc.ifc_buf);	
-			return NULL;
+		if (rpc_pmap_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, callit_cb, data) < 0) {
+			return -1;
 		}
 	}
-	free(ifc.ifc_buf);	
 
-	gettimeofday(&tv_start, NULL);
-	for(;;) {
-		int mpt;
+	return 0;
+}
 
-		pfd.fd = rpc_get_fd(rpc);
-		pfd.events = rpc_which_events(rpc);
+struct nfs_server_list *nfs_find_local_servers(void)
+{
+	struct rpc_context *rpc;
+	struct nfs_list_data data = {0, NULL};
+	struct timeval tv_start, tv_current;
+	struct ifconf ifc;
+	int size, loop;
+	struct pollfd pfd;
 
-		gettimeofday(&tv_current, NULL);
-		mpt = 1000
-		-    (tv_current.tv_sec *1000 + tv_current.tv_usec / 1000)
-		+    (tv_start.tv_sec *1000 + tv_start.tv_usec / 1000);
+	rpc = rpc_init_udp_context();
+	if (rpc == NULL) {
+		return NULL;
+	}
 
-		if (poll(&pfd, 1, mpt) < 0) {
-			free_nfs_srvr_list(data.srvrs);
+	if (rpc_bind_udp(rpc, "0.0.0.0", 0) < 0) {
+		rpc_destroy_context(rpc);
+		return NULL;
+	}
+
+
+	/* get list of all interfaces */
+	size = sizeof(struct ifreq);
+	ifc.ifc_buf = NULL;
+	ifc.ifc_len = size;
+
+	while(ifc.ifc_len > (size - sizeof(struct ifreq))) {
+		size *= 2;
+
+		free(ifc.ifc_buf);	
+		ifc.ifc_len = size;
+		ifc.ifc_buf = malloc(size);
+		memset(ifc.ifc_buf, 0, size);
+		if (ioctl(rpc_get_fd(rpc), SIOCGIFCONF, (caddr_t)&ifc) < 0) {
 			rpc_destroy_context(rpc);
+			free(ifc.ifc_buf);	
 			return NULL;
 		}
-		if (pfd.revents == 0) {
-			break;
+	}	
+
+	for (loop=0; loop<3; loop++) {
+		if (send_nfsd_probes(rpc, &ifc, &data) != 0) {
+			rpc_destroy_context(rpc);
+			free(ifc.ifc_buf);	
+			return NULL;
 		}
+
+		gettimeofday(&tv_start, NULL);
+		for(;;) {
+			int mpt;
+
+			pfd.fd = rpc_get_fd(rpc);
+			pfd.events = rpc_which_events(rpc);
+
+			gettimeofday(&tv_current, NULL);
+			mpt = 1000
+			-    (tv_current.tv_sec *1000 + tv_current.tv_usec / 1000)
+			+    (tv_start.tv_sec *1000 + tv_start.tv_usec / 1000);
+
+			if (poll(&pfd, 1, mpt) < 0) {
+				free_nfs_srvr_list(data.srvrs);
+				rpc_destroy_context(rpc);
+				return NULL;
+			}
+			if (pfd.revents == 0) {
+				break;
+			}
 		
-		if (rpc_service(rpc, pfd.revents) < 0) {
-			break;
+			if (rpc_service(rpc, pfd.revents) < 0) {
+				break;
+			}
 		}
 	}
 
+	free(ifc.ifc_buf);	
 	rpc_destroy_context(rpc);
 
 	if (data.status != 0) {
@@ -1328,3 +1393,4 @@ struct nfs_server_list *nfs_find_local_servers(void)
 
 	return data.srvrs;
 }
+#endif