add example for sync interface to probe for all local servers
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Sat, 2 Jul 2011 00:30:16 +0000 (10:30 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Sat, 2 Jul 2011 00:30:16 +0000 (10:30 +1000)
Makefile.in
examples/nfsclient-bcast.c
examples/nfsclient-listservers.c [new file with mode: 0644]
include/libnfs.h
lib/libnfs-sync.c

index d2d0c832b1c116738f92739602e2003198c398d7..e4952b8bd03504668f436efa72b49b7d15a940f7 100644 (file)
@@ -35,7 +35,7 @@ nfs/libnfs-raw-nfs.o nfs/nfs.o \
 rquota/libnfs-raw-rquota.o rquota/rquota.o
 
 ifeq ("$(ENABLE_EXAMPLES)","yes")
-       EXAMPLES=bin/nfsclient-raw bin/nfsclient-async bin/nfsclient-sync bin/nfsclient-bcast
+       EXAMPLES=bin/nfsclient-raw bin/nfsclient-async bin/nfsclient-sync bin/nfsclient-bcast bin/nfsclient-listservers
 endif
 
 all: $(LIBNFS_SO) $(EXAMPLES)
@@ -56,6 +56,10 @@ bin/nfsclient-bcast: examples/nfsclient-bcast.c $(LIBNFS_A)
        mkdir -p bin
        $(CC) $(CFLAGS) -o $@ examples/nfsclient-bcast.c $(LIBNFS_A) $(LIBS)
 
+bin/nfsclient-listservers: examples/nfsclient-listservers.c $(LIBNFS_A)
+       mkdir -p bin
+       $(CC) $(CFLAGS) -o $@ examples/nfsclient-listservers.c $(LIBNFS_A) $(LIBS)
+
 $(LIBNFS_A): $(LIBNFS_OBJS) $(LIB_OBJS)
        @echo Creating library $@
        ar r $(LIBNFS_A) $(LIBNFS_OBJS) $(LIB_OBJS)
index 2075f09371e2e98f7981522e36d0d8d7d13f4432..9fb8073c9dc9037b2c72ff905ddf915f0aa11778 100644 (file)
 #include "libnfs-raw-portmap.h"
 #include "libnfs-private.h"
 
-struct nfs_server_list {
-       struct nfs_server_list *next;
-       char *addr;
-};
-
 struct nfs_list_data {
        int status;
        struct nfs_server_list *srvrs;
@@ -56,9 +51,8 @@ void free_nfs_srvr_list(struct nfs_server_list *srv)
        }
 }           
 
-void pm_cb(struct rpc_context *rpc, int status, void *data, void *private_data _U_)
+void pm_cb(struct rpc_context *rpc, int status, void *data _U_, void *private_data)
 {
-       pmap_call_result *res = (pmap_call_result *)data;
        struct nfs_list_data *srv_data = private_data;
        struct sockaddr *sin;
        char hostdd[16];
@@ -144,7 +138,7 @@ int main(int argc _U_, char *argv[] _U_)
                }
        }       
 
