X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Finit.c;h=6085b6892bb9cc068f8611aa90113a5ec1b5f910;hb=00748f36c57324ccc2cb21ac9af45d15821cf675;hp=93c3745db446ae57483466401e8ba4ba4b32c647;hpb=d678b73e4d21fb34f302a65b8bcc340c2accdb96;p=deb_libnfs.git
diff --git a/lib/init.c b/lib/init.c
index 93c3745..6085b68 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -11,29 +11,41 @@
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, see .
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#ifdef WIN32
#include "win32_compat.h"
#else
-#include
#include
#endif/*WIN32*/
#define _GNU_SOURCE
+#ifdef HAVE_UNISTD_H
+#include
+#endif
+
#include
#include
#include
#include
-#include
-#include
+#include
+#include
#include "slist.h"
+#include "libnfs-zdr.h"
#include "libnfs.h"
#include "libnfs-raw.h"
#include "libnfs-private.h"
+#ifdef AROS
+#include "aros_compat.h"
+#endif
+
struct rpc_context *rpc_init_context(void)
{
struct rpc_context *rpc;
+ static uint32_t salt = 0;
rpc = malloc(sizeof(struct rpc_context));
if (rpc == NULL) {
@@ -41,6 +53,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) {
@@ -58,7 +71,8 @@ struct rpc_context *rpc_init_context(void)
free(rpc);
return NULL;
}
- rpc->xid = 1;
+ rpc->xid = salt + time(NULL);
+ salt += 0x01000000;
rpc->fd = -1;
return rpc;
@@ -79,10 +93,12 @@ 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);
}
- rpc->auth = (AUTH *)auth;
+ rpc->auth = auth;
}
@@ -90,6 +106,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 +119,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 +128,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 +152,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;
@@ -138,10 +162,12 @@ void rpc_free_all_fragments(struct rpc_context *rpc)
}
}
-int rpc_add_fragment(struct rpc_context *rpc, char *data, size_t size)
+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 +189,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);
@@ -180,11 +208,7 @@ void rpc_destroy_context(struct rpc_context *rpc)
rpc->auth =NULL;
if (rpc->fd != -1) {
-#if defined(WIN32)
- closesocket(rpc->fd);
-#else
close(rpc->fd);
-#endif
}
if (rpc->encodebuf != NULL) {
@@ -202,6 +226,7 @@ void rpc_destroy_context(struct rpc_context *rpc)
rpc->udp_dest = NULL;
}
+ rpc->magic = 0;
free(rpc);
}