2008-01-20 Samuel Thibault <samuel.thibault@ens-lyon.org>

[platform/upstream/glibc.git] / sunrpc / pm_getport.c

diff --git a/sunrpc/pm_getport.c b/sunrpc/pm_getport.c
index 102dd6f..2d30984 100644 (file)
--- a/sunrpc/pm_getport.c
+++ b/sunrpc/pm_getport.c
@@ -38,17 +38,52 @@ 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>
 #include <sys/socket.h>
 
-#if 0  /* these seem to be gratuitous --roland@gnu */
-#include <net/if.h>
-#endif
+static const struct timeval timeout =
+{5, 0};
+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;
+}
 
-static struct timeval timeout = { 5, 0 };
-static struct timeval tottimeout = { 60, 0 };
 
 /*
  * Find the mapped port for program,version.
@@ -56,35 +91,56 @@ static struct timeval tottimeout = { 60, 0 };
  * Returns 0 if no map exists.
  */
 u_short
-pmap_getport(address, program, version, protocol)
-       struct sockaddr_in *address;
-       u_long program;
-       u_long version;
-       u_int protocol;
+pmap_getport (address, program, version, protocol)
+     struct sockaddr_in *address;
+     u_long program;
+     u_long version;
+     u_int protocol;
 {
-       u_short port = 0;
-       int socket = -1;
-       register CLIENT *client;
-       struct pmap parms;
+  u_short port = 0;
+  int socket = -1;
+  CLIENT *client;
+  struct pmap parms;
+  bool closeit = false;
 
-       address->sin_port = htons(PMAPPORT);
-       client = clntudp_bufcreate(address, PMAPPROG,
-           PMAPVERS, timeout, &socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
-       if (client != (CLIENT *)NULL) {
-               parms.pm_prog = program;
-               parms.pm_vers = version;
-               parms.pm_prot = protocol;
-               parms.pm_port = 0;  /* not needed or used */
-               if (CLNT_CALL(client, PMAPPROC_GETPORT, xdr_pmap, &parms,
-                   xdr_u_short, &port, tottimeout) != RPC_SUCCESS){
-                       rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-                       clnt_geterr(client, &rpc_createerr.cf_error);
-               } else if (port == 0) {
-                       rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
-               }
-               CLNT_DESTROY(client);
+  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);
+    }
+  else
+    client = INTUSE(clntudp_bufcreate) (address, PMAPPROG, PMAPVERS, timeout,
+                                       &socket, RPCSMALLMSGSIZE,
+                                       RPCSMALLMSGSIZE);
+  if (client != (CLIENT *) NULL)
+    {
+      struct rpc_createerr *ce = &get_rpc_createerr ();
+      parms.pm_prog = program;
+      parms.pm_vers = version;
+      parms.pm_prot = protocol;
+      parms.pm_port = 0;       /* not needed or used */
+      if (CLNT_CALL (client, PMAPPROC_GETPORT, (xdrproc_t)INTUSE(xdr_pmap),
+                    (caddr_t)&parms, (xdrproc_t)INTUSE(xdr_u_short),
+                    (caddr_t)&port, tottimeout) != RPC_SUCCESS)
+       {
+         ce->cf_stat = RPC_PMAPFAILURE;
+         clnt_geterr (client, &ce->cf_error);
+       }
+      else if (port == 0)
+       {
+         ce->cf_stat = RPC_PROGNOTREGISTERED;
        }
-       (void)close(socket);
-       address->sin_port = 0;
-       return (port);
+      CLNT_DESTROY (client);
+    }
+  /* We only need to close the socket here if we opened  it.  */
+  if (closeit)
+    (void) __close (socket);
+  address->sin_port = 0;
+  return port;
 }
+libc_hidden_def (pmap_getport)