add a sync function to get the export list from a server and add an example of how...

diff --git a/examples/nfsclient-sync.c b/examples/nfsclient-sync.c
index d1c70a2f66d5a4fca36e547d3c78651231b6bf6c..6fc219e302549e82045c093ea102082647fb8d4c 100644 (file)
--- a/examples/nfsclient-sync.c
+++ b/examples/nfsclient-sync.c
@@ -35,6 +35,8 @@
 #include <fcntl.h>
 #include "libnfs.h"
 #include <rpc/rpc.h>            /* for authunix_create() */
+#include "libnfs-raw.h"
+#include "libnfs-raw-mount.h"
 
 struct client {
        char *server;
@@ -59,6 +61,21 @@ int main(int argc _U_, char *argv[] _U_)
        char buf[16];
        off_t offset;
        struct statvfs svfs;
+       exports export, tmp;
+       struct rpc_context *mount_context;
+
+       printf("exports on server %s\n", SERVER);
+       mount_context = rpc_init_context();
+       export = mount_getexports(mount_context, SERVER);
+       tmp = export;
+       while (tmp != NULL) {
+             printf("Export: %s\n", tmp->ex_dir);
+             tmp = tmp->ex_next;
+       }
+       mount_free_export_list(export);
+       rpc_destroy_context(mount_context);
+
+
 
        nfs = nfs_init_context();
        if (nfs == NULL) {
@@ -200,3 +217,4 @@ int main(int argc _U_, char *argv[] _U_)
        printf("nfsclient finished\n");
        return 0;
 }
+

diff --git a/include/libnfs-private.h b/include/libnfs-private.h
index b7399acaab42ce45d6e20dc2d75e005b2d714405..05ee6317d69771344f21977383404808c5da6f18 100644 (file)
--- a/include/libnfs-private.h
+++ b/include/libnfs-private.h
@@ -68,4 +68,5 @@ void rpc_error_all_pdus(struct rpc_context *rpc, char *error);
 void rpc_set_error(struct rpc_context *rpc, char *error_string, ...);
 void nfs_set_error(struct nfs_context *nfs, char *error_string, ...);
 
+struct rpc_context *nfs_get_rpc_context(struct nfs_context *nfs);
 

diff --git a/include/libnfs.h b/include/libnfs.h
index bbca07e1f809192a34138929640689ef361bbdc1..de46b5ec3fd088cedaa5223b326c212a4da27073 100644 (file)
--- a/include/libnfs.h
+++ b/include/libnfs.h
@@ -937,7 +937,17 @@ int nfs_link(struct nfs_context *nfs, const char *oldpath, const char *newpath);
  *          data is the error string.
  */
 int mount_getexports_async(struct rpc_context *rpc, const char *server, rpc_cb cb, void *private_data);
+/*
+ * Sync getexports(<server>)
+ * Function returns
+ *            NULL : something failed
+ *  exports export : a linked list of exported directories
+ * 
+ * returned data must be freed by calling mount_free_export_list(exportnode);
+ */
+struct exportnode *mount_getexports(struct rpc_context *rpc, const char *server);
 
+void mount_free_export_list(struct exportnode *exports);
 
 
 //qqq replace later with lseek(cur, 0)

diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index 88b89ee6ee5870e90f15f7e56f69f41f40e25531..cef644475f296f2c55719e64a8fcbbe91332dbb4 100644 (file)
--- a/lib/libnfs-sync.c
+++ b/lib/libnfs-sync.c
@@ -44,7 +44,7 @@ struct sync_cb_data {
 };
 
 
-static void wait_for_reply(struct nfs_context *nfs, struct sync_cb_data *cb_data)
+static void wait_for_reply(struct rpc_context *rpc, struct sync_cb_data *cb_data)
 {
        struct pollfd pfd;
 
@@ -52,16 +52,16 @@ static void wait_for_reply(struct nfs_context *nfs, struct sync_cb_data *cb_data
                if (cb_data->is_finished) {
                        break;
                }
-               pfd.fd = nfs_get_fd(nfs);
-               pfd.events = nfs_which_events(nfs);
+               pfd.fd = rpc_get_fd(rpc);
+               pfd.events = rpc_which_events(rpc);
 
                if (poll(&pfd, 1, -1) < 0) {
-                       nfs_set_error(nfs, "Poll failed");
+                       rpc_set_error(rpc, "Poll failed");
                        cb_data->status = -EIO;
                        break;
                }
-               if (nfs_service(nfs, pfd.revents) < 0) {
-                       nfs_set_error(nfs, "nfs_service failed");
+               if (rpc_service(rpc, pfd.revents) < 0) {
+                       rpc_set_error(rpc, "rpc_service failed");
                        cb_data->status = -EIO;
                        break;
                }
@@ -100,7 +100,7 @@ int nfs_mount(struct nfs_context *nfs, const char *server, const char *export)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -136,7 +136,7 @@ int nfs_stat(struct nfs_context *nfs, const char *path, struct stat *st)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -177,7 +177,7 @@ int nfs_open(struct nfs_context *nfs, const char *path, int mode, struct nfsfh *
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -216,7 +216,7 @@ int nfs_pread(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -255,7 +255,7 @@ int nfs_close(struct nfs_context *nfs, struct nfsfh *nfsfh)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -278,7 +278,7 @@ int nfs_fstat(struct nfs_context *nfs, struct nfsfh *nfsfh, struct stat *st)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -310,7 +310,7 @@ int nfs_pwrite(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -350,7 +350,7 @@ int nfs_fsync(struct nfs_context *nfs, struct nfsfh *nfsfh)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -384,7 +384,7 @@ int nfs_ftruncate(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t length)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -417,7 +417,7 @@ int nfs_truncate(struct nfs_context *nfs, const char *path, off_t length)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -452,7 +452,7 @@ int nfs_mkdir(struct nfs_context *nfs, const char *path)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -487,7 +487,7 @@ int nfs_rmdir(struct nfs_context *nfs, const char *path)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -527,7 +527,7 @@ int nfs_creat(struct nfs_context *nfs, const char *path, int mode, struct nfsfh
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -562,7 +562,7 @@ int nfs_unlink(struct nfs_context *nfs, const char *path)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -602,7 +602,7 @@ int nfs_opendir(struct nfs_context *nfs, const char *path, struct nfsdir **nfsdi
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -640,7 +640,7 @@ int nfs_lseek(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, int wh
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -677,7 +677,7 @@ int nfs_statvfs(struct nfs_context *nfs, const char *path, struct statvfs *svfs)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -723,7 +723,7 @@ int nfs_readlink(struct nfs_context *nfs, const char *path, char *buf, int bufsi
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -757,7 +757,7 @@ int nfs_chmod(struct nfs_context *nfs, const char *path, int mode)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -792,7 +792,7 @@ int nfs_fchmod(struct nfs_context *nfs, struct nfsfh *nfsfh, int mode)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -827,7 +827,7 @@ int nfs_chown(struct nfs_context *nfs, const char *path, int uid, int gid)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -859,7 +859,7 @@ int nfs_fchown(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int gid)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -893,7 +893,7 @@ int nfs_utimes(struct nfs_context *nfs, const char *path, struct timeval *times)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -927,7 +927,7 @@ int nfs_utime(struct nfs_context *nfs, const char *path, struct utimbuf *times)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -962,7 +962,7 @@ int nfs_access(struct nfs_context *nfs, const char *path, int mode)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -996,7 +996,7 @@ int nfs_symlink(struct nfs_context *nfs, const char *oldpath, const char *newpat
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -1030,7 +1030,7 @@ int nfs_rename(struct nfs_context *nfs, const char *oldpath, const char *newpath
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
@@ -1064,7 +1064,60 @@ int nfs_link(struct nfs_context *nfs, const char *oldpath, const char *newpath)
                return -1;
        }
 
-       wait_for_reply(nfs, &cb_data);
+       wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
 
        return cb_data.status;
 }
+
+void mount_getexports_cb(struct rpc_context *mount_context _U_, int status, void *data, void *private_data)
+{
+       struct sync_cb_data *cb_data = private_data;
+       exports export = *(exports *)data;
+
+       printf("got exports back\n");
+       cb_data->is_finished = 1;
+       cb_data->status = status;
+       cb_data->return_data = NULL;
+
+       while (export != NULL) {
+               exports new_export;
+
+               new_export = malloc(sizeof(*new_export));
+               memset(new_export, 0, sizeof(*new_export));
+               new_export->ex_dir  = strdup(export->ex_dir);
+               new_export->ex_next = cb_data->return_data;
+
+               cb_data->return_data = new_export;
+
+               export = export->ex_next;
+       }
+}
+
+struct exportnode *mount_getexports(struct rpc_context *rpc, const char *server)
+{
+       struct sync_cb_data cb_data;
+
+       cb_data.is_finished = 0;
+       cb_data.return_data = NULL;
+
+       if (mount_getexports_async(rpc, server, mount_getexports_cb, &cb_data) != 0) {
+               rpc_set_error(rpc, "mount_getexports_async failed");
+               return NULL;
+       }
+
+       wait_for_reply(rpc, &cb_data);
+
+       return cb_data.return_data;
+}
+
+void mount_free_export_list(struct exportnode *exports)
+{
+       struct exportnode *tmp;
+
+       while ((tmp = exports)) {
+               exports = exports->ex_next;
+               free(tmp->ex_dir);
+               free(tmp);
+       }
+}
+

diff --git a/lib/libnfs.c b/lib/libnfs.c
index 4b63a704ec9faf911bf5d1d407a7d61fd1bee240..5f23d4690a7f634573eb15d99e156947d3fbe12c 100644 (file)
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -3035,3 +3035,8 @@ int mount_getexports_async(struct rpc_context *rpc, const char *server, rpc_cb c
        return 0;
 }
 
+struct rpc_context *nfs_get_rpc_context(struct nfs_context *nfs)
+{
+       return nfs->rpc;
+}
+

diff --git a/lib/pdu.c b/lib/pdu.c
index 3427446319d2a8f47b51c26fa8a1453fe9dec75b..fb03061c5a3192664aaddeb60b259854d73c8f62 100644 (file)
--- a/lib/pdu.c
+++ b/lib/pdu.c
@@ -84,6 +84,7 @@ void rpc_free_pdu(struct rpc_context *rpc _U_, struct rpc_pdu *pdu)
        }
 
        xdr_destroy(&pdu->xdr);
+
        free(pdu);
 }