X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs.c;h=cd15fb01eabe0bcc4fa722f33d322d6ad719ba38;hb=1c8b4547cee99df587ed6b5d0112ab3f48d6534d;hp=2f47ba8f4245a95d3161cac6b0578518ef10d2f2;hpb=4a2b08768a0d9ec9f5604da76f8e41263f20b821;p=deb_libnfs.git

diff --git a/lib/libnfs.c b/lib/libnfs.c
index 2f47ba8..cd15fb0 100644
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -17,18 +17,48 @@
 /*
  * High level api to nfs filesystems
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef AROS
+#include "aros_compat.h"
+#endif
+
 #ifdef WIN32
 #include "win32_compat.h"
-#define DllExport
-#else
-#include <strings.h>
-#include <sys/statvfs.h>
+#endif
+
+#ifdef HAVE_UTIME_H
 #include <utime.h>
-#include <unistd.h>
-#endif/*WIN32*/
+#endif
+
+#ifdef ANDROID
+#define statvfs statfs
+#endif
 
 #define _GNU_SOURCE
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_VFS_H
+#include <sys/vfs.h>
+#endif
+
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -38,6 +68,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-raw-mount.h"
@@ -112,7 +143,7 @@ struct nfs_mcb_data {
 static int nfs_lookup_path_async_internal(struct nfs_context *nfs, struct nfs_cb_data *data, struct nfs_fh3 *fh);
 
 
-void nfs_set_auth(struct nfs_context *nfs, AUTH *auth)
+void nfs_set_auth(struct nfs_context *nfs, struct AUTH *auth)
 {
 	rpc_set_auth(nfs->rpc, auth);
 }
@@ -142,6 +173,148 @@ char *nfs_get_error(struct nfs_context *nfs)
 	return rpc_get_error(nfs->rpc);
 };
 
