X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fnfs%2Fconn.c;h=d153aa2d55831a0d0db4a1b74fff27ee3fb38ec6;hp=89f767676b2aeb5f85d0b485c6865b6f5837c2bb;hb=56a4a153c8559efe6e090e99eaf190d530299de2;hpb=4e9ed06f8f8a0cd9f34a6830c0ff14344a528042

diff --git a/support/nfs/conn.c b/support/nfs/conn.c
index 89f7676..d153aa2 100644
--- a/support/nfs/conn.c
+++ b/support/nfs/conn.c
@@ -25,31 +25,13 @@
 
 extern int verbose;
 
-/* Map an NFS version into the corresponding Mountd version */
-u_long nfsvers_to_mnt(const u_long vers)
-{
-	static const u_long nfs_to_mnt[] = { 0, 0, 1, 3 };
-	if (vers <= 3)
-		return nfs_to_mnt[vers];
-	return 0;
-}
-
-/* Map a Mountd version into the corresponding NFS version */
-u_long mntvers_to_nfs(const u_long vers)
-{
-	static const u_long mnt_to_nfs[] = { 0, 2, 2, 3 };
-	if (vers <= 3)
-		return mnt_to_nfs[vers];
-	return 0;
-}
-
 /*
  * Create a socket that is locally bound to a 
  * reserve or non-reserve port. For any failures,
  * RPC_ANYSOCK is returned which will cause 
  * the RPC code to create the socket instead. 
  */
-int get_socket(struct sockaddr_in *saddr, u_int p_prot, int resvp)
+int get_socket(struct sockaddr_in *saddr, u_int p_prot, int resvp, int conn)
 {
 	int so, cc, type;
 	struct sockaddr_in laddr;
@@ -98,7 +80,7 @@ int get_socket(struct sockaddr_in *saddr, u_int p_prot, int resvp)
 			return RPC_ANYSOCK;
 		}
 	}
-	if (type == SOCK_STREAM || type == SOCK_DGRAM) {
+	if (type == SOCK_STREAM || (conn && type == SOCK_DGRAM)) {
 		cc = connect(so, (struct sockaddr *)saddr, namelen);
 		if (cc < 0) {
 			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
@@ -115,110 +97,3 @@ int get_socket(struct sockaddr_in *saddr, u_int p_prot, int resvp)
 	}
 	return so;
 }
-
-/*
- * Sigh... getport() doesn't actually check the version number.
- * In order to make sure that the server actually supports the service
- * we're requesting, we open and RPC client, and fire off a NULL
- * RPC call.
- */
-int
-clnt_ping(struct sockaddr_in *saddr, const u_long prog, const u_long vers,
-	  const u_int prot, struct sockaddr_in *caddr)
-{
-	CLIENT *clnt=NULL;
-	int sock, stat;
-	static char clnt_res;
-
-	rpc_createerr.cf_stat = stat = errno = 0;
-	sock = get_socket(saddr, prot, FALSE);
-	if (sock == RPC_ANYSOCK && errno == ETIMEDOUT) {
-		/*
-		 * TCP timeout. Bubble up the error to see 
-		 * how it should be handled.
-		 */
-		rpc_createerr.cf_stat = RPC_TIMEDOUT;
-		goto out_bad;
-	}
-
-	switch(prot) {
-	case IPPROTO_UDP:
-		clnt = clntudp_bufcreate(saddr, prog, vers,
-					 RETRY_TIMEOUT, &sock,
-					 RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
-		break;
-	case IPPROTO_TCP:
-		clnt = clnttcp_create(saddr, prog, vers, &sock,
-				      RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
-		break;
-	default:
-		goto out_bad;
-	}
-	if (!clnt)
-		goto out_bad;
-	memset(&clnt_res, 0, sizeof(clnt_res));
-	stat = clnt_call(clnt, NULLPROC,
-			 (xdrproc_t)xdr_void, (caddr_t)NULL,
-			 (xdrproc_t)xdr_void, (caddr_t)&clnt_res,
-			 TIMEOUT);
-	if (stat) {
-		clnt_geterr(clnt, &rpc_createerr.cf_error);
-		rpc_createerr.cf_stat = stat;
-	}
-	clnt_destroy(clnt);
-	if (sock != -1) {
-		if (caddr) {
-			/* Get the address of our end of this connection */
-			socklen_t len = sizeof(*caddr);
-			if (getsockname(sock, caddr, &len) != 0)
-				caddr->sin_family = 0;
-		}
-		close(sock);
-	}
-
-	if (stat == RPC_SUCCESS)
-		return 1;
-
- out_bad:
-	return 0;
-}
-
-CLIENT *mnt_openclnt(clnt_addr_t *mnt_server, int *msock)
-{
-	struct sockaddr_in *mnt_saddr = &mnt_server->saddr;
-	struct pmap *mnt_pmap = &mnt_server->pmap;
-	CLIENT *clnt = NULL;
-
-	/* contact the mount daemon via TCP */
-	mnt_saddr->sin_port = htons((u_short)mnt_pmap->pm_port);
-	*msock = get_socket(mnt_saddr, mnt_pmap->pm_prot, TRUE);
-
-	switch (mnt_pmap->pm_prot) {
-	case IPPROTO_UDP:
-		clnt = clntudp_bufcreate(mnt_saddr,
-					 mnt_pmap->pm_prog, mnt_pmap->pm_vers,
-					 RETRY_TIMEOUT, msock,
-					 MNT_SENDBUFSIZE, MNT_RECVBUFSIZE);
-		break;
-	case IPPROTO_TCP:
-		clnt = clnttcp_create(mnt_saddr,
-				      mnt_pmap->pm_prog, mnt_pmap->pm_vers,
-				      msock,
-				      MNT_SENDBUFSIZE, MNT_RECVBUFSIZE);
-		break;
-	}
-	if (clnt) {
-		/* try to mount hostname:dirname */
-		clnt->cl_auth = authunix_create_default();
-		return clnt;
-	}
-	return NULL;
-}
-
-void mnt_closeclnt(CLIENT *clnt, int msock)
-{
-	auth_destroy(clnt->cl_auth);
-	clnt_destroy(clnt);
-	close(msock);
-}
-