X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2Flibnfs-private.h;h=d3cd3ec0b647c862460848c38fa57d4f56494e11;hb=e803ae576042a8c9d6f61e1e1ec58f26bf56aaa2;hp=b1fe13480dac57570d5c39c17f62706a0926cf45;hpb=183451cff566ac49ab872821e458e57b90e72710;p=deb_libnfs.git

diff --git a/include/libnfs-private.h b/include/libnfs-private.h
index b1fe134..d3cd3ec 100644
--- a/include/libnfs-private.h
+++ b/include/libnfs-private.h
@@ -14,8 +14,9 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
+#include <sys/socket.h>  /* struct sockaddr_storage */
+
+#include "libnfs-zdr.h"
 
 struct rpc_fragment {
 	struct rpc_fragment *next;
@@ -23,7 +24,10 @@ struct rpc_fragment {
 	char *data;
 };
 
+#define RPC_CONTEXT_MAGIC 0xc6e46435
+
 struct rpc_context {
+        uint32_t magic;
 	int fd;
 	int is_connected;
 
@@ -32,7 +36,7 @@ struct rpc_context {
 	rpc_cb connect_cb;
 	void *connect_data;
 
-	AUTH *auth;
+	struct AUTH *auth;
 	unsigned long xid;
 
        /* buffer used for encoding RPC PDU */
@@ -43,8 +47,8 @@ struct rpc_context {
        struct sockaddr_storage udp_src;
        struct rpc_pdu *waitpdu;
 
-       int inpos;
-       int insize;
+       uint32_t inpos;
+       uint32_t insize;
        char *inbuf;
 
        /* special fields for UDP, which can sometimes be BROADCASTed */
@@ -64,21 +68,21 @@ struct rpc_pdu {
 	struct rpc_pdu *next;
 
 	unsigned long xid;
-	XDR xdr;
+	ZDR zdr;
 
-	int written;
+	uint32_t written;
 	struct rpc_data outdata;
 
 	rpc_cb cb;
 	void *private_data;
 
-	/* function to decode the xdr reply data and buffer to decode into */
-	xdrproc_t xdr_decode_fn;
-	caddr_t xdr_decode_buf;
-	int xdr_decode_bufsize;
+	/* function to decode the zdr reply data and buffer to decode into */
+	zdrproc_t zdr_decode_fn;
+	caddr_t zdr_decode_buf;
+	uint32_t zdr_decode_bufsize;
 };
 
-struct rpc_pdu *rpc_allocate_pdu(struct rpc_context *rpc, int program, int version, int procedure, rpc_cb cb, void *private_data, xdrproc_t xdr_decode_fn, int xdr_bufsize);
+struct rpc_pdu *rpc_allocate_pdu(struct rpc_context *rpc, int program, int version, int procedure, rpc_cb cb, void *private_data, zdrproc_t zdr_decode_fn, int zdr_bufsize);
 void rpc_free_pdu(struct rpc_context *rpc, struct rpc_pdu *pdu);
 int rpc_queue_pdu(struct rpc_context *rpc, struct rpc_pdu *pdu);
 int rpc_get_pdu_size(char *buf);
@@ -88,7 +92,6 @@ void rpc_error_all_pdus(struct rpc_context *rpc, char *error);
 void rpc_set_error(struct rpc_context *rpc, char *error_string, ...);
 void nfs_set_error(struct nfs_context *nfs, char *error_string, ...);
 
-struct rpc_context *nfs_get_rpc_context(struct nfs_context *nfs);
 const char *nfs_get_server(struct nfs_context *nfs);
 const char *nfs_get_export(struct nfs_context *nfs);
 
@@ -104,3 +107,4 @@ void rpc_unset_autoreconnect(struct rpc_context *rpc);
 int rpc_add_fragment(struct rpc_context *rpc, char *data, uint64_t size);
 void rpc_free_all_fragments(struct rpc_context *rpc);
 
+const struct nfs_fh3 *nfs_get_rootfh(struct nfs_context *nfs);