diff -Nur autofs-4.1.3.orig/lib/rpc_subs.c autofs-4.1.3/lib/rpc_subs.c
--- autofs-4.1.3.orig/lib/rpc_subs.c 2004-06-14 21:55:29.000000000 +0800
+++ autofs-4.1.3/lib/rpc_subs.c 2004-06-14 21:54:35.000000000 +0800
@@ -1,38 +1,284 @@
+/* ----------------------------------------------------------------------- *
+ *
+ * rpc_subs.c - routines for rpc discovery
+ *
+ * Copyright 2004 Ian Kent <raven@themaw.net> - All Rights Reserved
+ * Copyright 2004 Jeff Moyer <jmoyer@redaht.com> - All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
+ * USA; either version 2 of the License, or (at your option) any later
+ * version; incorporated herein by reference.
+ *
+ * ----------------------------------------------------------------------- */
+
#include <rpc/rpc.h>
+#include <rpc/pmap_prot.h>
#include <nfs/nfs.h>
#include <linux/nfs2.h>
#include <linux/nfs3.h>
#include <rpc/xdr.h>
-
+
+#include <unistd.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <sys/fcntl.h>
+#include <errno.h>
+
#include "automount.h"
+#define PMAP_TOUT_UDP 2
+#define PMAP_TOUT_TCP 3
+
+struct conn_info {
+ const char *host;
+ unsigned short port;
+ unsigned long program;
+ unsigned long version;
+ struct protoent *proto;
+ unsigned int send_sz;
+ unsigned int recv_sz;
+ struct timeval timeout;
+};
+
+/*
+ * Create a UDP RPC client
+ */
+static CLIENT* create_udp_client(struct conn_info *info)
+{
+ int fd = -1;
+ CLIENT *client;
+ struct sockaddr_in addr;
+ struct hostent *hp;
+
+ if (info->proto->p_proto != IPPROTO_UDP)
+ return NULL;
+
+ memset(&addr, 0, sizeof(addr));
+
+ hp = gethostbyname(info->host);
+ if (!hp)
+ return NULL;
+
+ addr.sin_family = AF_INET;
+ addr.sin_port = htons(info->port);
+ memcpy(&addr.sin_addr.s_addr, hp->h_addr, hp->h_length);
+
+ client = clntudp_bufcreate(&addr,
+ info->program, info->version,
+ info->timeout, &fd,
+ info->send_sz, info->recv_sz);
+
+ return client;
+}
+
+/*
+ * Perform a non-blocking connect on the socket fd.
+ *
+ * tout contains the timeout. It will be modified to contain the time
+ * remaining (i.e. time provided - time elasped).
+ */
+static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout)
+{
+ int flags, ret, len;
+ fd_set wset, rset;
+
+ flags = fcntl(fd, F_GETFL, 0);
+ if (flags < 0)
+ return -1;
+
+ ret = fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+ if (ret < 0)
+ return -1;
+
+ /*
+ * From here on subsequent sys calls could change errno so
+ * we set ret = -errno to capture it in case we decide to
+ * use it later.
+ */
+ ret = connect(fd, (struct sockaddr *)addr, sizeof(struct sockaddr));
+ if (ret < 0 && errno != EINPROGRESS) {
+ ret = -errno;
+ goto done;
+ }
+
+ if (ret == 0)
+ goto done;
+
+ /* now wait */
+ FD_ZERO(&rset);
+ FD_SET(fd, &rset);
+ wset = rset;
+
+ ret = select(fd + 1, &rset, &wset, NULL, tout);
+ if (ret <= 0) {
+ if (ret == 0)
+ ret = -ETIMEDOUT;
+ else
+ ret = -errno;
+ goto done;
+ }
+
+ if (FD_ISSET(fd, &rset) || FD_ISSET(fd, &wset)) {
+ int stat;
+
+ len = sizeof(ret);
+ stat = getsockopt(fd, SOL_SOCKET, SO_ERROR, &ret, &len);
+ if (stat < 0) {
+ ret = -errno;
+ goto done;
+ }
+
+ /* Oops - something wrong with connect */
+ if (ret)
+ ret = -ret;
+ }
+
+done:
+ fcntl(fd, F_SETFL, flags);
+ return ret;
+}
+
+/*
+ * Create a TCP RPC client using non-blocking connect
+ */
+static CLIENT* create_tcp_client(struct conn_info *info)
+{
+ int fd;
+ CLIENT *client;
+ struct sockaddr_in addr;
+ struct hostent *hp;
+ int ret;
+
+ if (info->proto->p_proto != IPPROTO_TCP)
+ return NULL;
+
+ memset(&addr, 0, sizeof(addr));
+
+ hp = gethostbyname(info->host);
+ if (!hp)
+ return NULL;
+
+ addr.sin_family = AF_INET;
+ addr.sin_port = htons(info->port);
+ memcpy(&addr.sin_addr.s_addr, hp->h_addr, hp->h_length);
+
+ fd = socket(PF_INET, SOCK_STREAM, info->proto->p_proto);
+ if (fd < 0)
+ return NULL;
+
+ ret = connect_nb(fd, &addr, &info->timeout);
+ if (ret < 0)
+ goto out_close;
+
+ client = clnttcp_create(&addr,
+ info->program, info->version, &fd,
+ info->send_sz, info->recv_sz);
+ if (!client)
+ goto out_close;
+
+ return client;
+
+out_close:
+ close(fd);
+ return NULL;
+}
+
+static unsigned short portmap_getport(struct conn_info *info)
+{
+ struct conn_info pmap_info;
+ unsigned short port = 0;
+ CLIENT *client;
+ enum clnt_stat stat;
+ struct pmap parms;
+
+ pmap_info.host = info->host;
+ pmap_info.port = PMAPPORT;
+ pmap_info.program = PMAPPROG;
+ pmap_info.version = PMAPVERS;
+ pmap_info.proto = info->proto;
+ pmap_info.send_sz = RPCSMALLMSGSIZE;
+ pmap_info.recv_sz = RPCSMALLMSGSIZE;
+ pmap_info.timeout.tv_sec = PMAP_TOUT_UDP;
+ pmap_info.timeout.tv_usec = 0;
+
+ if (info->proto->p_proto == IPPROTO_TCP) {
+ pmap_info.timeout.tv_sec = PMAP_TOUT_TCP;
+ client = create_tcp_client(&pmap_info);
+ } else
+ client = create_udp_client(&pmap_info);
+
+ if (!client)
+ return 0;
+
+ parms.pm_prog = info->program;
+ parms.pm_vers = info->version;
+ parms.pm_prot = info->proto->p_proto;
+ parms.pm_port = 0;
+
+ stat = clnt_call(client, PMAPPROC_GETPORT,
+ (xdrproc_t) xdr_pmap, (caddr_t) &parms,
+ (xdrproc_t) xdr_u_short, (caddr_t) &port,
+ pmap_info.timeout);
+
+ clnt_destroy(client);
+
+ if (stat != RPC_SUCCESS)
+ return 0;
+
+ return port;
+}
+
static int rpc_ping_proto(const char *host,
- unsigned long nfs_version, const char *proto,
+ unsigned long nfs_version,
+ const char *proto,
long seconds, long micros)
{
+ struct conn_info info;
CLIENT *client;
- struct timeval tout;
enum clnt_stat stat;
+ struct protoent *prot;
+
+ prot = getprotobyname(proto);
+ if (!prot)
+ return 1;
+
+ info.host = host;
+ info.program = NFS_PROGRAM;
+ info.version = nfs_version;
+ info.proto = prot;
+ info.send_sz = 0;
+ info.recv_sz = 0;
+ info.timeout.tv_sec = seconds;
+ info.timeout.tv_usec = micros;
- client = clnt_create(host, NFS_PROGRAM, nfs_version, proto);
- if (client == NULL) {
+ info.port = portmap_getport(&info);
+ if (!info.port)
return 0;
- }
- tout.tv_sec = seconds;
- tout.tv_usec = micros;
+ if (prot->p_proto == IPPROTO_UDP) {
+ info.send_sz = UDPMSGSIZE;
+ info.recv_sz = UDPMSGSIZE;
+ client = create_udp_client(&info);
+ } else
+ client = create_tcp_client(&info);
+
+ if (!client)
+ return 0;
- clnt_control(client, CLSET_TIMEOUT, (char *)&tout);
- clnt_control(client, CLSET_RETRY_TIMEOUT, (char *)&tout);
+ clnt_control(client, CLSET_TIMEOUT, (char *) &info.timeout);
+ clnt_control(client, CLSET_RETRY_TIMEOUT, (char *) &info.timeout);
stat = clnt_call(client, NFSPROC_NULL,
- (xdrproc_t)xdr_void, 0, (xdrproc_t)xdr_void, 0, tout);
+ (xdrproc_t) xdr_void, 0, (xdrproc_t) xdr_void, 0,
+ info.timeout);
clnt_destroy(client);
- if (stat != RPC_SUCCESS) {
+ if (stat != RPC_SUCCESS)
return 0;
- }
return 1;
}
@@ -108,10 +354,39 @@
taken = elapsed(start, end);
- if (result != NULL) {
+ if (result != NULL)
*result = taken;
- }
return status;
}
+#if 0
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+ int ret;
+ double res = 0.0;
+
+ ret = rpc_ping("budgie", 10, 0);
+ printf("ret = %d\n", ret);
+
+ res = 0.0;
+ ret = rpc_time("raven", NFS2_VERSION, RPC_PING_TCP, 10, 0, &res);
+ printf("v2 tcp ret = %d, res = %f\n", ret, res);
+
+ res = 0.0;
+ ret = rpc_time("raven", NFS3_VERSION, RPC_PING_TCP, 10, 0, &res);
+ printf("v3 tcp ret = %d, res = %f\n", ret, res);
+
+ res = 0.0;
+ ret = rpc_time("raven", NFS2_VERSION, RPC_PING_UDP, 10, 0, &res);
+ printf("v2 udp ret = %d, res = %f\n", ret, res);
+
+ res = 0.0;
+ ret = rpc_time("raven", NFS3_VERSION, RPC_PING_UDP, 10, 0, &res);
+ printf("v3 udp ret = %d, res = %f\n", ret, res);
+
+ exit(0);
+}
+#endif