mount command: full support for AF_INET6 addresses in probe_port()

[nfs-utils.git] / utils / mount / network.h

diff --git a/utils/mount/network.h b/utils/mount/network.h
index 2e4dbbc578ed370682ce1d72acdeaf9ec59275e1..a4dba1b69e3a314a4b544b561e0f7b3ad0aeedfd 100644 (file)
--- a/utils/mount/network.h
+++ b/utils/mount/network.h
@@ -21,17 +21,10 @@
  *
  */
 
-#include <rpc/pmap_prot.h>
-#include <rpc/clnt.h>
-
-#include "mount.h"
+#ifndef _NFS_UTILS_MOUNT_NETWORK_H
+#define _NFS_UTILS_MOUNT_NETWORK_H
 
-#ifdef HAVE_RPCSVC_NFS_PROT_H
-#include <rpcsvc/nfs_prot.h>
-#else
-#include <linux/nfs.h>
-#define nfsstat nfs_stat
-#endif
+#include <rpc/pmap_prot.h>
 
 #define MNT_SENDBUFSIZE (2048U)
 #define MNT_RECVBUFSIZE (1024U)
@@ -48,6 +41,14 @@ static const struct timeval RETRY_TIMEOUT = { 3, 0 };
 
 int probe_bothports(clnt_addr_t *, clnt_addr_t *);
 int nfs_gethostbyname(const char *, struct sockaddr_in *);
+int nfs_name_to_address(const char *, const sa_family_t,
+               struct sockaddr *, socklen_t *);
+int nfs_string_to_sockaddr(const char *, const size_t,
+                          struct sockaddr *, socklen_t *);
+int nfs_present_sockaddr(const struct sockaddr *,
+                        const socklen_t, char *, const size_t);
+int nfs_callback_address(const struct sockaddr *, const socklen_t,
+               struct sockaddr *, socklen_t *);
 int nfs_call_umount(clnt_addr_t *, dirpath *);
 int clnt_ping(struct sockaddr_in *, const unsigned long,
                const unsigned long, const unsigned int,
@@ -59,3 +60,5 @@ unsigned long nfsvers_to_mnt(const unsigned long);
 
 CLIENT *mnt_openclnt(clnt_addr_t *, int *);
 void mnt_closeclnt(CLIENT *, int);
+
+#endif /* _NFS_UTILS_MOUNT_NETWORK_H */