summaryrefslogtreecommitdiff
path: root/sunrpc/pm_getport.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-12-22 20:10:10 +0000
committerUlrich Drepper <drepper@redhat.com>2004-12-22 20:10:10 +0000
commita334319f6530564d22e775935d9c91663623a1b4 (patch)
treeb5877475619e4c938e98757d518bb1e9cbead751 /sunrpc/pm_getport.c
parent0ecb606cb6cf65de1d9fc8a919bceb4be476c602 (diff)
downloadglibc-a334319f6530564d22e775935d9c91663623a1b4.tar.gz
(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.
Diffstat (limited to 'sunrpc/pm_getport.c')
-rw-r--r--sunrpc/pm_getport.c52
1 files changed, 3 insertions, 49 deletions
diff --git a/sunrpc/pm_getport.c b/sunrpc/pm_getport.c
index 2d309841f3..00e1ba95bf 100644
--- a/sunrpc/pm_getport.c
+++ b/sunrpc/pm_getport.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
-#include <stdbool.h>
-#include <unistd.h>
#include <rpc/rpc.h>
#include <rpc/pmap_prot.h>
#include <rpc/pmap_clnt.h>
@@ -51,41 +49,6 @@ static const struct timeval tottimeout =
{60, 0};
/*
- * Create a socket that is locally bound to a non-reserve port. For
- * any failures, -1 is returned which will cause the RPC code to
- * create the socket.
- */
-int
-internal_function
-__get_socket (struct sockaddr_in *saddr)
-{
- int so = __socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (so < 0)
- return -1;
-
- struct sockaddr_in laddr;
- socklen_t namelen = sizeof (laddr);
- laddr.sin_family = AF_INET;
- laddr.sin_port = 0;
- laddr.sin_addr.s_addr = htonl (INADDR_ANY);
-
- int cc = __bind (so, (struct sockaddr *) &laddr, namelen);
- if (__builtin_expect (cc < 0, 0))
- {
- fail:
- __close (so);
- return -1;
- }
-
- cc = __connect (so, (struct sockaddr *) saddr, namelen);
- if (__builtin_expect (cc < 0, 0))
- goto fail;
-
- return so;
-}
-
-
-/*
* Find the mapped port for program,version.
* Calls the pmap service remotely to do the lookup.
* Returns 0 if no map exists.
@@ -101,18 +64,11 @@ pmap_getport (address, program, version, protocol)
int socket = -1;
CLIENT *client;
struct pmap parms;
- bool closeit = false;
address->sin_port = htons (PMAPPORT);
if (protocol == IPPROTO_TCP)
- {
- /* Don't need a reserved port to get ports from the portmapper. */
- socket = __get_socket(address);
- if (socket != -1)
- closeit = true;
- client = INTUSE(clnttcp_create) (address, PMAPPROG, PMAPVERS, &socket,
- RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
- }
+ client = INTUSE(clnttcp_create) (address, PMAPPROG, PMAPVERS, &socket,
+ RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
else
client = INTUSE(clntudp_bufcreate) (address, PMAPPROG, PMAPVERS, timeout,
&socket, RPCSMALLMSGSIZE,
@@ -137,9 +93,7 @@ pmap_getport (address, program, version, protocol)
}
CLNT_DESTROY (client);
}
- /* We only need to close the socket here if we opened it. */
- if (closeit)
- (void) __close (socket);
+ /* (void)close(socket); CLNT_DESTROY already closed it */
address->sin_port = 0;
return port;
}