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

diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index 59493c5..e964c14 100644
--- a/lib/libnfs-sync.c
+++ b/lib/libnfs-sync.c
@@ -18,6 +18,7 @@
  * High level api to nfs filesystems
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1179,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");	
@@ -1200,13 +1207,65 @@ void callit_cb(struct rpc_context *rpc, int status, void *data _U_, void *privat
 	srv_data->srvrs = srvr;
 }
 
+static int send_nfsd_probes(struct rpc_context *rpc, struct ifconf *ifc, struct nfs_list_data *data)
+{
+	char *ptr;
+
+	for (ptr =(char *)(ifc->ifc_buf); ptr < (char *)(ifc->ifc_buf) + ifc->ifc_len; ) {
+		struct ifreq *ifr;
+		char bcdd[16];
+
+		ifr = (struct ifreq *)ptr;
+#ifdef HAVE_SOCKADDR_LEN
+		if (ifr->ifr_addr.sa_len > sizeof(struct sockaddr)) {
+			ptr += sizeof(ifr->ifr_name) + ifr->ifr_addr.sa_len;
+		} else {
+			ptr += sizeof(ifr->ifr_name) + sizeof(struct sockaddr);
+		}
+#else
+		ptr += sizeof(struct ifreq);
+#endif
+
+		if (ifr->ifr_addr.sa_family != AF_INET) {
+			continue;
+		}
+		if (ioctl(rpc_get_fd(rpc), SIOCGIFFLAGS, ifr) < 0) {
+			return -1;
+		}
+		if (!(ifr->ifr_flags & IFF_UP)) {
+			continue;
+		}
+		if (ifr->ifr_flags & IFF_LOOPBACK) {
+			continue;
+		}
+		if (!(ifr->ifr_flags & IFF_BROADCAST)) {
+			continue;
+		}
+		if (ioctl(rpc_get_fd(rpc), SIOCGIFBRDADDR, ifr) < 0) {
+			continue;
+		}
+		if (getnameinfo(&ifr->ifr_broadaddr, sizeof(struct sockaddr_in), &bcdd[0], sizeof(bcdd), NULL, 0, NI_NUMERICHOST) < 0) {
+			continue;
+		}
+		if (rpc_set_udp_destination(rpc, bcdd, 111, 1) < 0) {
+			return -1;
+		}
+
+		if (rpc_pmap_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, callit_cb, data) < 0) {
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
 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 i, size;
+	int size, loop;
 	struct pollfd pfd;
 
 	rpc = rpc_init_udp_context();
@@ -1225,12 +1284,13 @@ struct nfs_server_list *nfs_find_local_servers(void)
 	ifc.ifc_buf = NULL;
 	ifc.ifc_len = size;
 
-	while (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);	
@@ -1238,76 +1298,41 @@ struct nfs_server_list *nfs_find_local_servers(void)
 		}
 	}	
 
-	for (i = 0; (unsigned)i < ifc.ifc_len / sizeof(struct ifconf); i++) {
-		char bcdd[16];
-
-		if (ifc.ifc_req[i].ifr_addr.sa_family != AF_INET) {
-			continue;
-		}
-		if (ioctl(rpc_get_fd(rpc), SIOCGIFFLAGS, &ifc.ifc_req[i]) < 0) {
-			rpc_destroy_context(rpc);
-			free(ifc.ifc_buf);	
-			return NULL;
-		}
-		if (!(ifc.ifc_req[i].ifr_flags & IFF_UP)) {
-			continue;
-		}
-		if (ifc.ifc_req[i].ifr_flags & IFF_LOOPBACK) {
-			continue;
-		}
-		if (!(ifc.ifc_req[i].ifr_flags & IFF_BROADCAST)) {
-			continue;
-		}
-		if (ioctl(rpc_get_fd(rpc), SIOCGIFBRDADDR, &ifc.ifc_req[i]) < 0) {
-			rpc_destroy_context(rpc);
-			free(ifc.ifc_buf);	
-			return NULL;
-		}
-		if (getnameinfo(&ifc.ifc_req[i].ifr_broadaddr, sizeof(struct sockaddr_in), &bcdd[0], sizeof(bcdd), NULL, 0, NI_NUMERICHOST) < 0) {
-			rpc_destroy_context(rpc);
-			free(ifc.ifc_buf);	
-			return NULL;
-		}
-		if (rpc_set_udp_destination(rpc, bcdd, 111, 1) < 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) {
+	for (loop=0; loop<3; loop++) {
+		if (send_nfsd_probes(rpc, &ifc, &data) != 0) {
 			rpc_destroy_context(rpc);
 			free(ifc.ifc_buf);	
 			return NULL;
 		}
-	}
-	free(ifc.ifc_buf);	
-
-	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;
-		}
+		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) {