From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Sat, 16 Jul 2011 07:27:12 +0000 (+1000)
Subject: break out the loop for sending a NFSd probe bcast on every interface into a separate... 
X-Git-Tag: upstream/1.9.6^2~346
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=e5964ef9058fea8a23434ea4533b4bd80b308172;p=deb_libnfs.git

break out the loop for sending a NFSd probe bcast on every interface into a separate function
---

diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index 0a57c7b..4e83b5b 100644
--- a/lib/libnfs-sync.c
+++ b/lib/libnfs-sync.c
@@ -1201,47 +1201,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 +1224,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,18 +1242,61 @@ 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) {
+			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 size;
+	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;
+	}
+
 
-		if (rpc_pmap_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, callit_cb, &data) < 0) {
+	/* 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 (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(;;) {
@@ -1319,6 +1324,7 @@ struct nfs_server_list *nfs_find_local_servers(void)
 		}
 	}
 
+	free(ifc.ifc_buf);	
 	rpc_destroy_context(rpc);
 
 	if (data.status != 0) {