X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Finit.c;h=bbcfb86fa52047a6c8730ef439341d594555eecb;hb=12106f49081f61243c1b8dc74d2b716c14105f0b;hp=4c8f84f42308ea61c131089d4d35cc8d9b670720;hpb=183451cff566ac49ab872821e458e57b90e72710;p=deb_libnfs.git

diff --git a/lib/init.c b/lib/init.c
index 4c8f84f..bbcfb86 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -24,9 +24,9 @@
 #include <stdarg.h>
 #include <string.h>
 #include <stdlib.h>
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
+#include <assert.h>
 #include "slist.h"
+#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-private.h"
@@ -41,6 +41,7 @@ struct rpc_context *rpc_init_context(void)
 	}
 	memset(rpc, 0, sizeof(struct rpc_context));
 
+	rpc->magic = RPC_CONTEXT_MAGIC;
 	rpc->encodebuflen = 65536;
 	rpc->encodebuf = malloc(rpc->encodebuflen);
 	if (rpc->encodebuf == NULL) {
@@ -77,8 +78,10 @@ struct rpc_context *rpc_init_udp_context(void)
 	return rpc;
 }
 
-void rpc_set_auth(struct rpc_context *rpc, AUTH *auth)
+void rpc_set_auth(struct rpc_context *rpc, struct AUTH *auth)
 {
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	if (rpc->auth != NULL) {
 		auth_destroy(rpc->auth);
 	}
@@ -90,6 +93,8 @@ void rpc_set_error(struct rpc_context *rpc, char *error_string, ...)
 {
         va_list ap;
 
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	if (rpc->error_string != NULL) {
 		free(rpc->error_string);
 	}
@@ -101,6 +106,8 @@ void rpc_set_error(struct rpc_context *rpc, char *error_string, ...)
 
 char *rpc_get_error(struct rpc_context *rpc)
 {
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	return rpc->error_string;
 }
 
@@ -108,6 +115,8 @@ void rpc_error_all_pdus(struct rpc_context *rpc, char *error)
 {
 	struct rpc_pdu *pdu;
 
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	while((pdu = rpc->outqueue) != NULL) {
 		pdu->cb(rpc, RPC_STATUS_ERROR, error, pdu->private_data);
 		SLIST_REMOVE(&rpc->outqueue, pdu);
@@ -130,6 +139,8 @@ static void rpc_free_fragment(struct rpc_fragment *fragment)
 
 void rpc_free_all_fragments(struct rpc_context *rpc)
 {
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	while (rpc->fragments != NULL) {
 	      struct rpc_fragment *fragment = rpc->fragments;
 
@@ -142,6 +153,8 @@ int rpc_add_fragment(struct rpc_context *rpc, char *data, uint64_t size)
 {
 	struct rpc_fragment *fragment;
 
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	fragment = malloc(sizeof(struct rpc_fragment));
 	if (fragment == NULL) {
 		return -1;
@@ -163,6 +176,8 @@ void rpc_destroy_context(struct rpc_context *rpc)
 {
 	struct rpc_pdu *pdu;
 
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	while((pdu = rpc->outqueue) != NULL) {
 		pdu->cb(rpc, RPC_STATUS_CANCEL, NULL, pdu->private_data);
 		SLIST_REMOVE(&rpc->outqueue, pdu);
@@ -202,6 +217,7 @@ void rpc_destroy_context(struct rpc_context *rpc)
 		rpc->udp_dest = NULL;
 	}
 
+	rpc->magic = 0;
 	free(rpc);
 }