#include "win32_compat.h"
#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
#ifdef HAVE_NET_IF_H
#include <net/if.h>
#endif
#include <sys/ioctl.h>
#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
#ifdef HAVE_POLL_H
#include <poll.h>
#endif
#include <sys/sockio.h>
#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
#include "libnfs-zdr.h"
#include "libnfs.h"
#include "libnfs-raw.h"
#include "libnfs-private.h"
struct sync_cb_data {
- int is_finished;
- int status;
- uint64_t offset;
- void *return_data;
- int return_int;
+ int is_finished;
+ int status;
+ uint64_t offset;
+ void *return_data;
+ int return_int;
+ const char *call;
};
return cb_data.status;
}
+static void stat64_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, "stat call failed with \"%s\"", (char *)data);
+ return;
+ }
+ memcpy(cb_data->return_data, data, sizeof(struct nfs_stat_64));
+}
+
+int nfs_stat64(struct nfs_context *nfs, const char *path, struct nfs_stat_64 *st)
+{
+ struct sync_cb_data cb_data;
+
+ cb_data.is_finished = 0;
+ cb_data.return_data = st;
+
+ if (nfs_stat64_async(nfs, path, stat64_cb, &cb_data) != 0) {
+ nfs_set_error(nfs, "nfs_stat64_async failed");
+ return -1;
+ }
+
+ wait_for_nfs_reply(nfs, &cb_data);
+
+ return cb_data.status;
+}
+
+int nfs_lstat64(struct nfs_context *nfs, const char *path, struct nfs_stat_64 *st)
+{
+ struct sync_cb_data cb_data;
+
+ cb_data.is_finished = 0;
+ cb_data.return_data = st;
+
+ if (nfs_lstat64_async(nfs, path, stat64_cb, &cb_data) != 0) {
+ nfs_set_error(nfs, "nfs_lstat64_async failed");
+ return -1;
+ }
+
+ wait_for_nfs_reply(nfs, &cb_data);
+
+ return cb_data.status;
+}
/*
* open()
*nfsfh = fh;
}
-int nfs_open(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh)
+int nfs_open(struct nfs_context *nfs, const char *path, int flags, struct nfsfh **nfsfh)
{
struct sync_cb_data cb_data;
cb_data.is_finished = 0;
cb_data.return_data = nfsfh;
- if (nfs_open_async(nfs, path, mode, open_cb, &cb_data) != 0) {
+ if (nfs_open_async(nfs, path, flags, open_cb, &cb_data) != 0) {
nfs_set_error(nfs, "nfs_open_async failed");
return -1;
}
cb_data->status = status;
if (status < 0) {
- nfs_set_error(nfs, "pread call failed with \"%s\"", (char *)data);
+ nfs_set_error(nfs, "%s call failed with \"%s\"", cb_data->call, (char *)data);
return;
}
cb_data.is_finished = 0;
cb_data.return_data = buffer;
+ cb_data.call = "pread";
if (nfs_pread_async(nfs, nfsfh, offset, count, pread_cb, &cb_data) != 0) {
nfs_set_error(nfs, "nfs_pread_async failed");
*/
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);
+ struct sync_cb_data cb_data;
+
+ cb_data.is_finished = 0;
+ cb_data.return_data = buffer;
+ cb_data.call = "read";
+
+ if (nfs_read_async(nfs, nfsfh, count, pread_cb, &cb_data) != 0) {
+ nfs_set_error(nfs, "nfs_read_async failed");
+ return -1;
+ }
+
+ wait_for_nfs_reply(nfs, &cb_data);
+
+ return cb_data.status;
}
/*
return cb_data.status;
}
+/*
+ * fstat64()
+ */
+int nfs_fstat64(struct nfs_context *nfs, struct nfsfh *nfsfh, struct nfs_stat_64 *st)
+{
+ struct sync_cb_data cb_data;
+
+ cb_data.is_finished = 0;
+ cb_data.return_data = st;
+
+ if (nfs_fstat64_async(nfs, nfsfh, stat64_cb, &cb_data) != 0) {
+ nfs_set_error(nfs, "nfs_fstat64_async failed");
+ return -1;
+ }
+
+ wait_for_nfs_reply(nfs, &cb_data);
+
+ return cb_data.status;
+}
+
/*
* pwrite()
cb_data->is_finished = 1;
cb_data->status = status;
- if (status < 0) {
- nfs_set_error(nfs, "pwrite call failed with \"%s\"", (char *)data);
- return;
- }
+ if (status < 0)
+ nfs_set_error(nfs, "%s call failed with \"%s\"", cb_data->call, (char *)data);
}
int nfs_pwrite(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offset, uint64_t count, char *buf)
struct sync_cb_data cb_data;
cb_data.is_finished = 0;
+ cb_data.call = "pwrite";
if (nfs_pwrite_async(nfs, nfsfh, offset, count, buf, pwrite_cb, &cb_data) != 0) {
nfs_set_error(nfs, "nfs_pwrite_async failed");
*/
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);
+ struct sync_cb_data cb_data;
+
+ cb_data.is_finished = 0;
+ cb_data.call = "write";
+
+ if (nfs_write_async(nfs, nfsfh, count, buf, pwrite_cb, &cb_data) != 0) {
+ nfs_set_error(nfs, "nfs_write_async failed");
+ return -1;
+ }
+
+ wait_for_nfs_reply(nfs, &cb_data);
+
+ return cb_data.status;
}
*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;
}
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()
*/
}
}
-int nfs_lseek(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offset, int whence, uint64_t *current_offset)
+int nfs_lseek(struct nfs_context *nfs, struct nfsfh *nfsfh, int64_t offset, int whence, uint64_t *current_offset)
{
struct sync_cb_data cb_data;
return cb_data.status;
}
+int nfs_lchmod(struct nfs_context *nfs, const char *path, int mode)
+{
+ struct sync_cb_data cb_data;
+
+ cb_data.is_finished = 0;
+
+ if (nfs_lchmod_async(nfs, path, mode, chmod_cb, &cb_data) != 0) {
+ nfs_set_error(nfs, "nfs_lchmod_async failed");
+ return -1;
+ }
+
+ wait_for_nfs_reply(nfs, &cb_data);
+
+ return cb_data.status;
+}
+
return cb_data.status;
}
+/*
+ * lchown()
+ */
+int nfs_lchown(struct nfs_context *nfs, const char *path, int uid, int gid)
+{
+ struct sync_cb_data cb_data;
+
+ cb_data.is_finished = 0;
+
+ if (nfs_lchown_async(nfs, path, uid, gid, chown_cb, &cb_data) != 0) {
+ nfs_set_error(nfs, "nfs_lchown_async failed");
+ return -1;
+ }
+
+ wait_for_nfs_reply(nfs, &cb_data);
+
+ return cb_data.status;
+}
+
/*
* fchown()
*/
return cb_data.status;
}
+int nfs_lutimes(struct nfs_context *nfs, const char *path, struct timeval *times)
+{
+ struct sync_cb_data cb_data;
+
+ cb_data.is_finished = 0;
+
+ if (nfs_lutimes_async(nfs, path, times, utimes_cb, &cb_data) != 0) {
+ nfs_set_error(nfs, "nfs_lutimes_async failed");
+ return -1;
+ }
+
+ wait_for_nfs_reply(nfs, &cb_data);
+
+ return cb_data.status;
+}
+
/*
free(srv);
srv = next;
}
-}
+}
struct nfs_list_data {
int status;
srv_data->status = -1;
return;
}
-
+
/* check for dupes */
for (srvr = srv_data->srvrs; srvr; srvr = srvr->next) {
if (!strcmp(hostdd, srvr->addr)) {
srvr = malloc(sizeof(struct nfs_server_list));
if (srvr == NULL) {
- rpc_set_error(rpc, "Malloc failed when allocating server structure");
+ rpc_set_error(rpc, "Malloc failed when allocating server structure");
srv_data->status = -1;
return;
}
assert(rpc->magic == RPC_CONTEXT_MAGIC);
- for(i = 0; i < numIfs; i++)
+ for(i = 0; i < numIfs; i++)
{
SOCKADDR *pAddress;
char bcdd[16];
if(pAddress->sa_family != AF_INET)
continue;
-
+
nFlags = InterfaceList[i].iiFlags;
- if (!(nFlags & IFF_UP))
+ if (!(nFlags & IFF_UP))
{
continue;
}
- if (nFlags & IFF_LOOPBACK)
+ if (nFlags & IFF_LOOPBACK)
{
continue;
}
- if (!(nFlags & IFF_BROADCAST))
+ if (!(nFlags & IFF_BROADCAST))
{
continue;
}
- if (getnameinfo(pAddress, sizeof(struct sockaddr_in), &bcdd[0], sizeof(bcdd), NULL, 0, NI_NUMERICHOST) < 0)
+ 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)
+ 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)
+ if (rpc_pmap2_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, callit_cb, data) < 0)
{
return -1;
}
int nNumInterfaces = 0;
rpc = rpc_init_udp_context();
- if (rpc == NULL)
+ if (rpc == NULL)
{
return NULL;
}
- if (rpc_bind_udp(rpc, "0.0.0.0", 0) < 0)
+ 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)
+ 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++)
+ for (loop=0; loop<3; loop++)
{
- if (send_nfsd_probes(rpc, InterfaceList, nNumInterfaces, &data) != 0)
+ if (send_nfsd_probes(rpc, InterfaceList, nNumInterfaces, &data) != 0)
{
rpc_destroy_context(rpc);
return NULL;
}
win32_gettimeofday(&tv_start, NULL);
- for(;;)
+ for(;;)
{
int mpt;
- (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)
+ if (poll(&pfd, 1, mpt) < 0)
{
free_nfs_srvr_list(data.srvrs);
rpc_destroy_context(rpc);
return NULL;
}
- if (pfd.revents == 0)
+ if (pfd.revents == 0)
{
break;
}
-
- if (rpc_service(rpc, pfd.revents) < 0)
+
+ if (rpc_service(rpc, pfd.revents) < 0)
{
break;
}
rpc_destroy_context(rpc);
- if (data.status != 0)
+ if (data.status != 0)
{
free_nfs_srvr_list(data.srvrs);
return NULL;
return -1;
}
- if (rpc_pmap_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, callit_cb, data) < 0) {
+ if (rpc_pmap2_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, callit_cb, data) < 0) {
return -1;
}
}
while(ifc.ifc_len > (size - sizeof(struct ifreq))) {
size *= 2;
- free(ifc.ifc_buf);
+ free(ifc.ifc_buf);
ifc.ifc_len = size;
ifc.ifc_buf = malloc(size);
memset(ifc.ifc_buf, 0, size);
if (ioctl(rpc_get_fd(rpc), SIOCGIFCONF, (caddr_t)&ifc) < 0) {
rpc_destroy_context(rpc);
- free(ifc.ifc_buf);
+ free(ifc.ifc_buf);
return NULL;
}
- }
+ }
for (loop=0; loop<3; loop++) {
if (send_nfsd_probes(rpc, &ifc, &data) != 0) {
rpc_destroy_context(rpc);
- free(ifc.ifc_buf);
+ free(ifc.ifc_buf);
return NULL;
}
if (pfd.revents == 0) {
break;
}
-
+
if (rpc_service(rpc, pfd.revents) < 0) {
break;
}
}
}
- free(ifc.ifc_buf);
+ free(ifc.ifc_buf);
rpc_destroy_context(rpc);
if (data.status != 0) {