Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcp_callrpc(): bring in the FreeBSD version of this call. It uses the 

"new" rpc functions and works with IPv6.
This commit is contained in:
rpaulo 2005-09-25 18:50:28 +00:00
parent 63fb4d1c52
commit ff2bab1c59
1 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
usr.bin/showmount/showmount.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: showmount.c,v 1.13 2004/08/06 16:10:54 mycroft Exp $ */
/* $NetBSD: showmount.c,v 1.14 2005/09/25 18:50:28 rpaulo Exp $ */
/*
* Copyright (c) 1989, 1993, 1995
@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993, 1995\n\
#if 0
static char sccsid[] = "@(#)showmount.c 8.3 (Berkeley) 3/29/95";
#endif
__RCSID("$NetBSD: showmount.c,v 1.13 2004/08/06 16:10:54 mycroft Exp $");
__RCSID("$NetBSD: showmount.c,v 1.14 2005/09/25 18:50:28 rpaulo Exp $");
#endif /* not lint */
#include <sys/types.h>
@ -227,43 +227,12 @@ tcp_callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out)
xdrproc_t outproc;
char *out;
{
struct hostent *hp;
struct sockaddr_in server_addr;
CLIENT *client;
int sock;
struct timeval timeout;
int rval;
hp = gethostbyname(host);
if (!hp)
return ((int) RPC_UNKNOWNHOST);
memset(&server_addr,0,sizeof(server_addr));
memcpy((char *) &server_addr.sin_addr,
hp->h_addr,
hp->h_length);
server_addr.sin_len = sizeof(struct sockaddr_in);
server_addr.sin_family =AF_INET;
server_addr.sin_port = 0;
sock = RPC_ANYSOCK;
client = clnttcp_create(&server_addr,
(u_long) prognum,
(u_long) versnum, &sock, 0, 0);
if (!client) {
timeout.tv_sec = 5;
timeout.tv_usec = 0;
server_addr.sin_port = 0;
sock = RPC_ANYSOCK;
client = clntudp_create(&server_addr,
(u_long) prognum,
(u_long) versnum,
timeout,
&sock);
}
if (!client)
if ((client = clnt_create(host, prognum, versnum, "tcp")) == NULL &&
(client = clnt_create(host, prognum, versnum, "udp")) == NULL)
return ((int) rpc_createerr.cf_stat);
timeout.tv_sec = 25;