X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs-sync.c;h=836e1354eaef5683a75c3cdde991390d1e3a0834;hb=7057e733c1465661c410b65d90e4c5d0939f1617;hp=97d5a611247d585c8c596cc9e275ad8a4e3d39e4;hpb=fcc42bfe8501f9f4c5b69d19f5d196e5348c4c81;p=deb_libnfs.git diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c index 97d5a61..836e135 100644 --- a/lib/libnfs-sync.c +++ b/lib/libnfs-sync.c @@ -17,27 +17,58 @@ /* * 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 -#include +#include +#include +#endif /*WIN32*/ + +#ifdef ANDROID +#define statvfs statfs +#endif + +#ifdef HAVE_SYS_VFS_H +#include +#endif + +#ifdef HAVE_SYS_STATVFS_H #include -#include +#endif + +#ifdef HAVE_SYS_IOCTL_H #include -#include +#endif + +#ifdef HAVE_SYS_SOCKET_H #include -#include #endif -#ifdef HAVE_CONFIG_H -#include "config.h" +#ifdef HAVE_POLL_H +#include +#endif + +#ifdef HAVE_UNISTD_H +#include +#endif + +#ifdef HAVE_NETINET_IN_H +#include #endif #include #include #include +#include #include #include #include @@ -47,6 +78,7 @@ #include #endif +#include "libnfs-zdr.h" #include "libnfs.h" #include "libnfs-raw.h" #include "libnfs-raw-mount.h" @@ -56,7 +88,7 @@ struct sync_cb_data { int is_finished; int status; - off_t offset; + uint64_t offset; void *return_data; int return_int; }; @@ -66,6 +98,8 @@ static void wait_for_reply(struct rpc_context *rpc, struct sync_cb_data *cb_data { struct pollfd pfd; + assert(rpc->magic == RPC_CONTEXT_MAGIC); + while (!cb_data->is_finished) { pfd.fd = rpc_get_fd(rpc); @@ -105,19 +139,6 @@ static void wait_for_nfs_reply(struct nfs_context *nfs, struct sync_cb_data *cb_ cb_data->status = -EIO; break; } - if (nfs_get_fd(nfs) == -1) { - char *server = strdup(nfs_get_server(nfs)); - char *export = strdup(nfs_get_export(nfs)); - - if (nfs_mount(nfs, server, export) != 0) { - nfs_set_error(nfs, "Failed to reconnect to nfs server %s", nfs_get_error(nfs)); - free(server); - free(export); - break; - } - free(server); - free(export); - } } } @@ -145,6 +166,9 @@ static void mount_cb(int status, struct nfs_context *nfs, void *data, void *priv int nfs_mount(struct nfs_context *nfs, const char *server, const char *export) { struct sync_cb_data cb_data; + struct rpc_context *rpc = nfs_get_rpc_context(nfs); + + assert(rpc->magic == RPC_CONTEXT_MAGIC); cb_data.is_finished = 0; @@ -155,6 +179,9 @@ int nfs_mount(struct nfs_context *nfs, const char *server, const char *export) wait_for_nfs_reply(nfs, &cb_data); + /* Dont want any more callbacks even if the socket is closed */ + rpc->connect_cb = NULL; + return cb_data.status; } @@ -257,7 +284,7 @@ static void pread_cb(int status, struct nfs_context *nfs, void *data, void *priv memcpy(buffer, (char *)data, status); } -int nfs_pread(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buffer) +int nfs_pread(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offset, uint64_t count, char *buffer) { struct sync_cb_data cb_data; @@ -277,7 +304,7 @@ int nfs_pread(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t /* * read() */ -int nfs_read(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buffer) +int nfs_read(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t count, char *buffer) { return nfs_pread(nfs, nfsfh, nfs_get_current_offset(nfsfh), count, buffer); } @@ -352,7 +379,7 @@ static void pwrite_cb(int status, struct nfs_context *nfs, void *data, void *pri } } -int nfs_pwrite(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buf) +int nfs_pwrite(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offset, uint64_t count, char *buf) { struct sync_cb_data cb_data; @@ -371,7 +398,7 @@ int nfs_pwrite(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_ /* * write() */ -int nfs_write(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buf) +int nfs_write(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t count, char *buf) { return nfs_pwrite(nfs, nfsfh, nfs_get_current_offset(nfsfh), count, buf); } @@ -426,7 +453,7 @@ static void ftruncate_cb(int status, struct nfs_context *nfs, void *data, void * } } -int nfs_ftruncate(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t length) +int nfs_ftruncate(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t length) { struct sync_cb_data cb_data; @@ -459,7 +486,7 @@ static void truncate_cb(int status, struct nfs_context *nfs, void *data, void *p } } -int nfs_truncate(struct nfs_context *nfs, const char *path, off_t length) +int nfs_truncate(struct nfs_context *nfs, const char *path, uint64_t length) { struct sync_cb_data cb_data; @@ -585,7 +612,37 @@ int nfs_creat(struct nfs_context *nfs, const char *path, int mode, struct nfsfh return cb_data.status; } +/* + * mknod() + */ +static void mknod_cb(int status, struct nfs_context *nfs, void *data, void *private_data) +{ + struct sync_cb_data *cb_data = private_data; + + cb_data->is_finished = 1; + cb_data->status = status; + + if (status < 0) { + nfs_set_error(nfs, "mknod call failed with \"%s\"", (char *)data); + return; + } +} + +int nfs_mknod(struct nfs_context *nfs, const char *path, int mode, int dev) +{ + struct sync_cb_data cb_data; + + cb_data.is_finished = 0; + + if (nfs_mknod_async(nfs, path, mode, dev, mknod_cb, &cb_data) != 0) { + nfs_set_error(nfs, "nfs_creat_async failed"); + return -1; + } + wait_for_nfs_reply(nfs, &cb_data); + + return cb_data.status; +} /* @@ -677,11 +734,11 @@ static void lseek_cb(int status, struct nfs_context *nfs, void *data, void *priv } if (cb_data->return_data != NULL) { - memcpy(cb_data->return_data, data, sizeof(off_t)); + memcpy(cb_data->return_data, data, sizeof(uint64_t)); } } -int nfs_lseek(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, int whence, off_t *current_offset) +int nfs_lseek(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offset, int whence, uint64_t *current_offset) { struct sync_cb_data cb_data; @@ -1125,7 +1182,9 @@ int nfs_link(struct nfs_context *nfs, const char *oldpath, const char *newpath) void mount_getexports_cb(struct rpc_context *mount_context, int status, void *data, void *private_data) { struct sync_cb_data *cb_data = private_data; - exports export = *(exports *)data; + exports export; + + assert(mount_context->magic == RPC_CONTEXT_MAGIC); cb_data->is_finished = 1; cb_data->status = status; @@ -1136,6 +1195,7 @@ void mount_getexports_cb(struct rpc_context *mount_context, int status, void *da return; } + export = *(exports *)data; while (export != NULL) { exports new_export; @@ -1207,6 +1267,8 @@ void callit_cb(struct rpc_context *rpc, int status, void *data _U_, void *privat char hostdd[16]; struct nfs_server_list *srvr; + assert(rpc->magic == RPC_CONTEXT_MAGIC); + if (status == RPC_STATUS_CANCEL) { return; } @@ -1260,6 +1322,8 @@ static int send_nfsd_probes(struct rpc_context *rpc, INTERFACE_INFO *InterfaceLi { int i=0; + assert(rpc->magic == RPC_CONTEXT_MAGIC); + for(i = 0; i < numIfs; i++) { SOCKADDR *pAddress; @@ -1390,6 +1454,8 @@ static int send_nfsd_probes(struct rpc_context *rpc, struct ifconf *ifc, struct { char *ptr; + assert(rpc->magic == RPC_CONTEXT_MAGIC); + for (ptr =(char *)(ifc->ifc_buf); ptr < (char *)(ifc->ifc_buf) + ifc->ifc_len; ) { struct ifreq *ifr; char bcdd[16];