Merge pull request #88 from rosslagerwall/76-no-autoreconnect

libnfs.c: Fix autoreconnect

diff --git a/configure.ac b/configure.ac
index 2cb979eb8a7dc4680689e86b3090821346f00c5b..b84a8c52db40c017202669beee7ea43beecbf46a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.50)
-AC_INIT([libnfs], [1.9.4], [ronniesahlberg@gmail.com])
+AC_INIT([libnfs], [1.9.5], [ronniesahlberg@gmail.com])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign])
 AC_CANONICAL_HOST

diff --git a/include/nfsc/libnfs.h b/include/nfsc/libnfs.h
index dfa2185a06b57854be7f3aea6a9df5291065fbde..ff0d4e4ad4b4bcdfae7f38a9c502e0389faa7e3a 100644 (file)
--- a/include/nfsc/libnfs.h
+++ b/include/nfsc/libnfs.h
@@ -682,6 +682,33 @@ EXTERN int nfs_creat_async(struct nfs_context *nfs, const char *path, int mode,
  */
 EXTERN int nfs_creat(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh);
 
+/*
+ * Async create()
+ *
+ * Same as nfs_creat_async but allows passing flags:
+ * O_APPEND
+ * O_SYNC
+ * O_EXCL
+ *
+ * Function returns
+ *  0 : The operation was initiated. Once the operation finishes, the callback will be invoked.
+ * <0 : An error occured when trying to set up the operation. The callback will not be invoked.
+ *
+ * When the callback is invoked, status indicates the result:
+ *      0 : Success.
+ *          data is a struct *nfsfh;
+ * -errno : An error occured.
+ *          data is the error string.
+ */
+EXTERN int nfs_create_async(struct nfs_context *nfs, const char *path, int flags, int mode, nfs_cb cb, void *private_data);
+/*
+ * Sync create()
+ * Function returns
+ *      0 : Success
+ * -errno : An error occured.
+ */
+EXTERN int nfs_create(struct nfs_context *nfs, const char *path, int flags, int mode, struct nfsfh **nfsfh);
+
 
 /*
  * MKNOD()

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1f9a55a7d0e55515730d1c214ff24c162ab1612a..2f12325d6bb22bf51a2f4da599bace7c665f5899 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -18,9 +18,9 @@ libnfs_la_SOURCES = \
        pdu.c \
        socket.c
 
-SOCURRENT=5
+SOCURRENT=6
 SOREVISION=0
-SOAGE=1
+SOAGE=2
 libnfs_la_LDFLAGS = -version-info $(SOCURRENT):$(SOREVISION):$(SOAGE)
 libnfs_la_LIBADD = \
        ../mount/libmount.la \

diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index d4a54513f2647df3e3020bea932971223f3d8d70..39c68c6bf6fb12b0a345c839e79e2f09989ffe7f 100644 (file)
--- a/lib/libnfs-sync.c
+++ b/lib/libnfs-sync.c
@@ -696,15 +696,15 @@ static void creat_cb(int status, struct nfs_context *nfs, void *data, void *priv
        *nfsfh = fh;
 }
 
-int nfs_creat(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh)
+int nfs_create(struct nfs_context *nfs, const char *path, int flags, int mode, struct nfsfh **nfsfh)
 {
        struct sync_cb_data cb_data;
 
        cb_data.is_finished = 0;
        cb_data.return_data = nfsfh;
 
-       if (nfs_creat_async(nfs, path, mode, creat_cb, &cb_data) != 0) {
-               nfs_set_error(nfs, "nfs_creat_async failed");
+       if (nfs_create_async(nfs, path, flags, mode, creat_cb, &cb_data) != 0) {
+               nfs_set_error(nfs, "nfs_create_async failed");
                return -1;
        }
 
@@ -713,6 +713,11 @@ int nfs_creat(struct nfs_context *nfs, const char *path, int mode, struct nfsfh
        return cb_data.status;
 }
 
+int nfs_creat(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh)
+{
+       return nfs_create(nfs, path, 0, mode, nfsfh);
+}
+
 /*
  * mknod()
  */

diff --git a/lib/libnfs.c b/lib/libnfs.c
index 67c3c85ef38ed8bbaccf8a9255eff7f01b9fa789..459ebd7bf80e3e18e73dd24087a5653051dd6b81 100644 (file)
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -2527,13 +2527,28 @@ int nfs_rmdir_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void *
 /*
  * Async creat()
  */
+struct create_cb_data {
+       char *path;
+       int flags;
+       int mode;
+};
+
+static void free_create_cb_data(void *ptr)
+{
+       struct create_cb_data *data = ptr;
+
+       free(data->path);
+       free(data);
+}
+
 static void nfs_create_2_cb(struct rpc_context *rpc, int status, void *command_data, void *private_data)
 {
        LOOKUP3res *res;
        struct nfs_cb_data *data = private_data;
        struct nfs_context *nfs = data->nfs;
        struct nfsfh *nfsfh;
-       char *str = data->continue_data;
+       struct create_cb_data *cb_data = data->continue_data;
+       char *str = cb_data->path;
 
        assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
@@ -2566,6 +2581,13 @@ static void nfs_create_2_cb(struct rpc_context *rpc, int status, void *command_d
        }
        memset(nfsfh, 0, sizeof(struct nfsfh));
 
+       if (cb_data->flags & O_SYNC) {
+               nfsfh->is_sync = 1;
+       }
+       if (cb_data->flags & O_APPEND) {
+               nfsfh->is_append = 1;
+       }
+
        /* copy the filehandle */
        nfsfh->fh.data.data_len = res->LOOKUP3res_u.resok.object.data.data_len;
        nfsfh->fh.data.data_val = malloc(nfsfh->fh.data.data_len);
@@ -2577,12 +2599,13 @@ static void nfs_create_2_cb(struct rpc_context *rpc, int status, void *command_d
 
 
 
-static void nfs_creat_1_cb(struct rpc_context *rpc, int status, void *command_data, void *private_data)
+static void nfs_create_1_cb(struct rpc_context *rpc, int status, void *command_data, void *private_data)
 {
        CREATE3res *res;
        struct nfs_cb_data *data = private_data;
        struct nfs_context *nfs = data->nfs;
-       char *str = data->continue_data;
+       struct create_cb_data *cb_data = data->continue_data;
+       char *str = cb_data->path;
        LOOKUP3args args;
 
        assert(rpc->magic == RPC_CONTEXT_MAGIC);
@@ -2620,9 +2643,10 @@ static void nfs_creat_1_cb(struct rpc_context *rpc, int status, void *command_da
        return;
 }
 
-static int nfs_creat_continue_internal(struct nfs_context *nfs, fattr3 *attr _U_, struct nfs_cb_data *data)
+static int nfs_create_continue_internal(struct nfs_context *nfs, fattr3 *attr _U_, struct nfs_cb_data *data)
 {
-       char *str = data->continue_data;
+       struct create_cb_data *cb_data = data->continue_data;
+       char *str = cb_data->path;
        CREATE3args args;
 
        str = &str[strlen(str) + 1];
@@ -2630,11 +2654,11 @@ static int nfs_creat_continue_internal(struct nfs_context *nfs, fattr3 *attr _U_
        memset(&args, 0, sizeof(CREATE3args));
        args.where.dir = data->fh;
        args.where.name = str;
-       args.how.mode = UNCHECKED;
+       args.how.mode = (cb_data->flags & O_EXCL) ? GUARDED : UNCHECKED;
        args.how.createhow3_u.obj_attributes.mode.set_it = 1;
-       args.how.createhow3_u.obj_attributes.mode.set_mode3_u.mode = data->continue_int;
+       args.how.createhow3_u.obj_attributes.mode.set_mode3_u.mode = cb_data->mode;
 
-       if (rpc_nfs3_create_async(nfs->rpc, nfs_creat_1_cb, &args, data) != 0) {
+       if (rpc_nfs3_create_async(nfs->rpc, nfs_create_1_cb, &args, data) != 0) {
                rpc_set_error(nfs->rpc, "RPC error: Failed to send CREATE call for %s/%s", data->path, str);
                data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
                free_nfs_cb_data(data);
@@ -2643,27 +2667,37 @@ static int nfs_creat_continue_internal(struct nfs_context *nfs, fattr3 *attr _U_
        return 0;
 }
 
-int nfs_creat_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb cb, void *private_data)
+int nfs_create_async(struct nfs_context *nfs, const char *path, int flags, int mode, nfs_cb cb, void *private_data)
 {
-       char *new_path;
+       struct create_cb_data *cb_data;
        char *ptr;
 
-       new_path = strdup(path);
-       if (new_path == NULL) {
+       cb_data = malloc(sizeof(struct create_cb_data));
+       if (cb_data == NULL) {
+               rpc_set_error(nfs->rpc, "Out of memory, failed to allocate mode buffer for cb data");
+               return -1;
+       }
+
+       cb_data->path = strdup(path);
+       if (cb_data->path == NULL) {
                rpc_set_error(nfs->rpc, "Out of memory, failed to allocate mode buffer for path");
+               free(cb_data);
                return -1;
        }
 
-       ptr = strrchr(new_path, '/');
+       ptr = strrchr(cb_data->path, '/');
        if (ptr == NULL) {
                rpc_set_error(nfs->rpc, "Invalid path %s", path);
-               free(new_path);
+               free_create_cb_data(cb_data);
                return -1;
        }
        *ptr = 0;
 
+       cb_data->flags = flags;
+       cb_data->mode = mode;
+
        /* new_path now points to the parent directory,  and beyond the nul terminator is the new directory to create */
-       if (nfs_lookuppath_async(nfs, new_path, cb, private_data, nfs_creat_continue_internal, new_path, free, mode) != 0) {
+       if (nfs_lookuppath_async(nfs, cb_data->path, cb, private_data, nfs_create_continue_internal, cb_data, free_create_cb_data, 0) != 0) {
                rpc_set_error(nfs->rpc, "Out of memory: failed to start parsing the path components");
                return -1;
        }
@@ -2671,6 +2705,11 @@ int nfs_creat_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb
        return 0;
 }
 
+int nfs_creat_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb cb, void *private_data)
+{
+       return nfs_create_async(nfs, path, 0, mode, cb, private_data);
+}
+
 
 
 

diff --git a/lib/socket.c b/lib/socket.c
index f973f0178b923a0dab3f369fea14a04b076e85ab..3f7f89f90c9a368dc5ff6c48c0ab87f790d4e096 100644 (file)
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -506,7 +506,7 @@ static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_s
                                        ((struct sockaddr_in6 *)&ss)->sin6_port = port;
                                        ((struct sockaddr_in6 *)&ss)->sin6_family      = AF_INET6;
 #ifdef HAVE_SOCKADDR_LEN
-                                       ((struct sockaddr_in6 *)&ss)->sin6_len = sizeof(struct sockaddr6_in);
+                                       ((struct sockaddr_in6 *)&ss)->sin6_len = sizeof(struct sockaddr_in6);
 #endif
                                        break;
                                }

diff --git a/packaging/RPM/libnfs.spec.in b/packaging/RPM/libnfs.spec.in
index 8b34636f30ce38d0146e1efc4d4144f5c56e43a5..0535743e48d7aabacaa75b83784f08b1747d9101 100644 (file)
--- a/packaging/RPM/libnfs.spec.in
+++ b/packaging/RPM/libnfs.spec.in
@@ -108,6 +108,8 @@ Utility programs for LibNFS
 %{_mandir}/man1/nfs-ls.1.gz
 
 %changelog
+* Sat Jul 19 2014 : Version 1.9.5
+ - Remove old ONC-RPC symbols
 * Wed Mar 19 2014 : Version 1.9.3
  - Add O_TRUNC support to nfs_open()
  - Add a simple but incomplete LD_PRELOAD tool