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

diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index 0a57c7b..e964c14 100644
--- a/lib/libnfs-sync.c
+++ b/lib/libnfs-sync.c
@@ -1180,8 +1180,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 0;
+		}
+	}
+
 	srvr = malloc(sizeof(struct nfs_server_list));
 	if (srvr == NULL) {
 		rpc_set_error(rpc, "Malloc failed when allocating server structure");	
@@ -1201,47 +1207,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 +1230,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 +1248,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;
+
+	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;
+	}
 
-		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);
+	/* 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) {