libnfs.a: move get_socket() function to utils/mount/network.c

Now we can address the real problem: that get_socket() depends on the
global variable "verbose" which is only available in the mount command.

Move get_socket() into utils/mount/network.c, and make it static.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/support/include/conn.h b/support/include/conn.h
index ee1b686a440f29d8b68c3bb095cd62e169da16a5..2b1f07d5b922c242b2cf7877b53bccb870173d9b 100644 (file)
--- a/support/include/conn.h
+++ b/support/include/conn.h
@@ -28,7 +28,5 @@ typedef struct {
 static const struct timeval TIMEOUT = { 20, 0 };
 static const struct timeval RETRY_TIMEOUT = { 3, 0 };
 
 static const struct timeval TIMEOUT = { 20, 0 };
 static const struct timeval RETRY_TIMEOUT = { 3, 0 };
 

-int get_socket(struct sockaddr_in *, u_int, int, int);
-

 #endif /* _CONN_H */
 
 #endif /* _CONN_H */
 

diff --git a/support/nfs/conn.c b/support/nfs/conn.c
index d153aa2d55831a0d0db4a1b74fff27ee3fb38ec6..db9185d3b5268f8326c96a0abfc59686fb844bc9 100644 (file)
--- a/support/nfs/conn.c
+++ b/support/nfs/conn.c
@@ -19,81 +19,3 @@
 
 #include "conn.h"
 
 
 #include "conn.h"
 

-#if SIZEOF_SOCKLEN_T - 0 == 0
-#define socklen_t int
-#endif
-
-extern int verbose;
-
-/*
- * Create a socket that is locally bound to a 
- * reserve or non-reserve port. For any failures,
- * RPC_ANYSOCK is returned which will cause 
- * the RPC code to create the socket instead. 
- */
-int get_socket(struct sockaddr_in *saddr, u_int p_prot, int resvp, int conn)
-{
-       int so, cc, type;
-       struct sockaddr_in laddr;
-       socklen_t namelen = sizeof(laddr);
-
-       type = (p_prot == IPPROTO_UDP ? SOCK_DGRAM : SOCK_STREAM);
-       if ((so = socket (AF_INET, type, p_prot)) < 0) {
-               rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-               rpc_createerr.cf_error.re_errno = errno;
-               if (verbose) {
-                       fprintf(stderr, 
-                               "mount: Unable to create %s socket: errno %d (%s)\n",
-                               p_prot == IPPROTO_UDP ? "UDP" : "TCP", 
-                               errno, strerror(errno));
-               }
-               return RPC_ANYSOCK;
-       }
-       laddr.sin_family = AF_INET;
-       laddr.sin_port = 0;
-       laddr.sin_addr.s_addr = htonl(INADDR_ANY);
-       if (resvp) {
-               if (bindresvport(so, &laddr) < 0) {
-                       rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-                       rpc_createerr.cf_error.re_errno = errno;
-                       if (verbose) {
-                               fprintf(stderr, 
-                                       "mount: Unable to bindresvport %s socket: errno %d (%s)\n",
-                                       p_prot == IPPROTO_UDP ? "UDP" : "TCP", 
-                                       errno, strerror(errno));
-                       }
-                       close(so);
-                       return RPC_ANYSOCK;
-               }
-       } else {
-               cc = bind(so, (struct sockaddr *)&laddr, namelen);
-               if (cc < 0) {
-                       rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-                       rpc_createerr.cf_error.re_errno = errno;
-                       if (verbose) {
-                               fprintf(stderr, 
-                                       "mount: Unable to bind to %s socket: errno %d (%s)\n",
-                                       p_prot == IPPROTO_UDP ? "UDP" : "TCP", 
-                                       errno, strerror(errno));
-                       }
-                       close(so);
-                       return RPC_ANYSOCK;
-               }
-       }
-       if (type == SOCK_STREAM || (conn && type == SOCK_DGRAM)) {
-               cc = connect(so, (struct sockaddr *)saddr, namelen);
-               if (cc < 0) {
-                       rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-                       rpc_createerr.cf_error.re_errno = errno;
-                       if (verbose) {
-                               fprintf(stderr, 
-                                       "mount: Unable to connect to %s:%d, errno %d (%s)\n",
-                                       inet_ntoa(saddr->sin_addr), ntohs(saddr->sin_port),
-                                       errno, strerror(errno));
-                       }
-                       close(so);
-                       return RPC_ANYSOCK;
-               }
-       }
-       return so;
-}

diff --git a/utils/mount/network.c b/utils/mount/network.c
index a5b0b71435303b94068c6bc86c5427e7d9c71e64..4831990c2b6c305246c61937e93c2181c3735bc2 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -158,6 +158,79 @@ int nfs_gethostbyname(const char *hostname, struct sockaddr_in *saddr)
        return 1;
 }
 
        return 1;
 }
 

