#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <netinet/in.h>
+#include "libnfs-zdr.h"
#include "libnfs.h"
#include "libnfs-raw.h"
#include "libnfs-raw-mount.h"
struct nfsfh {
struct nfs_fh3 fh;
int is_sync;
- off_t offset;
+ uint64_t offset;
};
struct nfs_context {
char *server;
char *export;
struct nfs_fh3 rootfh;
- size_t readmax;
- size_t writemax;
+ uint64_t readmax;
+ uint64_t writemax;
};
void nfs_free_nfsdir(struct nfsdir *nfsdir)
int error;
int cancel;
int num_calls;
- off_t start_offset, max_offset;
+ uint64_t start_offset, max_offset;
char *buffer;
};
struct nfs_mcb_data {
struct nfs_cb_data *data;
- off_t offset;
- size_t count;
+ uint64_t offset;
+ uint64_t count;
};
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);
}
return;
}
- if (rpc_pmap_getport_async(rpc, MOUNT_PROGRAM, MOUNT_V3, nfs_mount_3_cb, private_data) != 0) {
+ if (rpc_pmap_getport_async(rpc, MOUNT_PROGRAM, MOUNT_V3, IPPROTO_TCP, nfs_mount_3_cb, private_data) != 0) {
data->cb(-ENOMEM, nfs, command_data, data->private_data);
free_nfs_cb_data(data);
return;
if (res->GETATTR3res_u.resok.obj_attributes.type == NF3DIR) {
st.st_mode |= S_IFDIR ;
}
+ if (res->GETATTR3res_u.resok.obj_attributes.type == NF3REG) {
+ st.st_mode |= S_IFREG ;
+ }
st.st_nlink = res->GETATTR3res_u.resok.obj_attributes.nlink;
st.st_uid = res->GETATTR3res_u.resok.obj_attributes.uid;
st.st_gid = res->GETATTR3res_u.resok.obj_attributes.gid;
free(mdata);
}
-int nfs_pread_async(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, nfs_cb cb, void *private_data)
+int nfs_pread_async(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offset, uint64_t count, nfs_cb cb, void *private_data)
{
struct nfs_cb_data *data;
}
while (count > 0) {
- size_t readcount = count;
+ uint64_t readcount = count;
struct nfs_mcb_data *mdata;
if (readcount > nfs_get_readmax(nfs)) {
/*
* Async read()
*/
-int nfs_read_async(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, nfs_cb cb, void *private_data)
+int nfs_read_async(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t count, nfs_cb cb, void *private_data)
{
return nfs_pread_async(nfs, nfsfh, nfsfh->offset, count, cb, private_data);
}
}
-int nfs_pwrite_async(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buf, nfs_cb cb, void *private_data)
+int nfs_pwrite_async(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offset, uint64_t count, char *buf, nfs_cb cb, void *private_data)
{
struct nfs_cb_data *data;
data->start_offset = offset;
while (count > 0) {
- size_t writecount = count;
+ uint64_t writecount = count;
struct nfs_mcb_data *mdata;
if (writecount > nfs_get_writemax(nfs)) {
/*
* Async write()
*/
-int nfs_write_async(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buf, nfs_cb cb, void *private_data)
+int nfs_write_async(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t count, char *buf, nfs_cb cb, void *private_data)
{
return nfs_pwrite_async(nfs, nfsfh, nfsfh->offset, count, buf, cb, private_data);
}
free_nfs_cb_data(data);
}
-int nfs_ftruncate_async(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t length, nfs_cb cb, void *private_data)
+int nfs_ftruncate_async(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t length, nfs_cb cb, void *private_data)
{
struct nfs_cb_data *data;
SETATTR3args args;
*/
static int nfs_truncate_continue_internal(struct nfs_context *nfs, struct nfs_cb_data *data)
{
- off_t offset = data->continue_int;
+ uint64_t offset = data->continue_int;
struct nfsfh nfsfh;
nfsfh.fh.data.data_val = data->fh.data.data_val;
return 0;
}
-int nfs_truncate_async(struct nfs_context *nfs, const char *path, off_t length, nfs_cb cb, void *private_data)
+int nfs_truncate_async(struct nfs_context *nfs, const char *path, uint64_t length, nfs_cb cb, void *private_data)
{
- off_t offset;
+ uint64_t offset;
offset = length;
static int nfs_mkdir_continue_internal(struct nfs_context *nfs, struct nfs_cb_data *data)
{
char *str = data->continue_data;
-
+ MKDIR3args args;
+
str = &str[strlen(str) + 1];
- if (rpc_nfs_mkdir_async(nfs->rpc, nfs_mkdir_cb, &data->fh, str, data) != 0) {
+ memset(&args, 0, sizeof(MKDIR3args));
+ args.where.dir.data.data_len = data->fh.data.data_len;
+ args.where.dir.data.data_val = data->fh.data.data_val;
+ args.where.name = str;
+ args.attributes.mode.set_it = 1;
+ args.attributes.mode.set_mode3_u.mode = 0755;
+
+ if (rpc_nfs_mkdir_async(nfs->rpc, nfs_mkdir_cb, &args, data) != 0) {
rpc_set_error(nfs->rpc, "RPC error: Failed to send MKDIR call for %s", data->path);
data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
free_nfs_cb_data(data);
static int nfs_creat_continue_internal(struct nfs_context *nfs, struct nfs_cb_data *data)
{
char *str = data->continue_data;
-
+ CREATE3args args;
+
str = &str[strlen(str) + 1];
- if (rpc_nfs_create_async(nfs->rpc, nfs_creat_1_cb, &data->fh, str, data->continue_int, data) != 0) {
+
+ 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;
+ args.where.name = str;
+ args.how.mode = 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;
+
+ if (rpc_nfs_create_async(nfs->rpc, nfs_creat_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);
struct lseek_cb_data {
struct nfs_context *nfs;
struct nfsfh *nfsfh;
- off_t offset;
+ uint64_t offset;
nfs_cb cb;
void *private_data;
};
free(data);
}
-int nfs_lseek_async(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, int whence, nfs_cb cb, void *private_data)
+int nfs_lseek_async(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offset, int whence, nfs_cb cb, void *private_data)
{
struct lseek_cb_data *data;
static int nfs_readlink_continue_internal(struct nfs_context *nfs, struct nfs_cb_data *data)
{
- if (rpc_nfs_readlink_async(nfs->rpc, nfs_readlink_1_cb, &data->fh, data) != 0) {
+ READLINK3args args;
+
+ args.symlink.data.data_len = data->fh.data.data_len;
+ args.symlink.data.data_val = data->fh.data.data_val;
+
+ if (rpc_nfs_readlink_async(nfs->rpc, nfs_readlink_1_cb, &args, data) != 0) {
rpc_set_error(nfs->rpc, "RPC error: Failed to send READLINK call for %s", data->path);
data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
free_nfs_cb_data(data);
static int nfs_symlink_continue_internal(struct nfs_context *nfs, struct nfs_cb_data *data)
{
struct nfs_symlink_data *symlink_data = data->continue_data;
+ SYMLINK3args sa;
+
+ memset(&sa, 0, sizeof(SYMLINK3args));
+ sa.where.dir.data.data_len = data->fh.data.data_len;
+ sa.where.dir.data.data_val = data->fh.data.data_val;
+ sa.where.name = symlink_data->newpathobject;
+ sa.symlink.symlink_attributes.mode.set_it = 1;
+ sa.symlink.symlink_attributes.mode.set_mode3_u.mode = S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH;
+ sa.symlink.symlink_data = symlink_data->oldpath;
- if (rpc_nfs_symlink_async(nfs->rpc, nfs_symlink_cb, &data->fh, symlink_data->newpathobject, symlink_data->oldpath, data) != 0) {
+ if (rpc_nfs_symlink_async(nfs->rpc, nfs_symlink_cb, &sa, data) != 0) {
rpc_set_error(nfs->rpc, "RPC error: Failed to send SYMLINK call for %s", data->path);
data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
free_nfs_cb_data(data);
//qqq replace later with lseek()
-off_t nfs_get_current_offset(struct nfsfh *nfsfh)
+uint64_t nfs_get_current_offset(struct nfsfh *nfsfh)
{
return nfsfh->offset;
}
/*
* Get the maximum supported READ3 size by the server
*/
-size_t nfs_get_readmax(struct nfs_context *nfs)
+uint64_t nfs_get_readmax(struct nfs_context *nfs)
{
return nfs->readmax;
}
/*
* Get the maximum supported WRITE3 size by the server
*/
-size_t nfs_get_writemax(struct nfs_context *nfs)
+uint64_t nfs_get_writemax(struct nfs_context *nfs)
{
- /* Some XDR libraries can not marshall PDUs bigger than this */
+ /* Some ZDR libraries can not marshall PDUs bigger than this */
if (nfs->writemax < 32768) {
return nfs->writemax;
}
return;
}
- if (rpc_pmap_getport_async(rpc, MOUNT_PROGRAM, MOUNT_V3, mount_export_3_cb, private_data) != 0) {
+ if (rpc_pmap_getport_async(rpc, MOUNT_PROGRAM, MOUNT_V3, IPPROTO_TCP, mount_export_3_cb, private_data) != 0) {
data->cb(rpc, -ENOMEM, command_data, data->private_data);
free_mount_cb_data(data);
return;
return nfs->export;
}
+const struct nfs_fh3 *nfs_get_rootfh(struct nfs_context *nfs) {
+ return &nfs->rootfh;
+}
+
+struct nfs_fh3 *nfs_get_fh(struct nfsfh *nfsfh) {
+ return &nfsfh->fh;
+}