X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=examples%2Fnfsclient-bcast.c;h=ec19a69f958b23ed0f3c4b9949268f294f73250e;hb=2db42ce2fc89bc88050564037688888bbb8876e9;hp=9fb8073c9dc9037b2c72ff905ddf915f0aa11778;hpb=552c766578d37c4d1eb150436da7eeed104f1fe9;p=deb_libnfs.git

diff --git a/examples/nfsclient-bcast.c b/examples/nfsclient-bcast.c
index 9fb8073..ec19a69 100644
--- a/examples/nfsclient-bcast.c
+++ b/examples/nfsclient-bcast.c
@@ -17,23 +17,52 @@
 
 /* Example program using the lowlevel raw broadcast interface.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
-#include <stdio.h>
+#ifdef WIN32
+#include "win32_compat.h"
+#endif
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <poll.h>
 #include <errno.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
+
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+
+#ifdef HAVE_NET_IF_H
 #include <net/if.h>
+#endif
+
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
 #include "libnfs.h"
 #include "libnfs-raw.h"
+#include "libnfs-private.h"
 #include "libnfs-raw-mount.h"
 #include "libnfs-raw-portmap.h"
-#include "libnfs-private.h"
 
 struct nfs_list_data {
        int status;
@@ -104,10 +133,11 @@ int main(int argc _U_, char *argv[] _U_)
 	struct rpc_context *rpc;
 	struct pollfd pfd;
 	struct ifconf ifc;
-	int i, size;
+	int size;
 	struct timeval tv_start, tv_current;
 	struct nfs_list_data data = {0, NULL};
 	struct nfs_server_list *srvr;
+	char *ptr;
 	
 	rpc = rpc_init_udp_context();
 	if (rpc == NULL) {
@@ -126,51 +156,62 @@ int main(int argc _U_, char *argv[] _U_)
 	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) {
 			printf("ioctl SIOCGIFCONF failed\n");
 			exit(10);
 		}
 	}	
 
-	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;
+#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, &ifc.ifc_req[i]) < 0) {
+		if (ioctl(rpc_get_fd(rpc), SIOCGIFFLAGS, ifr) < 0) {
 			printf("ioctl DRBADDR failed\n");
 			exit(10);
 		}
-		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) {
-			printf("ioctl DRBADDR failed\n");
-			exit(10);
+		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) {
-			printf("getnameinfo failed\n");
-			exit(10);
+		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) {
 			printf("failed to set udp destination %s\n", rpc_get_error(rpc));
 			exit(10);
 		}
 
-		if (rpc_pmap_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, pm_cb, &data) < 0) {
+		if (rpc_pmap2_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, pm_cb, &data) < 0) {
 			printf("Failed to set up callit function\n");
 			exit(10);
 		}