{
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;
}
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");
srv_data->srvrs = srvr;
}
-struct nfs_server_list *nfs_find_local_servers(void)
+static int send_nfsd_probes(struct rpc_context *rpc, struct ifconf *ifc, struct nfs_list_data *data)
{
- struct rpc_context *rpc;
- struct nfs_list_data data = {0, NULL};
- struct timeval tv_start, tv_current;
- struct ifconf ifc;
- int size;
- struct pollfd pfd;
char *ptr;
- 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;
- }
-
-
- /* get list of all interfaces */
- size = sizeof(struct ifreq);
- ifc.ifc_buf = NULL;
- ifc.ifc_len = size;
-
- while(ifc.ifc_len > (size - sizeof(struct ifreq))) {
- size *= 2;
-
- 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);
- return NULL;
- }
- }
-
- for (ptr =(char *)ifc.ifc_buf; ptr < ((char *)ifc.ifc_buf) + ifc.ifc_len; ) {
+ for (ptr =(char *)(ifc->ifc_buf); ptr < (char *)(ifc->ifc_buf) + ifc->ifc_len; ) {
struct ifreq *ifr;
char bcdd[16];
continue;
}
if (ioctl(rpc_get_fd(rpc), SIOCGIFFLAGS, ifr) < 0) {
- rpc_destroy_context(rpc);
- free(ifc.ifc_buf);
- return NULL;
+ return -1;
}
if (!(ifr->ifr_flags & IFF_UP)) {
continue;
continue;
}
if (rpc_set_udp_destination(rpc, bcdd, 111, 1) < 0) {
- rpc_destroy_context(rpc);
- free(ifc.ifc_buf);
- return NULL;
+ return -1;
}
- if (rpc_pmap_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, callit_cb, &data) < 0) {
- rpc_destroy_context(rpc);
- free(ifc.ifc_buf);
- return NULL;
+ if (rpc_pmap_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, callit_cb, data) < 0) {
+ return -1;
}
}
- free(ifc.ifc_buf);
- gettimeofday(&tv_start, NULL);
- for(;;) {
- int mpt;
+ return 0;
+}
- pfd.fd = rpc_get_fd(rpc);
- pfd.events = rpc_which_events(rpc);
+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;
+ struct ifconf ifc;
+ int size, loop;
+ struct pollfd pfd;
- 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);
+ rpc = rpc_init_udp_context();
+ if (rpc == NULL) {
+ return NULL;
+ }
- if (poll(&pfd, 1, mpt) < 0) {
- free_nfs_srvr_list(data.srvrs);
+ if (rpc_bind_udp(rpc, "0.0.0.0", 0) < 0) {
+ rpc_destroy_context(rpc);
+ return NULL;
+ }
+
+
+ /* get list of all interfaces */
+ size = sizeof(struct ifreq);
+ ifc.ifc_buf = NULL;
+ ifc.ifc_len = size;
+
+ while(ifc.ifc_len > (size - sizeof(struct ifreq))) {
+ size *= 2;
+
+ 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);
return NULL;
}
- if (pfd.revents == 0) {
- break;
+ }
+
+ for (loop=0; loop<3; loop++) {
+ 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);
+ 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;
+ }
}
}
+ free(ifc.ifc_buf);
rpc_destroy_context(rpc);
if (data.status != 0) {