X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs-sync.c;h=82c09f38e36bb7f6761b33b52b78c98cbbe861c8;hb=1be803ce7f74e7b57d873e7ea718fd00aaee8f7e;hp=6e4eff542782515ff4b4ec51ad95f1848b9a5274;hpb=2e4db0d14597fdb0013fb16f24b3f872d1217397;p=deb_libnfs.git

diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index 6e4eff5..82c09f3 100644
--- a/lib/libnfs-sync.c
+++ b/lib/libnfs-sync.c
@@ -30,6 +30,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <poll.h>
+#include <sys/socket.h>
 #include <net/if.h>
 #include <netdb.h>
 #include "libnfs.h"
@@ -1205,8 +1206,9 @@ struct nfs_server_list *nfs_find_local_servers(void)
 	struct nfs_list_data data = {0, NULL};
 	struct timeval tv_start, tv_current;
 	struct ifconf ifc;
-	int i, size;
+	int size;
 	struct pollfd pfd;
+	char *ptr;
 
 	rpc = rpc_init_udp_context();
 	if (rpc == NULL) {
@@ -1230,6 +1232,7 @@ struct nfs_server_list *nfs_find_local_servers(void)
 		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);	
@@ -1237,35 +1240,43 @@ struct nfs_server_list *nfs_find_local_servers(void)
 		}
 	}	
 
-	for (i = 0; (unsigned)i < ifc.ifc_len / sizeof(struct ifconf); i++) {
+	for (ptr =(char *)ifc.ifc_buf; ptr < ((char *)ifc.ifc_buf) + ifc.ifc_len; ) {
+		struct ifreq *ifr;
 		char bcdd[16];
 
-		if (ifc.ifc_req[i].ifr_addr.sa_family != AF_INET) {
+		ifr = (struct ifreq *)ptr;
+#if 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, &ifc.ifc_req[i]) < 0) {
+		if (ioctl(rpc_get_fd(rpc), SIOCGIFFLAGS, ifr) < 0) {
 			rpc_destroy_context(rpc);
 			free(ifc.ifc_buf);	
 			return NULL;
 		}
-		if (!(ifc.ifc_req[i].ifr_flags & IFF_UP)) {
+		if (!(ifr->ifr_flags & IFF_UP)) {
 			continue;
 		}
-		if (ifc.ifc_req[i].ifr_flags & IFF_LOOPBACK) {
+		if (ifr->ifr_flags & IFF_LOOPBACK) {
 			continue;
 		}
-		if (!(ifc.ifc_req[i].ifr_flags & IFF_BROADCAST)) {
+		if (!(ifr->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 (ioctl(rpc_get_fd(rpc), SIOCGIFBRDADDR, ifr) < 0) {
+			continue;
 		}
-		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 (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) {
 			rpc_destroy_context(rpc);