libnfs.a: move mnt_{open, close}clnt calls to utils/mount/network.c

It turns out that get_socket() accesses a global variable, "verbose," that
is only available in the mount command; yet it's in libnfs.a.  This creates
an undocumented API dependency that will bite someone someday.  This
mount-specific functionality doesn't really belong in libnfs.a anyway.

The simplest way to resolve this is to move all of the functions in
support/nfs/conn.c into utils/mount.  network.c seems like the logical
place to put these.  An added benefit is we eventually get to make
get_socket() static.

Let's start with the mnt_{open,close}clnt functions.

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 11f16ab1be812a95d832ca8a9a743900e97b4b11..f21c10e18a8ea83312946fc42b3e0f4d43e2a0bd 100644 (file)
--- a/support/include/conn.h
+++ b/support/include/conn.h
@@ -18,9 +18,6 @@
 #include <rpc/pmap_prot.h>
 #include <rpc/clnt.h>
 
 #include <rpc/pmap_prot.h>
 #include <rpc/clnt.h>
 

-#define MNT_SENDBUFSIZE ((u_int)2048)
-#define MNT_RECVBUFSIZE ((u_int)1024)
-

 typedef struct {
        char **hostname;
        struct sockaddr_in saddr;
 typedef struct {
        char **hostname;
        struct sockaddr_in saddr;


@@ -36,8 +33,6 @@ int clnt_ping(struct sockaddr_in *, const u_long, const u_long, const u_int,
 u_long nfsvers_to_mnt(const u_long);
 u_long mntvers_to_nfs(const u_long);
 int get_socket(struct sockaddr_in *, u_int, int, int);
 u_long nfsvers_to_mnt(const u_long);
 u_long mntvers_to_nfs(const u_long);
 int get_socket(struct sockaddr_in *, u_int, int, int);

-CLIENT * mnt_openclnt(clnt_addr_t *, int *);
-void mnt_closeclnt(CLIENT *, int);

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

diff --git a/support/nfs/conn.c b/support/nfs/conn.c
index 9b98682e4e7d08a471c049cdbb0b51d31ed720c1..cf080c26e8cb61187f32c6de9c72c1cdc290287e 100644 (file)
--- a/support/nfs/conn.c
+++ b/support/nfs/conn.c
@@ -190,51 +190,3 @@ clnt_ping(struct sockaddr_in *saddr, const u_long prog, const u_long vers,
        else
                return 0;
 }
        else
                return 0;
 }

-
-CLIENT *mnt_openclnt(clnt_addr_t *mnt_server, int *msock)
-{
-       struct sockaddr_in *mnt_saddr = &mnt_server->saddr;
-       struct pmap *mnt_pmap = &mnt_server->pmap;
-       CLIENT *clnt = NULL;
-
-       /* contact the mount daemon via TCP */
-       mnt_saddr->sin_port = htons((u_short)mnt_pmap->pm_port);
-       *msock = get_socket(mnt_saddr, mnt_pmap->pm_prot, TRUE, FALSE);
-       if (*msock == RPC_ANYSOCK) {
-               if (rpc_createerr.cf_error.re_errno == EADDRINUSE)
-                       /* Probably in-use by a TIME_WAIT connection,
-                        * It is worth waiting a while and trying again.
-                        */
-                       rpc_createerr.cf_stat = RPC_TIMEDOUT;
-               return NULL;
-       }
-
-       switch (mnt_pmap->pm_prot) {
-       case IPPROTO_UDP:
-               clnt = clntudp_bufcreate(mnt_saddr,
-                                        mnt_pmap->pm_prog, mnt_pmap->pm_vers,
-                                        RETRY_TIMEOUT, msock,
-                                        MNT_SENDBUFSIZE, MNT_RECVBUFSIZE);
-               break;
-       case IPPROTO_TCP:
-               clnt = clnttcp_create(mnt_saddr,
-                                     mnt_pmap->pm_prog, mnt_pmap->pm_vers,
-                                     msock,
-                                     MNT_SENDBUFSIZE, MNT_RECVBUFSIZE);
-               break;
-       }
-       if (clnt) {
-               /* try to mount hostname:dirname */
-               clnt->cl_auth = authunix_create_default();
-               return clnt;
-       }
-       return NULL;
-}
-
-void mnt_closeclnt(CLIENT *clnt, int msock)
-{
-       auth_destroy(clnt->cl_auth);
-       clnt_destroy(clnt);
-       close(msock);
-}
-

diff --git a/utils/mount/network.c b/utils/mount/network.c
index c997c4cc0ee30e86d482bd23c4cc7646d53c5a49..08b1f99f458f0baa894c98fc82bb152f2a69b028 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -429,3 +429,50 @@ int nfs_call_umount(clnt_addr_t *mnt_server, dirpath *argp)
                return 1;
        return 0;
 }
                return 1;
        return 0;
 }

