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

[deb_libnfs.git] / lib / libnfs-sync.c

diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index 59493c5b17a3ddcaa49e29fb73f4a5854ed39079..4e83b5b33e7557ebb91a7143aaed2c78cf85e563 100644 (file)
--- 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>
@@ -1200,13 +1201,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;
        struct pollfd pfd;
 
        rpc = rpc_init_udp_context();
@@ -1225,12 +1278,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,49 +1292,11 @@ 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) {
-                       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(;;) {
@@ -1308,6 +1324,7 @@ struct nfs_server_list *nfs_find_local_servers(void)
                }
        }
 
+       free(ifc.ifc_buf);      
        rpc_destroy_context(rpc);
 
        if (data.status != 0) {