X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs-sync.c;h=2fe5ed5a5886a78ab0050a3af02ddb6ff0c98d37;hb=d7c6e9aaa9df593e951e2f19106dcc71102e74f1;hp=4e83b5b33e7557ebb91a7143aaed2c78cf85e563;hpb=e5964ef9058fea8a23434ea4533b4bd80b308172;p=deb_libnfs.git diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c index 4e83b5b..2fe5ed5 100644 --- a/lib/libnfs-sync.c +++ b/lib/libnfs-sync.c @@ -17,23 +17,53 @@ /* * High level api to nfs filesystems */ +#ifdef WIN32 +#include "win32_compat.h" +#define DllExport +#define HAVE_POLL_H +#else +#include +#include +#include +#include +#include +#include +#ifdef AROS +#include "aros_compat.h" +#else +#ifdef ANDROID +#include +#include +#define statvfs statfs +#else +#include +#endif /*ANDRIOD*/ +#endif /*AROS*/ +#endif /*WIN32*/ + +#ifdef HAVE_CONFIG_H #include "config.h" +#endif + +#ifdef HAVE_POLL_H +#include +#endif + #include #include #include -#include +#include #include #include -#include -#include -#include #include #include -#include -#include -#include -#include + +#ifdef HAVE_SYS_SOCKIO_H +#include +#endif + +#include "libnfs-zdr.h" #include "libnfs.h" #include "libnfs-raw.h" #include "libnfs-raw-mount.h" @@ -43,7 +73,7 @@ struct sync_cb_data { int is_finished; int status; - off_t offset; + uint64_t offset; void *return_data; int return_int; }; @@ -53,13 +83,12 @@ static void wait_for_reply(struct rpc_context *rpc, struct sync_cb_data *cb_data { struct pollfd pfd; - for (;;) { - if (cb_data->is_finished) { - break; - } + assert(rpc->magic == RPC_CONTEXT_MAGIC); + + while (!cb_data->is_finished) { + pfd.fd = rpc_get_fd(rpc); pfd.events = rpc_which_events(rpc); - if (poll(&pfd, 1, -1) < 0) { rpc_set_error(rpc, "Poll failed"); cb_data->status = -EIO; @@ -70,6 +99,31 @@ static void wait_for_reply(struct rpc_context *rpc, struct sync_cb_data *cb_data cb_data->status = -EIO; break; } + if (rpc_get_fd(rpc) == -1) { + rpc_set_error(rpc, "Socket closed\n"); + break; + } + } +} + +static void wait_for_nfs_reply(struct nfs_context *nfs, struct sync_cb_data *cb_data) +{ + struct pollfd pfd; + + while (!cb_data->is_finished) { + + pfd.fd = nfs_get_fd(nfs); + pfd.events = nfs_which_events(nfs); + if (poll(&pfd, 1, -1) < 0) { + nfs_set_error(nfs, "Poll failed"); + cb_data->status = -EIO; + break; + } + if (nfs_service(nfs, pfd.revents) < 0) { + nfs_set_error(nfs, "nfs_service failed"); + cb_data->status = -EIO; + break; + } } } @@ -97,6 +151,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; @@ -105,7 +162,10 @@ int nfs_mount(struct nfs_context *nfs, const char *server, const char *export) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + 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; } @@ -141,7 +201,7 @@ int nfs_stat(struct nfs_context *nfs, const char *path, struct stat *st) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -182,7 +242,7 @@ int nfs_open(struct nfs_context *nfs, const char *path, int mode, struct nfsfh * return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -209,7 +269,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; @@ -221,7 +281,7 @@ int nfs_pread(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -229,7 +289,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); } @@ -260,7 +320,7 @@ int nfs_close(struct nfs_context *nfs, struct nfsfh *nfsfh) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -283,7 +343,7 @@ int nfs_fstat(struct nfs_context *nfs, struct nfsfh *nfsfh, struct stat *st) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -304,7 +364,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; @@ -315,7 +375,7 @@ int nfs_pwrite(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_ return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -323,7 +383,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); } @@ -355,7 +415,7 @@ int nfs_fsync(struct nfs_context *nfs, struct nfsfh *nfsfh) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -378,7 +438,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; @@ -389,7 +449,7 @@ int nfs_ftruncate(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t length) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -411,7 +471,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; @@ -422,7 +482,7 @@ int nfs_truncate(struct nfs_context *nfs, const char *path, off_t length) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -457,7 +517,7 @@ int nfs_mkdir(struct nfs_context *nfs, const char *path) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -492,7 +552,7 @@ int nfs_rmdir(struct nfs_context *nfs, const char *path) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -532,12 +592,42 @@ int nfs_creat(struct nfs_context *nfs, const char *path, int mode, struct nfsfh return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); 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; +} /* @@ -567,7 +657,7 @@ int nfs_unlink(struct nfs_context *nfs, const char *path) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -607,7 +697,7 @@ int nfs_opendir(struct nfs_context *nfs, const char *path, struct nfsdir **nfsdi return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -629,11 +719,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; @@ -645,7 +735,7 @@ int nfs_lseek(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, int wh return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -682,7 +772,7 @@ int nfs_statvfs(struct nfs_context *nfs, const char *path, struct statvfs *svfs) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -728,7 +818,7 @@ int nfs_readlink(struct nfs_context *nfs, const char *path, char *buf, int bufsi return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -762,7 +852,7 @@ int nfs_chmod(struct nfs_context *nfs, const char *path, int mode) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -797,7 +887,7 @@ int nfs_fchmod(struct nfs_context *nfs, struct nfsfh *nfsfh, int mode) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -832,7 +922,7 @@ int nfs_chown(struct nfs_context *nfs, const char *path, int uid, int gid) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -864,7 +954,7 @@ int nfs_fchown(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int gid) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -898,7 +988,7 @@ int nfs_utimes(struct nfs_context *nfs, const char *path, struct timeval *times) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -932,7 +1022,7 @@ int nfs_utime(struct nfs_context *nfs, const char *path, struct utimbuf *times) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -967,7 +1057,7 @@ int nfs_access(struct nfs_context *nfs, const char *path, int mode) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -1001,7 +1091,7 @@ int nfs_symlink(struct nfs_context *nfs, const char *oldpath, const char *newpat return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -1035,7 +1125,7 @@ int nfs_rename(struct nfs_context *nfs, const char *oldpath, const char *newpath return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -1069,7 +1159,7 @@ int nfs_link(struct nfs_context *nfs, const char *oldpath, const char *newpath) return -1; } - wait_for_reply(nfs_get_rpc_context(nfs), &cb_data); + wait_for_nfs_reply(nfs, &cb_data); return cb_data.status; } @@ -1077,7 +1167,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; @@ -1088,6 +1180,7 @@ void mount_getexports_cb(struct rpc_context *mount_context, int status, void *da return; } + export = *(exports *)data; while (export != NULL) { exports new_export; @@ -1136,7 +1229,6 @@ void mount_free_export_list(struct exportnode *exports) - void free_nfs_srvr_list(struct nfs_server_list *srv) { while (srv != NULL) { @@ -1160,6 +1252,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; } @@ -1180,8 +1274,14 @@ void callit_cb(struct rpc_context *rpc, int status, void *data _U_, void *privat srv_data->status = -1; return; } - + /* check for dupes */ + for (srvr = srv_data->srvrs; srvr; srvr = srvr->next) { + if (!strcmp(hostdd, srvr->addr)) { + return; + } + } + srvr = malloc(sizeof(struct nfs_server_list)); if (srvr == NULL) { rpc_set_error(rpc, "Malloc failed when allocating server structure"); @@ -1201,10 +1301,146 @@ void callit_cb(struct rpc_context *rpc, int status, void *data _U_, void *privat srv_data->srvrs = srvr; } +#ifdef WIN32 + +static int send_nfsd_probes(struct rpc_context *rpc, INTERFACE_INFO *InterfaceList, int numIfs, struct nfs_list_data *data) +{ + int i=0; + + assert(rpc->magic == RPC_CONTEXT_MAGIC); + + for(i = 0; i < numIfs; i++) + { + SOCKADDR *pAddress; + char bcdd[16]; + unsigned long nFlags = 0; + + pAddress = (SOCKADDR *) & (InterfaceList[i].iiBroadcastAddress); + + if(pAddress->sa_family != AF_INET) + continue; + + nFlags = InterfaceList[i].iiFlags; + + if (!(nFlags & IFF_UP)) + { + continue; + } + + if (nFlags & IFF_LOOPBACK) + { + continue; + } + + if (!(nFlags & IFF_BROADCAST)) + { + continue; + } + + if (getnameinfo(pAddress, sizeof(struct sockaddr_in), &bcdd[0], sizeof(bcdd), NULL, 0, NI_NUMERICHOST) < 0) + { + continue; + } + + if (rpc_set_udp_destination(rpc, bcdd, 111, 1) < 0) + { + return -1; + } + + if (rpc_pmap_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, callit_cb, data) < 0) + { + return -1; + } + } + return 0; +} + +struct nfs_server_list *nfs_find_local_servers(void) +{ + struct rpc_context *rpc; + struct nfs_list_data data = {0, NULL}; + struct timeval tv_start, tv_current; + int loop; + struct pollfd pfd; + INTERFACE_INFO InterfaceList[20]; + unsigned long nBytesReturned; + int nNumInterfaces = 0; + + rpc = rpc_init_udp_context(); + if (rpc == NULL) + { + return NULL; + } + + if (rpc_bind_udp(rpc, "0.0.0.0", 0) < 0) + { + rpc_destroy_context(rpc); + return NULL; + } + + if (WSAIoctl(rpc_get_fd(rpc), SIO_GET_INTERFACE_LIST, 0, 0, &InterfaceList, sizeof(InterfaceList), &nBytesReturned, 0, 0) == SOCKET_ERROR) + { + return NULL; + } + + nNumInterfaces = nBytesReturned / sizeof(INTERFACE_INFO); + + for (loop=0; loop<3; loop++) + { + if (send_nfsd_probes(rpc, InterfaceList, nNumInterfaces, &data) != 0) + { + rpc_destroy_context(rpc); + return NULL; + } + + win32_gettimeofday(&tv_start, NULL); + for(;;) + { + int mpt; + + pfd.fd = rpc_get_fd(rpc); + pfd.events = rpc_which_events(rpc); + + win32_gettimeofday(&tv_current, NULL); + mpt = 1000 + - (tv_current.tv_sec *1000 + tv_current.tv_usec / 1000) + + (tv_start.tv_sec *1000 + tv_start.tv_usec / 1000); + + if (poll(&pfd, 1, mpt) < 0) + { + free_nfs_srvr_list(data.srvrs); + rpc_destroy_context(rpc); + return NULL; + } + if (pfd.revents == 0) + { + break; + } + + if (rpc_service(rpc, pfd.revents) < 0) + { + break; + } + } + } + + rpc_destroy_context(rpc); + + if (data.status != 0) + { + free_nfs_srvr_list(data.srvrs); + return NULL; + } + return data.srvrs; +} +#else + static int send_nfsd_probes(struct rpc_context *rpc, struct ifconf *ifc, struct nfs_list_data *data) { 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]; @@ -1259,7 +1495,7 @@ struct nfs_server_list *nfs_find_local_servers(void) struct nfs_list_data data = {0, NULL}; struct timeval tv_start, tv_current; struct ifconf ifc; - int size; + int size, loop; struct pollfd pfd; rpc = rpc_init_udp_context(); @@ -1292,35 +1528,37 @@ struct nfs_server_list *nfs_find_local_servers(void) } } - if (send_nfsd_probes(rpc, &ifc, &data) != 0) { - rpc_destroy_context(rpc); - free(ifc.ifc_buf); - return NULL; - } - - gettimeofday(&tv_start, NULL); - for(;;) { - int mpt; - - pfd.fd = rpc_get_fd(rpc); - pfd.events = rpc_which_events(rpc); - - gettimeofday(&tv_current, NULL); - mpt = 1000 - - (tv_current.tv_sec *1000 + tv_current.tv_usec / 1000) - + (tv_start.tv_sec *1000 + tv_start.tv_usec / 1000); - - if (poll(&pfd, 1, mpt) < 0) { - free_nfs_srvr_list(data.srvrs); + for (loop=0; loop<3; loop++) { + if (send_nfsd_probes(rpc, &ifc, &data) != 0) { rpc_destroy_context(rpc); + free(ifc.ifc_buf); return NULL; } - if (pfd.revents == 0) { - break; - } + + gettimeofday(&tv_start, NULL); + for(;;) { + int mpt; + + pfd.fd = rpc_get_fd(rpc); + pfd.events = rpc_which_events(rpc); + + gettimeofday(&tv_current, NULL); + mpt = 1000 + - (tv_current.tv_sec *1000 + tv_current.tv_usec / 1000) + + (tv_start.tv_sec *1000 + tv_start.tv_usec / 1000); + + if (poll(&pfd, 1, mpt) < 0) { + free_nfs_srvr_list(data.srvrs); + rpc_destroy_context(rpc); + return NULL; + } + if (pfd.revents == 0) { + break; + } - if (rpc_service(rpc, pfd.revents) < 0) { - break; + if (rpc_service(rpc, pfd.revents) < 0) { + break; + } } } @@ -1331,6 +1569,6 @@ struct nfs_server_list *nfs_find_local_servers(void) free_nfs_srvr_list(data.srvrs); return NULL; } - return data.srvrs; } +#endif//WIN32