+
+CLIENT *mnt_openclnt(clnt_addr_t *mnt_server, int *msock)
+{
+       struct sockaddr_in *mnt_saddr = &mnt_server->saddr;
+       struct pmap *mnt_pmap = &mnt_server->pmap;
+       CLIENT *clnt = NULL;
+
+       mnt_saddr->sin_port = htons((u_short)mnt_pmap->pm_port);
+       *msock = get_socket(mnt_saddr, mnt_pmap->pm_prot, TRUE, FALSE);
+       if (*msock == RPC_ANYSOCK) {
+               if (rpc_createerr.cf_error.re_errno == EADDRINUSE)
+                       /*
+                        * Probably in-use by a TIME_WAIT connection,
+                        * It is worth waiting a while and trying again.
+                        */
+                       rpc_createerr.cf_stat = RPC_TIMEDOUT;
+               return NULL;
+       }
+
+       switch (mnt_pmap->pm_prot) {
+       case IPPROTO_UDP:
+               clnt = clntudp_bufcreate(mnt_saddr,
+                                        mnt_pmap->pm_prog, mnt_pmap->pm_vers,
+                                        RETRY_TIMEOUT, msock,
+                                        MNT_SENDBUFSIZE, MNT_RECVBUFSIZE);
+               break;
+       case IPPROTO_TCP:
+               clnt = clnttcp_create(mnt_saddr,
+                                     mnt_pmap->pm_prog, mnt_pmap->pm_vers,
+                                     msock,
+                                     MNT_SENDBUFSIZE, MNT_RECVBUFSIZE);
+               break;
+       }
+       if (clnt) {
+               /* try to mount hostname:dirname */
+               clnt->cl_auth = authunix_create_default();
+               return clnt;
+       }
+       return NULL;
+}
+
+void mnt_closeclnt(CLIENT *clnt, int msock)
+{
+       auth_destroy(clnt->cl_auth);
+       clnt_destroy(clnt);
+       close(msock);
+}

diff --git a/utils/mount/network.h b/utils/mount/network.h
index 83375f052a4be117db0d5dee05560b9e57a16318..81a59da9136a995733483eb9a337b680d53bcdb1 100644 (file)
--- a/utils/mount/network.h
+++ b/utils/mount/network.h
@@ -24,8 +24,14 @@
 #include "conn.h"
 #include "mount.h"
 
 #include "conn.h"
 #include "mount.h"
 

+#define MNT_SENDBUFSIZE (2048U)
+#define MNT_RECVBUFSIZE (1024U)
+

 int probe_bothports(clnt_addr_t *, clnt_addr_t *);
 int nfs_gethostbyname(const char *, struct sockaddr_in *);
 int nfs_call_umount(clnt_addr_t *, dirpath *);
 
 int start_statd(void);
 int probe_bothports(clnt_addr_t *, clnt_addr_t *);
 int nfs_gethostbyname(const char *, struct sockaddr_in *);
 int nfs_call_umount(clnt_addr_t *, dirpath *);
 
 int start_statd(void);

+
+CLIENT *mnt_openclnt(clnt_addr_t *, int *);
+void mnt_closeclnt(CLIENT *, int);