-       for (i=0; i<ifc.ifc_len / sizeof(struct ifconf); i++) {
+       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) {
diff --git a/examples/nfsclient-listservers.c b/examples/nfsclient-listservers.c
new file mode 100644 (file)
index 0000000..fbb0e09
--- /dev/null
@@ -0,0 +1,50 @@
+/* 
+   Copyright (C) by Ronnie Sahlberg <ronniesahlberg@gmail.com> 2011
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* Example program showing sync interface to probe for all local servers
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <poll.h>
+#include <errno.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/time.h>
+#include <net/if.h>
+#include <netdb.h>
+#include "libnfs.h"
+#include "libnfs-raw.h"
+#include "libnfs-raw-mount.h"
+#include "libnfs-raw-portmap.h"
+#include "libnfs-private.h"
+
+
+int main(int argc _U_, char *argv[] _U_)
+{
+       struct nfs_server_list *srvrs;
+       struct nfs_server_list *srv;
+
+       srvrs = nfs_find_local_servers();       
+       for (srv=srvrs; srv; srv = srv->next) {
+               printf("NFS SERVER @ %s\n", srv->addr);
+       }
+       free_nfs_srvr_list(srvrs);
+       return 0;
+}
index e77e1d6974acbf4c55f10c183c591a3e68fcfea3..81febb23ec34cb4b7182dc8f98a3e18594842002 100644 (file)
@@ -952,3 +952,13 @@ void mount_free_export_list(struct exportnode *exports);
 
 //qqq replace later with lseek(cur, 0)
 off_t nfs_get_current_offset(struct nfsfh *nfsfh);
+
+
+
+struct nfs_server_list {
+       struct nfs_server_list *next;
+       char *addr;
+};
+
+struct nfs_server_list *nfs_find_local_servers(void);
+void free_nfs_srvr_list(struct nfs_server_list *srv);
index 4c8ba76a5139eb2e66351498fdc992a55cda8990..6e4eff542782515ff4b4ec51ad95f1848b9a5274 100644 (file)
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/statvfs.h>
+#include <sys/ioctl.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <poll.h>
+#include <net/if.h>
+#include <netdb.h>
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-raw-mount.h"
@@ -1129,3 +1132,187 @@ void mount_free_export_list(struct exportnode *exports)
        }
 }
 
+
+
+
+void free_nfs_srvr_list(struct nfs_server_list *srv)
+{
+       while (srv != NULL) {
+               struct nfs_server_list *next = srv->next;
+
+               free(srv->addr);
+               free(srv);
+               srv = next;
+       }
+}           
+
+struct nfs_list_data {
+       int status;
+       struct nfs_server_list *srvrs;
+};
+
+void callit_cb(struct rpc_context *rpc, int status, void *data _U_, void *private_data)
+{
+       struct nfs_list_data *srv_data = private_data;
+       struct sockaddr *sin;
+       char hostdd[16];
+       struct nfs_server_list *srvr;
+
+       if (status == RPC_STATUS_CANCEL) {
+               return;
+       }
+       if (status != 0) {
+               srv_data->status = -1;
+               return;
+       }
+
+       sin = rpc_get_recv_sockaddr(rpc);
+       if (sin == NULL) {
+               rpc_set_error(rpc, "failed to get sockaddr in CALLIT callback");
+               srv_data->status = -1;
+               return;
+       }
+
+       if (getnameinfo(sin, sizeof(struct sockaddr_in), &hostdd[0], sizeof(hostdd), NULL, 0, NI_NUMERICHOST) < 0) {
+               rpc_set_error(rpc, "getnameinfo failed in CALLIT callback");
+               srv_data->status = -1;
+               return;
+       }
+
+       
+       srvr = malloc(sizeof(struct nfs_server_list));
+       if (srvr == NULL) {
+               rpc_set_error(rpc, "Malloc failed when allocating server structure");   
+               srv_data->status = -1;
+               return;
+       }
+
+       srvr->addr = strdup(hostdd);
+       if (srvr->addr == NULL) {
+               rpc_set_error(rpc, "Strdup failed when allocating server structure");
+               free(srvr);
+               srv_data->status = -1;
+               return;
+       }
+
+       srvr->next = srv_data->srvrs;
+       srv_data->srvrs = srvr;
+}
+
+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;
+       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;
+       }
+
+
+       /* get list of all interfaces */
+       size = sizeof(struct ifreq);
+       ifc.ifc_buf = NULL;
+       ifc.ifc_len = size;
+
+       while (ifc.ifc_len == size) {
+               size *= 2;
+
+               free(ifc.ifc_buf);      
+               ifc.ifc_len = size;
+               ifc.ifc_buf = malloc(size);
+               if (ioctl(rpc_get_fd(rpc), SIOCGIFCONF, (caddr_t)&ifc) < 0) {
+                       rpc_destroy_context(rpc);
+                       free(ifc.ifc_buf);      
+                       return NULL;
+               }
+       }       
+
+       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;
+               }
+       }
+       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;
+               }
+               
+               if (rpc_service(rpc, pfd.revents) < 0) {
+                       break;
+               }
+       }
+
+       rpc_destroy_context(rpc);
+
+       if (data.status != 0) {
+               free_nfs_srvr_list(data.srvrs);
+               return NULL;
+       }
+
+       return data.srvrs;
+}