X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fshowmount%2Fshowmount.c;h=17f7d87102b429896b1ef936daafa065e136e7f4;hp=9979621e3c3a26d4cbcd2e994cfb3c71b0a8ece2;hb=f7020bd5d3ffca280690c6beba5fecdeb4d305f7;hpb=a68d983fb3b571720eb94f68d56e8849583a2a21 diff --git a/utils/showmount/showmount.c b/utils/showmount/showmount.c index 9979621..17f7d87 100644 --- a/utils/showmount/showmount.c +++ b/utils/showmount/showmount.c @@ -37,8 +37,9 @@ #include #include +#include "nfsrpc.h" + #define TIMEOUT_UDP 3 -#define TIMEOUT_TCP 10 #define TOTAL_TIMEOUT 20 static char * version = "showmount for " VERSION; @@ -49,6 +50,13 @@ static int aflag = 0; static int dflag = 0; static int eflag = 0; +static const char *nfs_sm_pgmtbl[] = { + "showmount", + "mount", + "mountd", + NULL, +}; + static struct option longopts[] = { { "all", 0, 0, 'a' }, @@ -62,16 +70,14 @@ static struct option longopts[] = #define MAXHOSTLEN 256 -int dump_cmp(p, q) -char **p; -char **q; +static int dump_cmp(const void *pv, const void *qv) { + const char **p = (const char **)pv; + const char **q = (const char **)qv; return strcmp(*p, *q); } -static void usage(fp, n) -FILE *fp; -int n; +static void usage(FILE *fp, int n) { fprintf(fp, "Usage: %s [-adehv]\n", program_name); fprintf(fp, " [--all] [--directories] [--exports]\n"); @@ -79,11 +85,41 @@ int n; exit(n); } +#ifdef HAVE_CLNT_CREATE + +/* + * Generate an RPC client handle connected to the mountd service + * at @hostname, or die trying. + * + * Supports both AF_INET and AF_INET6 server addresses. + */ +static CLIENT *nfs_get_mount_client(const char *hostname) +{ + rpcprog_t program = nfs_getrpcbyname(MOUNTPROG, nfs_sm_pgmtbl); + CLIENT *client; + + client = clnt_create(hostname, program, MOUNTVERS, "tcp"); + if (client) + return client; + + client = clnt_create(hostname, program, MOUNTVERS, "udp"); + if (client) + return client; + + clnt_pcreateerror("clnt_create"); + exit(1); +} + +#else /* HAVE_CLNT_CREATE */ + /* * 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). + * + * Returns zero on success; otherwise, -1 is returned and errno is set + * to reflect the nature of the error. */ static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout) { @@ -107,7 +143,7 @@ static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout) len = sizeof(struct sockaddr); ret = connect(fd, (struct sockaddr *)addr, len); if (ret < 0 && errno != EINPROGRESS) { - ret = -errno; + ret = -1; goto done; } @@ -118,12 +154,11 @@ static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout) FD_ZERO(&rset); FD_SET(fd, &rset); - ret = select(fd + 1, &rset, NULL, NULL, tout); + ret = select(fd + 1, NULL, &rset, NULL, tout); if (ret <= 0) { if (ret == 0) - ret = -ETIMEDOUT; - else - ret = -errno; + errno = ETIMEDOUT; + ret = -1; goto done; } @@ -133,13 +168,15 @@ static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout) len = sizeof(ret); status = getsockopt(fd, SOL_SOCKET, SO_ERROR, &ret, &len); if (status < 0) { - ret = -errno; + ret = -1; goto done; } /* Oops - something wrong with connect */ - if (ret) - ret = -ret; + if (ret != 0) { + errno = ret; + ret = -1; + } } done: @@ -147,117 +184,77 @@ done: return ret; } -static unsigned short getport(struct sockaddr_in *addr, - unsigned long prog, unsigned long vers, int prot) +/* + * Generate an RPC client handle connected to the mountd service + * at @hostname, or die trying. + * + * Supports only AF_INET server addresses. + */ +static CLIENT *nfs_get_mount_client(const char *hostname) { - CLIENT *client; - enum clnt_stat status; - struct pmap parms; - int ret, sock; - struct sockaddr_in laddr, saddr; - struct timeval tout = {0, 0}; - socklen_t len; - unsigned int send_sz = 0; - unsigned int recv_sz = 0; - unsigned short port; - - memset(&laddr, 0, sizeof(laddr)); - memset(&saddr, 0, sizeof(saddr)); - memset(&parms, 0, sizeof(parms)); - - memcpy(&saddr, addr, sizeof(saddr)); - saddr.sin_port = htons(PMAPPORT); - - if (prot == IPPROTO_TCP) { - sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); - if (sock == -1) { - rpc_createerr.cf_stat = RPC_SYSTEMERROR; - rpc_createerr.cf_error.re_errno = errno; - return 0; - } - - tout.tv_sec = TIMEOUT_TCP; - - ret = connect_nb(sock, &saddr, &tout); - if (ret == -1) { - close(sock); - rpc_createerr.cf_stat = RPC_SYSTEMERROR; - rpc_createerr.cf_error.re_errno = errno; - return 0; - } - } else { - /* - * bind to any unused port. If we left this up to the rpc - * layer, it would bind to a reserved port, which has been shown - * to exhaust the reserved port range in some situations. - */ - sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); - if (sock == -1) { - rpc_createerr.cf_stat = RPC_SYSTEMERROR; - rpc_createerr.cf_error.re_errno = errno; - return 0; - } - - laddr.sin_family = AF_INET; - laddr.sin_port = 0; - laddr.sin_addr.s_addr = htonl(INADDR_ANY); - - tout.tv_sec = TIMEOUT_UDP; - - send_sz = RPCSMALLMSGSIZE; - recv_sz = RPCSMALLMSGSIZE; + struct hostent *hp; + struct sockaddr_in server_addr; + struct timeval pertry_timeout; + CLIENT *mclient = NULL; + int ret, msock; - len = sizeof(struct sockaddr_in); - if (bind(sock, (struct sockaddr *)&laddr, len) < 0) { - close(sock); - sock = RPC_ANYSOCK; - /* FALLTHROUGH */ + if (inet_aton(hostname, &server_addr.sin_addr)) { + server_addr.sin_family = AF_INET; + } + else { + if ((hp = gethostbyname(hostname)) == NULL) { + fprintf(stderr, "%s: can't get address for %s\n", + program_name, hostname); + exit(1); } + server_addr.sin_family = AF_INET; + memcpy(&server_addr.sin_addr, hp->h_addr, hp->h_length); } - client = clntudp_bufcreate(&saddr, PMAPPROG, PMAPVERS, - tout, &sock, send_sz, recv_sz); - if (!client) { - close(sock); - rpc_createerr.cf_stat = RPC_RPCBFAILURE; - return 0; + msock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); + if (msock != -1) { + if (nfs_getport_ping((struct sockaddr *)&server_addr, + sizeof(server_addr), MOUNTPROG, + MOUNTVERS, IPPROTO_TCP)) { + ret = connect_nb(msock, &server_addr, 0); + if (ret == 0) + mclient = clnttcp_create(&server_addr, + MOUNTPROG, MOUNTVERS, &msock, + 0, 0); + else + close(msock); + } else + close(msock); } - clnt_control(client, CLSET_FD_CLOSE, NULL); - - parms.pm_prog = prog; - parms.pm_vers = vers; - parms.pm_prot = prot; - - status = clnt_call(client, PMAPPROC_GETPORT, - (xdrproc_t) xdr_pmap, (caddr_t) &parms, - (xdrproc_t) xdr_u_short, (caddr_t) &port, - tout); - - if (status != RPC_SUCCESS) { - clnt_geterr(client, &rpc_createerr.cf_error); - rpc_createerr.cf_stat = status; - clnt_destroy(client); - return 0; + if (!mclient) { + if (nfs_getport_ping((struct sockaddr *)&server_addr, + sizeof(server_addr), MOUNTPROG, + MOUNTVERS, IPPROTO_UDP)) { + clnt_pcreateerror("showmount"); + exit(1); + } + msock = RPC_ANYSOCK; + pertry_timeout.tv_sec = TIMEOUT_UDP; + pertry_timeout.tv_usec = 0; + if ((mclient = clntudp_create(&server_addr, + MOUNTPROG, MOUNTVERS, pertry_timeout, &msock)) == NULL) { + clnt_pcreateerror("mount clntudp_create"); + exit(1); + } } - clnt_destroy(client); - - return htons(port); + return mclient; } -int main(argc, argv) -int argc; -char **argv; +#endif /* HAVE_CLNT_CREATE */ + +int main(int argc, char **argv) { char hostname_buf[MAXHOSTLEN]; char *hostname; enum clnt_stat clnt_stat; - struct hostent *hp; - struct sockaddr_in server_addr; - int ret, msock; struct timeval total_timeout; - struct timeval pertry_timeout; int c; CLIENT *mclient; groups grouplist; @@ -329,54 +326,7 @@ char **argv; break; } - if (inet_aton(hostname, &server_addr.sin_addr)) { - server_addr.sin_family = AF_INET; - } - else { - if ((hp = gethostbyname(hostname)) == NULL) { - fprintf(stderr, "%s: can't get address for %s\n", - program_name, hostname); - exit(1); - } - server_addr.sin_family = AF_INET; - memcpy(&server_addr.sin_addr, hp->h_addr, hp->h_length); - } - - /* create mount deamon client */ - - mclient = NULL; - msock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); - if (msock != -1) { - server_addr.sin_port = getport(&server_addr, - MOUNTPROG, MOUNTVERS, IPPROTO_TCP); - if (server_addr.sin_port) { - ret = connect_nb(msock, &server_addr, 0); - if (ret != -1) - mclient = clnttcp_create(&server_addr, - MOUNTPROG, MOUNTVERS, &msock, - 0, 0); - else - close(msock); - } else - close(msock); - } - - if (!mclient) { - server_addr.sin_port = getport(&server_addr, - MOUNTPROG, MOUNTVERS, IPPROTO_UDP); - if (!server_addr.sin_port) { - clnt_pcreateerror("portmap getport"); - exit(1); - } - msock = RPC_ANYSOCK; - pertry_timeout.tv_sec = TIMEOUT_UDP; - pertry_timeout.tv_usec = 0; - if ((mclient = clntudp_create(&server_addr, - MOUNTPROG, MOUNTVERS, pertry_timeout, &msock)) == NULL) { - clnt_pcreateerror("mount clntudp_create"); - exit(1); - } - } + mclient = nfs_get_mount_client(hostname); mclient->cl_auth = authunix_create_default(); total_timeout.tv_sec = TOTAL_TIMEOUT; total_timeout.tv_usec = 0; @@ -390,6 +340,7 @@ char **argv; total_timeout); if (clnt_stat != RPC_SUCCESS) { clnt_perror(mclient, "rpc mount export"); + clnt_destroy(mclient); exit(1); } if (headers) @@ -413,6 +364,7 @@ char **argv; printf("\n"); exportlist = exportlist->ex_next; } + clnt_destroy(mclient); exit(0); } @@ -423,8 +375,10 @@ char **argv; total_timeout); if (clnt_stat != RPC_SUCCESS) { clnt_perror(mclient, "rpc mount dump"); + clnt_destroy(mclient); exit(1); } + clnt_destroy(mclient); n = 0; for (list = dumplist; list; list = list->ml_next)