X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fmount%2Fnetwork.h;h=a4dba1b69e3a314a4b544b561e0f7b3ad0aeedfd;hb=eddfbf7ac8ecd3f17dc295df6c1dac4bbc6ca846;hp=9de13b50a99ecf146638a89f5e53e8031aea9ec7;hpb=1ca49510fd1742955330583f259db7faf501a5e5;p=nfs-utils.git

diff --git a/utils/mount/network.h b/utils/mount/network.h
index 9de13b5..a4dba1b 100644
--- a/utils/mount/network.h
+++ b/utils/mount/network.h
@@ -25,16 +25,6 @@
 #define _NFS_UTILS_MOUNT_NETWORK_H
 
 #include <rpc/pmap_prot.h>
-#include <rpc/clnt.h>
-
-#include "mount.h"
-
-#ifdef HAVE_RPCSVC_NFS_PROT_H
-#include <rpcsvc/nfs_prot.h>
-#else
-#include <linux/nfs.h>
-#define nfsstat nfs_stat
-#endif
 
 #define MNT_SENDBUFSIZE (2048U)
 #define MNT_RECVBUFSIZE (1024U)
@@ -53,7 +43,12 @@ 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 get_client_address(struct sockaddr_in *, struct sockaddr_in *);
+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,