X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=examples%2Fnfsclient-bcast.c;h=9fb8073c9dc9037b2c72ff905ddf915f0aa11778;hb=2e4db0d14597fdb0013fb16f24b3f872d1217397;hp=6f48618259a15ec8a21c04b49ce928e0827b3a01;hpb=cb46c8fb9dfde942b531545359ed92313112e668;p=deb_libnfs.git

diff --git a/examples/nfsclient-bcast.c b/examples/nfsclient-bcast.c
index 6f48618..9fb8073 100644
--- a/examples/nfsclient-bcast.c
+++ b/examples/nfsclient-bcast.c
@@ -35,32 +35,68 @@
 #include "libnfs-raw-portmap.h"
 #include "libnfs-private.h"
 
-void pm_cb(struct rpc_context *rpc _U_, int status, void *data, void *private_data _U_)
+struct nfs_list_data {
+       int status;
+       struct nfs_server_list *srvrs;
+};
+
+void free_nfs_srvr_list(struct nfs_server_list *srv)
+{
+	while (srv != NULL) {
+		struct nfs_server_list *next = srv->next;
+
+		free(srv->addr);
+		free(srv);
+		srv = next;
+	}
+}	     
+
+void pm_cb(struct rpc_context *rpc, int status, void *data _U_, void *private_data)
 {
-	pmap_call_result *res = (pmap_call_result *)data;
+	struct nfs_list_data *srv_data = private_data;
 	struct sockaddr *sin;
 	char hostdd[16];
+	struct nfs_server_list *srvr;
 
 	if (status == RPC_STATUS_CANCEL) {
 		return;
 	}
 	if (status != 0) {
-		printf("callback for CALLIT failed\n");
-		exit(10);
+		srv_data->status = -1;
+		return;
 	}
 
 	sin = rpc_get_recv_sockaddr(rpc);
 	if (sin == NULL) {
-		printf("failed to get sockaddr for received pdu\n");
-		exit(10);
+		rpc_set_error(rpc, "failed to get sockaddr in CALLIT callback");
+		srv_data->status = -1;
+		return;
 	}
 
 	if (getnameinfo(sin, sizeof(struct sockaddr_in), &hostdd[0], sizeof(hostdd), NULL, 0, NI_NUMERICHOST) < 0) {
-		printf("getnameinfo failed\n");
-		exit(10);
+		rpc_set_error(rpc, "getnameinfo failed in CALLIT callback");
+		srv_data->status = -1;
+		return;
+	}
+
+	
+	srvr = malloc(sizeof(struct nfs_server_list));
+	if (srvr == NULL) {
+		rpc_set_error(rpc, "Malloc failed when allocating server structure");	
+		srv_data->status = -1;
+		return;
 	}
 
-	printf("NFS server at %s\n", hostdd);
+	srvr->addr = strdup(hostdd);
+	if (srvr->addr == NULL) {
+		rpc_set_error(rpc, "Strdup failed when allocating server structure");
+		free(srvr);
+		srv_data->status = -1;
+		return;
+	}
+
+	srvr->next = srv_data->srvrs;
+	srv_data->srvrs = srvr;
 }
 
 int main(int argc _U_, char *argv[] _U_)
@@ -70,6 +106,8 @@ int main(int argc _U_, char *argv[] _U_)
 	struct ifconf ifc;
 	int i, size;
 	struct timeval tv_start, tv_current;
+	struct nfs_list_data data = {0, NULL};
+	struct nfs_server_list *srvr;
 	
 	rpc = rpc_init_udp_context();
 	if (rpc == NULL) {
@@ -100,7 +138,7 @@ int main(int argc _U_, char *argv[] _U_)
 		}
 	}	
 
-	for (i=0; i<ifc.ifc_len / sizeof(struct ifconf); i++) {
+	for (i = 0; (unsigned)i < ifc.ifc_len / sizeof(struct ifconf); i++) {
 		char bcdd[16];
 
 		if (ifc.ifc_req[i].ifr_addr.sa_family != AF_INET) {
@@ -132,7 +170,7 @@ int main(int argc _U_, char *argv[] _U_)
 			exit(10);
 		}
 
-		if (rpc_pmap_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, pm_cb, NULL) < 0) {
+		if (rpc_pmap_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, pm_cb, &data) < 0) {
 			printf("Failed to set up callit function\n");
 			exit(10);
 		}
@@ -165,6 +203,11 @@ int main(int argc _U_, char *argv[] _U_)
 		}
 	}
 
+	for (srvr=data.srvrs; srvr; srvr = srvr->next) {
+		printf("NFS SERVER @ %s\n", srvr->addr);
+	}
+	free_nfs_srvr_list(data.srvrs);
+
 	rpc_destroy_context(rpc);
 	rpc=NULL;
 	return 0;