* High level api to nfs filesystems
*/
+#if defined (WIN32)
+#include <winsock2.h>
+#define DllExport
+#else
+#include <strings.h>
+#include <unistd.h>
+#include <sys/statvfs.h>
+#include <poll.h>
+#include <sys/ioctl.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#endif
+
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <strings.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/statvfs.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <poll.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netdb.h>
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
#include "libnfs.h"
#include "libnfs-raw.h"
#include "libnfs-raw-mount.h"
{
struct pollfd pfd;
- for (;;) {
- if (cb_data->is_finished) {
- break;
- }
+ 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;
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;
+ }
+ 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);
+ }
}
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
return -1;
}
- wait_for_reply(nfs_get_rpc_context(nfs), &cb_data);
+ wait_for_nfs_reply(nfs, &cb_data);
return cb_data.status;
}
-
+#if !defined(WIN32)
void free_nfs_srvr_list(struct nfs_server_list *srv)
{
while (srv != NULL) {
/* check for dupes */
for (srvr = srv_data->srvrs; srvr; srvr = srvr->next) {
if (!strcmp(hostdd, srvr->addr)) {
- return 0;
+ return;
}
}
return data.srvrs;
}
+#endif