X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fnfs%2Fconn.c;h=970abfe38025d3031cf0ec1c547c931226afecd8;hp=9b98682e4e7d08a471c049cdbb0b51d31ed720c1;hb=b6e4ddd10b3c67ef210e572dec956cb35ce96440;hpb=2bb403d1547790e731e5b151f9ef41880a6eb6c7 diff --git a/support/nfs/conn.c b/support/nfs/conn.c index 9b98682..970abfe 100644 --- a/support/nfs/conn.c +++ b/support/nfs/conn.c @@ -25,24 +25,6 @@ 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, @@ -190,51 +172,3 @@ clnt_ping(struct sockaddr_in *saddr, const u_long prog, const u_long vers, else 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, FALSE); - if (*msock == RPC_ANYSOCK) { - if (rpc_createerr.cf_error.re_errno == EADDRINUSE) - /* Probably in-use by a TIME_WAIT connection, - * It is worth waiting a while and trying again. - */ - rpc_createerr.cf_stat = RPC_TIMEDOUT; - return NULL; - } - - 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); -} -