+/*
+ * Create a socket that is locally bound to a reserved or non-reserved
+ * port. For any failures, RPC_ANYSOCK is returned which will cause 
+ * the RPC code to create the socket instead. 
+ */
+static int get_socket(struct sockaddr_in *saddr, unsigned int p_prot,
+                       int resvp, int conn)
+{
+       int so, cc, type;
+       struct sockaddr_in laddr;
+       socklen_t namelen = sizeof(laddr);
+
+       type = (p_prot == IPPROTO_UDP ? SOCK_DGRAM : SOCK_STREAM);
+       if ((so = socket (AF_INET, type, p_prot)) < 0) {
+               rpc_createerr.cf_stat = RPC_SYSTEMERROR;
+               rpc_createerr.cf_error.re_errno = errno;
+               if (verbose) {
+                       fprintf(stderr, 
+                               "mount: Unable to create %s socket: errno %d (%s)\n",
+                               p_prot == IPPROTO_UDP ? "UDP" : "TCP", 
+                               errno, strerror(errno));
+               }
+               return RPC_ANYSOCK;
+       }
+       laddr.sin_family = AF_INET;
+       laddr.sin_port = 0;
+       laddr.sin_addr.s_addr = htonl(INADDR_ANY);
+       if (resvp) {
+               if (bindresvport(so, &laddr) < 0) {
+                       rpc_createerr.cf_stat = RPC_SYSTEMERROR;
+                       rpc_createerr.cf_error.re_errno = errno;
+                       if (verbose) {
+                               fprintf(stderr, 
+                                       "mount: Unable to bindresvport %s socket: errno %d (%s)\n",
+                                       p_prot == IPPROTO_UDP ? "UDP" : "TCP", 
+                                       errno, strerror(errno));
+                       }
+                       close(so);
+                       return RPC_ANYSOCK;
+               }
+       } else {
+               cc = bind(so, (struct sockaddr *)&laddr, namelen);
+               if (cc < 0) {
+                       rpc_createerr.cf_stat = RPC_SYSTEMERROR;
+                       rpc_createerr.cf_error.re_errno = errno;
+                       if (verbose) {
+                               fprintf(stderr, 
+                                       "mount: Unable to bind to %s socket: errno %d (%s)\n",
+                                       p_prot == IPPROTO_UDP ? "UDP" : "TCP", 
+                                       errno, strerror(errno));
+                       }
+                       close(so);
+                       return RPC_ANYSOCK;
+               }
+       }
+       if (type == SOCK_STREAM || (conn && type == SOCK_DGRAM)) {
+               cc = connect(so, (struct sockaddr *)saddr, namelen);
+               if (cc < 0) {
+                       rpc_createerr.cf_stat = RPC_SYSTEMERROR;
+                       rpc_createerr.cf_error.re_errno = errno;
+                       if (verbose) {
+                               fprintf(stderr, 
+                                       "mount: Unable to connect to %s:%d, errno %d (%s)\n",
+                                       inet_ntoa(saddr->sin_addr), ntohs(saddr->sin_port),
+                                       errno, strerror(errno));
+                       }
+                       close(so);
+                       return RPC_ANYSOCK;
+               }
+       }
+       return so;
+}
+

 /*
  * getport() is very similar to pmap_getport() with the exception that
  * this version tries to use an ephemeral port, since reserved ports are
 /*
  * getport() is very similar to pmap_getport() with the exception that
  * this version tries to use an ephemeral port, since reserved ports are