X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fmount%2Fnetwork.c;h=9f803a43e6c7e29561b0b62f07b47456765e8ffc;hb=798d0f1244ad4b77f1862c670ada16780c26a7af;hp=5a56c23ce20f9b9ca6333d9f1e08f837a8d18925;hpb=7f8fae8cd60025f7fa1b446da363dcc2e1fb5b6a;p=nfs-utils.git diff --git a/utils/mount/network.c b/utils/mount/network.c index 5a56c23..9f803a4 100644 --- a/utils/mount/network.c +++ b/utils/mount/network.c @@ -303,14 +303,16 @@ static unsigned short getport(struct sockaddr_in *saddr, unsigned long version, unsigned int proto) { + struct sockaddr_in bind_saddr; unsigned short port = 0; int socket; CLIENT *clnt = NULL; enum clnt_stat stat; + + bind_saddr = *saddr; + bind_saddr.sin_port = htons(PMAPPORT); - saddr->sin_port = htons(PMAPPORT); - - socket = get_socket(saddr, proto, PMAP_TIMEOUT, FALSE, FALSE); + socket = get_socket(&bind_saddr, proto, PMAP_TIMEOUT, FALSE, FALSE); if (socket == RPC_ANYSOCK) { if (proto == IPPROTO_TCP && rpc_createerr.cf_error.re_errno == ETIMEDOUT) @@ -320,14 +322,16 @@ static unsigned short getport(struct sockaddr_in *saddr, switch (proto) { case IPPROTO_UDP: - clnt = clntudp_bufcreate(saddr, + clnt = clntudp_bufcreate(&bind_saddr, PMAPPROG, PMAPVERS, RETRY_TIMEOUT, &socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE); break; case IPPROTO_TCP: - clnt = clnttcp_create(saddr, PMAPPROG, PMAPVERS, &socket, + clnt = clnttcp_create(&bind_saddr, + PMAPPROG, PMAPVERS, + &socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE); break; } @@ -388,7 +392,7 @@ static int probe_port(clnt_addr_t *server, const unsigned long *versions, inet_ntoa(saddr->sin_addr), prog, *p_vers, *p_prot == IPPROTO_UDP ? - "udp" : "tcp", + _("UDP") : _("TCP"), p_port); } if (clnt_ping(saddr, prog, *p_vers, *p_prot, NULL))