+static struct nfs_url *nfs_parse_url(struct nfs_context *nfs, char *url, int dir, int incomplete)
+{
+	struct nfs_url *urls;
+	char *strp, *flagsp, *strp2;
+
+	if (strncmp(url, "nfs://", 6)) {
+		rpc_set_error(nfs->rpc, "Invalid URL specified");
+		return NULL;
+	}
+
+	urls = malloc(sizeof(struct nfs_url));
+	if (urls == NULL) {
+		rpc_set_error(nfs->rpc, "Out of memory");
+		return NULL;
+	}
+
+	urls->server = strdup(url + 6);
+	if (urls->server == NULL) {
+		nfs_destroy_url(urls);
+		rpc_set_error(nfs->rpc, "Out of memory");
+		return NULL;
+	}
+
+	if (urls->server[0] == '/' || urls->server[0] == '\0' ||
+		urls->server[0] == '?') {
+		if (incomplete) {
+			flagsp = strchr(urls->server, '?');
+			goto flags;
+		}
+		nfs_destroy_url(urls);
+		rpc_set_error(nfs->rpc, "Invalid server string");
+		return NULL;
+	}
+
+	strp = strchr(urls->server, '/');
+	if (strp == NULL) {
+		if (incomplete) {
+			flagsp = strchr(urls->server, '?');
+			goto flags;
+		}
+		nfs_destroy_url(urls);
+		rpc_set_error(nfs->rpc, "Incomplete or invalid URL specified.");
+		return NULL;
+	}
+
+	urls->path = strdup(strp);
+	if (urls->path == NULL) {
+		nfs_destroy_url(urls);
+		rpc_set_error(nfs->rpc, "Out of memory");
+		return NULL;
+	}
+	*strp = 0;
+
+	if (dir) {
+		flagsp = strchr(urls->path, '?');
+		goto flags;
+	}
+
+	strp = strrchr(urls->path, '/');
+	if (strp == NULL) {
+		if (incomplete) {
+			flagsp = strchr(urls->path, '?');
+			goto flags;
+		}
+		nfs_destroy_url(urls);
+		rpc_set_error(nfs->rpc, "Incomplete or invalid URL specified.");
+		return NULL;
+	}
+	urls->file = strdup(strp);
+	if (urls->path == NULL) {
+		nfs_destroy_url(urls);
+		rpc_set_error(nfs->rpc, "Out of memory");
+		return NULL;
+	}
+	*strp = 0;
+	flagsp = strchr(urls->file, '?');
+
+flags:
+	if (flagsp) {
+		*flagsp = 0;
+	}
+
+	if (urls->file && !strlen(urls->file)) {
+		free(urls->file);
+		urls->file = NULL;
+		if (!incomplete) {
+			nfs_destroy_url(urls);
+			rpc_set_error(nfs->rpc, "Incomplete or invalid URL specified.");
+			return NULL;
+		}
+	}
+
+	if (urls->server && strlen(urls->server) <= 1) {
+		free(urls->server);
+		urls->server = NULL;
+	}
+
+	while (flagsp != NULL && *(flagsp+1) != 0) {
+		strp = flagsp + 1;
+		flagsp = strchr(strp, '&');
+		if (flagsp) {
+			*flagsp = 0;
+		}
+		strp2 = strchr(strp, '=');
+		if (strp2) {
+			*strp2 = 0;
+			strp2++;
+			if (!strncmp(strp, "tcp-syncnt", 10)) {
+				rpc_set_tcp_syncnt(nfs->rpc, atoi(strp2));
+			}
+		}
+	}
+
+	return urls;
+}
+
+struct nfs_url *nfs_parse_url_full(struct nfs_context *nfs, const char *url)
+{
+	return nfs_parse_url(nfs, url, 0, 0);
+}
+
+struct nfs_url *nfs_parse_url_dir(struct nfs_context *nfs, const char *url)
+{
+	return nfs_parse_url(nfs, url, 1, 0);
+}
+
+struct nfs_url *nfs_parse_url_incomplete(struct nfs_context *nfs, const char *url)
+{
+	return nfs_parse_url(nfs, url, 0, 1);
+}
+
+
+void nfs_destroy_url(struct nfs_url *url)
+{
+	if (url) {
+		free(url->server);
+		free(url->path);
+		free(url->file);
+	}
+	free(url);
+}
+
 struct nfs_context *nfs_init_context(void)
 {
 	struct nfs_context *nfs;
@@ -188,6 +361,155 @@ void nfs_destroy_context(struct nfs_context *nfs)
 	free(nfs);
 }
 
