X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fnfs%2Fconn.c;h=5160c8b29c2fd2c1632be80cbe67adbe1a0fda38;hp=a020394c86b7dc1541b58b3dcd823eaeefe8d6ff;hb=c2db41e8abb6ddc9d03a0c91c6db043fa0f85a8f;hpb=11d34d11153df198103a57291937ea9ff8b7356e

diff --git a/support/nfs/conn.c b/support/nfs/conn.c
index a020394..5160c8b 100644
--- a/support/nfs/conn.c
+++ b/support/nfs/conn.c
@@ -92,7 +92,7 @@ int get_socket(struct sockaddr_in *saddr, u_int p_prot, int resvp)
 			return RPC_ANYSOCK;
 		}
 	}
-	if (type == SOCK_STREAM) {
+	if (type == SOCK_STREAM || type == SOCK_DGRAM) {
 		cc = connect(so, (struct sockaddr *)saddr, namelen);
 		if (cc < 0) {
 			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
@@ -118,7 +118,7 @@ int get_socket(struct sockaddr_in *saddr, u_int p_prot, int resvp)
  */
 int
 clnt_ping(struct sockaddr_in *saddr, const u_long prog, const u_long vers,
-	  const u_int prot)
+	  const u_int prot, struct sockaddr_in *caddr)
 {
 	CLIENT *clnt=NULL;
 	int sock, stat;
@@ -160,8 +160,15 @@ clnt_ping(struct sockaddr_in *saddr, const u_long prog, const u_long vers,
 		rpc_createerr.cf_stat = stat;
 	}
 	clnt_destroy(clnt);
-	if (sock != -1)
+	if (sock != -1) {
+		if (caddr) {
+			/* Get the address of our end of this connection */
+			int len = sizeof(*caddr);
+			if (getsockname(sock, caddr, &len) != 0)
+				caddr->sin_family = 0;
+		}
 		close(sock);
+	}
 
 	if (stat == RPC_SUCCESS)
 		return 1;