X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Finit.c;h=bbcfb86fa52047a6c8730ef439341d594555eecb;hb=f3a75078066dd8022e1e52d9cce2256b4fc323d2;hp=936cc8b217884b95eea1587756cde3025bd4ac0a;hpb=31a2602e3df86815033f691d8b21238f135d76c4;p=deb_libnfs.git diff --git a/lib/init.c b/lib/init.c index 936cc8b..bbcfb86 100644 --- a/lib/init.c +++ b/lib/init.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "slist.h" #include "libnfs-zdr.h" #include "libnfs.h" @@ -40,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) { @@ -78,6 +80,8 @@ struct rpc_context *rpc_init_udp_context(void) 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); } @@ -89,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); } @@ -100,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; } @@ -107,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); @@ -129,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; @@ -141,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; @@ -162,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); @@ -201,6 +217,7 @@ void rpc_destroy_context(struct rpc_context *rpc) rpc->udp_dest = NULL; } + rpc->magic = 0; free(rpc); }