+struct rpc_cb_data {
+       char *server;
+       uint32_t program;
+       uint32_t version;
+
+       rpc_cb cb;
+       void *private_data;
+};       
+
+void free_rpc_cb_data(struct rpc_cb_data *data)
+{
+	free(data->server);
+	data->server = NULL;
+	free(data);
+}
+
+static void rpc_connect_program_4_cb(struct rpc_context *rpc, int status, void *command_data, void *private_data)
+{
+	struct rpc_cb_data *data = private_data;
+
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	/* Dont want any more callbacks even if the socket is closed */
+	rpc->connect_cb = NULL;
+
+	if (status == RPC_STATUS_ERROR) {
+		data->cb(rpc, status, command_data, data->private_data);
+		free_rpc_cb_data(data);
+		return;
+	}
+	if (status == RPC_STATUS_CANCEL) {
+		data->cb(rpc, status, "Command was cancelled", data->private_data);
+		free_rpc_cb_data(data);
+		return;
+	}
+
+	data->cb(rpc, status, NULL, data->private_data);
+	free_rpc_cb_data(data);
+}
+
+static void rpc_connect_program_3_cb(struct rpc_context *rpc, int status, void *command_data, void *private_data)
+{
+	struct rpc_cb_data *data = private_data;
+	uint32_t rpc_port;
+
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	if (status == RPC_STATUS_ERROR) {	
+		data->cb(rpc, status, command_data, data->private_data);
+		free_rpc_cb_data(data);
+		return;
+	}
+	if (status == RPC_STATUS_CANCEL) {
+		data->cb(rpc, status, "Command was cancelled", data->private_data);
+		free_rpc_cb_data(data);
+		return;
+	}
+
+	rpc_port = *(uint32_t *)command_data;
+	if (rpc_port == 0) {
+		rpc_set_error(rpc, "RPC error. Program is not available on %s", data->server);
+		data->cb(rpc, RPC_STATUS_ERROR, rpc_get_error(rpc), data->private_data);
+		free_rpc_cb_data(data);
+		return;
+	}
+
+	rpc_disconnect(rpc, "normal disconnect");
+	if (rpc_connect_async(rpc, data->server, rpc_port, rpc_connect_program_4_cb, data) != 0) {
+		data->cb(rpc, status, command_data, data->private_data);
+		free_rpc_cb_data(data);
+		return;
+	}
+}
+
+static void rpc_connect_program_2_cb(struct rpc_context *rpc, int status, void *command_data, void *private_data)
+{
+	struct rpc_cb_data *data = private_data;
+
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	if (status == RPC_STATUS_ERROR) {
+		data->cb(rpc, status, command_data, data->private_data);
+		free_rpc_cb_data(data);
+		return;
+	}
+	if (status == RPC_STATUS_CANCEL) {
+		data->cb(rpc, status, "Command was cancelled", data->private_data);
+		free_rpc_cb_data(data);
+		return;
+	}
+
+	if (rpc_pmap_getport_async(rpc, data->program, data->version, IPPROTO_TCP, rpc_connect_program_3_cb, private_data) != 0) {
+		data->cb(rpc, status, command_data, data->private_data);
+		free_rpc_cb_data(data);
+		return;
+	}
+}
+
+static void rpc_connect_program_1_cb(struct rpc_context *rpc, int status, void *command_data, void *private_data)
+{
+	struct rpc_cb_data *data = private_data;
+
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	/* Dont want any more callbacks even if the socket is closed */
+	rpc->connect_cb = NULL;
+
+	if (status == RPC_STATUS_ERROR) {
+		data->cb(rpc, status, command_data, data->private_data);
+		free_rpc_cb_data(data);
+		return;
+	}
+	if (status == RPC_STATUS_CANCEL) {
+		data->cb(rpc, status, "Command was cancelled", data->private_data);
+		free_rpc_cb_data(data);
+		return;
+	}
+
+	if (rpc_pmap_null_async(rpc, rpc_connect_program_2_cb, data) != 0) {
+		data->cb(rpc, status, command_data, data->private_data);
+		free_rpc_cb_data(data);
+		return;
+	}
+}
+
+int rpc_connect_program_async(struct rpc_context *rpc, char *server, int program, int version, rpc_cb cb, void *private_data)
+{
+	struct rpc_cb_data *data;
+
+	data = malloc(sizeof(struct rpc_cb_data));
+	if (data == NULL) {
+		return -1;
+	}
+	memset(data, 0, sizeof(struct rpc_cb_data));
+	data->server       = strdup(server);
+	data->program      = program;
+	data->version      = version;
+
+	data->cb           = cb;
+	data->private_data = private_data;
+
+	if (rpc_connect_async(rpc, server, 111, rpc_connect_program_1_cb, data) != 0) {
+		rpc_set_error(rpc, "Failed to start connection");
+		free_rpc_cb_data(data);
+		return -1;
+	}
+	return 0;
+}
+
 void free_nfs_cb_data(struct nfs_cb_data *data)
 {
 	if (data->saved_path != NULL) {
@@ -637,8 +959,8 @@ static int nfs_lookuppath_async(struct nfs_context *nfs, const char *path, nfs_c
 {
 	struct nfs_cb_data *data;
 
-	if (path[0] != '/') {
-		rpc_set_error(nfs->rpc, "Pathname is not absulute %s", path);
+	if (path[0] != 0 && path[0] != '/') {
+		rpc_set_error(nfs->rpc, "Pathname is not absolute %s", path);
 		return -1;
 	}
 
@@ -997,7 +1319,7 @@ int nfs_pread_async(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offse
 
 	/* trying to read more than maximum server read size, we has to chop it up into smaller
 	 * reads and collect into a reassembly buffer.
-	 * we send all reads in parallell so that performance is still good.
+	 * we send all reads in parallel so that performance is still good.
 	 */
 	data->max_offset = offset;
 	data->start_offset = offset;
@@ -1177,7 +1499,7 @@ int nfs_pwrite_async(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offs
 
 	/* trying to write more than maximum server write size, we has to chop it up into smaller
 	 * chunks.
-	 * we send all writes in parallell so that performance is still good.
+	 * we send all writes in parallel so that performance is still good.
 	 */
 	data->max_offset = offset;
 	data->start_offset = offset;
@@ -1652,10 +1974,10 @@ static void nfs_create_2_cb(struct rpc_context *rpc, int status, void *command_d
 	}
 	memset(nfsfh, 0, sizeof(struct nfsfh));
 
-	/* steal the filehandle */
-	nfsfh->fh.data.data_len = data->fh.data.data_len;
-	nfsfh->fh.data.data_val = data->fh.data.data_val;
-	data->fh.data.data_val = NULL;
+	/* 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);
+	memcpy(nfsfh->fh.data.data_val, res->LOOKUP3res_u.resok.object.data.data_val, nfsfh->fh.data.data_len);
 
 	data->cb(0, nfs, nfsfh, data->private_data);
 	free_nfs_cb_data(data);
@@ -1688,7 +2010,7 @@ static void nfs_creat_1_cb(struct rpc_context *rpc, int status, void *command_da
 	if (res->status != NFS3_OK) {
 		rpc_set_error(nfs->rpc, "NFS: CREATE of %s/%s failed with %s(%d)", data->saved_path, str, nfsstat3_to_str(res->status), nfsstat3_to_errno(res->status));
 		data->cb(nfsstat3_to_errno(res->status), nfs, rpc_get_error(nfs->rpc), data->private_data);
-
+		free_nfs_cb_data(data);
 		return;
 	}
 
@@ -1708,7 +2030,6 @@ static int nfs_creat_continue_internal(struct nfs_context *nfs, struct nfs_cb_da
 
 	str = &str[strlen(str) + 1];
 
-
 	memset(&args, 0, sizeof(CREATE3args));
 	args.where.dir.data.data_len = data->fh.data.data_len;
 	args.where.dir.data.data_val = data->fh.data.data_val;
@@ -1744,7 +2065,7 @@ int nfs_creat_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb
 	}
 	*ptr = 0;
 
-	/* new_path now points to the parent directory,  and beyond the nul terminateor is the new directory to create */
+	/* 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) {
 		rpc_set_error(nfs->rpc, "Out of memory: failed to start parsing the path components");
 		return -1;
@@ -2412,10 +2733,12 @@ static void nfs_statvfs_1_cb(struct rpc_context *rpc, int status, void *command_
 	svfs.f_bavail  = res->FSSTAT3res_u.resok.abytes/4096;
 	svfs.f_files   = res->FSSTAT3res_u.resok.tfiles;
 	svfs.f_ffree   = res->FSSTAT3res_u.resok.ffiles;
+#if !defined(ANDROID)
 	svfs.f_favail  = res->FSSTAT3res_u.resok.afiles;
 	svfs.f_fsid    = 0;
 	svfs.f_flag    = 0;
 	svfs.f_namemax = 256;
+#endif
 
 	data->cb(0, nfs, &svfs, data->private_data);
 	free_nfs_cb_data(data);
@@ -2862,9 +3185,6 @@ int nfs_utime_async(struct nfs_context *nfs, const char *path, struct utimbuf *t
 }
 
 
-
-
-
 /*
  * Async access()
  */
@@ -3417,11 +3737,7 @@ uint64_t nfs_get_readmax(struct nfs_context *nfs)
  */
 uint64_t nfs_get_writemax(struct nfs_context *nfs)
 {
-	/* Some XDR libraries can not marshall PDUs bigger than this */
-        if (nfs->writemax < 32768) {
-		return nfs->writemax;
-	}
-	return 32768;
+	return nfs->writemax;
 }
 
 void nfs_set_error(struct nfs_context *nfs, char *error_string, ...)