pdate addres for Free Software Foundation

[nfs-utils.git] / support / nfs / svc_socket.c

diff --git a/support/nfs/svc_socket.c b/support/nfs/svc_socket.c
index 6799d16230e5278f74c2f404c39b14dd1f21c72b..f56f310fb5c4744ca8a8bcccb5d4ae265b7889c6 100644 (file)
--- a/support/nfs/svc_socket.c
+++ b/support/nfs/svc_socket.c
@@ -13,8 +13,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 0211-1301 USA */
 
 #include <stdio.h>
 #include <string.h>
@@ -35,14 +35,43 @@
 # define __close(f)            close ((f))
 #endif
 
+int getservport(u_long number, const char *proto)
+{
+       char rpcdata[1024], servdata[1024];
+       struct rpcent rpcbuf, *rpcp;
+       struct servent servbuf, *servp = NULL;
+       int ret;
+
+       ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof rpcdata,
+                               &rpcp);
+       if (ret == 0 && rpcp != NULL) {
+               /* First try name.  */
+               ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata,
+                                       sizeof servdata, &servp);
+               if ((ret != 0 || servp == NULL) && rpcp->r_aliases) {
+                       const char **a;
+
+                       /* Then we try aliases.  */
+                       for (a = (const char **) rpcp->r_aliases; *a != NULL; a++) {
+                               ret = getservbyname_r(*a, proto, &servbuf, servdata,
+                                                       sizeof servdata, &servp);
+                               if (ret == 0 && servp != NULL)
+                                       break;
+                       }
+               }
+       }
+
+       if (ret == 0 && servp != NULL)
+               return ntohs(servp->s_port);
+
+       return 0;
+}
+
 static int
 svc_socket (u_long number, int type, int protocol, int reuse)
 {
   struct sockaddr_in addr;
   socklen_t len = sizeof (struct sockaddr_in);
-  char rpcdata [1024], servdata [1024];
-  struct rpcent rpcbuf, *rpcp;
-  struct servent servbuf, *servp = NULL;
   int sock, ret;
   const char *proto = protocol == IPPROTO_TCP ? "tcp" : "udp";
 
@@ -66,51 +95,13 @@ svc_socket (u_long number, int type, int protocol, int reuse)
 
   memset (&addr, 0, sizeof (addr));
   addr.sin_family = AF_INET;
+  addr.sin_port = htons(getservport(number, proto));
 
-  ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
-                         &rpcp);
-  if (ret == 0 && rpcp != NULL)
-    {
-      /* First try name.  */
-      ret = getservbyname_r (rpcp->r_name, proto, &servbuf, servdata,
-                            sizeof servdata, &servp);
-      if ((ret != 0 || servp == NULL) && rpcp->r_aliases)
-       {
-         const char **a;
-
-         /* Then we try aliases.  */
-         for (a = (const char **) rpcp->r_aliases; *a != NULL; a++) 
-           {
-             ret = getservbyname_r (*a, proto, &servbuf, servdata,
-                                    sizeof servdata, &servp);
-             if (ret == 0 && servp != NULL)
-               break;
-           }
-       }
-    }
-
-  if (ret == 0 && servp != NULL)
-    {
-      addr.sin_port = servp->s_port;
-      if (bind (sock, (struct sockaddr *) &addr, len) < 0)
-       {
-         perror (_("svc_socket: bind problem"));
-         (void) __close (sock);
-         sock = -1;
-       }
-    }
-  else
+  if (bind(sock, (struct sockaddr *) &addr, len) < 0)
     {
-      if (bindresvport (sock, &addr))
-       {
-         addr.sin_port = 0;
-         if (bind (sock, (struct sockaddr *) &addr, len) < 0)
-           {
-             perror (_("svc_socket: bind problem"));
-             (void) __close (sock);
-             sock = -1;
-           }
-       }
+      perror (_("svc_socket: bind problem"));
+      (void) __close(sock);
+      sock = -1;
     }
 
   if (sock >= 0)
@@ -160,9 +151,9 @@ svctcp_socket (u_long number, int reuse)
  * Create and bind a UDP socket based on program number
  */
 int
-svcudp_socket (u_long number, int reuse)
+svcudp_socket (u_long number)
 {
-  return svc_socket (number, SOCK_DGRAM, IPPROTO_UDP, 0);
+  return svc_socket (number, SOCK_DGRAM, IPPROTO_UDP, FALSE);
 }
 
 #ifdef TEST
@@ -177,7 +168,7 @@ check (u_long number, u_short port, int protocol, int reuse)
   if (protocol == IPPROTO_TCP)
     socket = svctcp_socket (number, reuse);
   else
-    socket = svcudp_socket (number, reuse);
+    socket = svcudp_socket (number);
 
   if (socket < 0)
     return 1;