X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Finit.c;h=2a451a16d51f4282b76b40f0d32ee416aae72ef0;hb=d47c989d886e5398143d43d3b6d25fdf7210cb11;hp=936cc8b217884b95eea1587756cde3025bd4ac0a;hpb=67ba2239cbbe37413a1eb0a649d780a2a63a3133;p=deb_libnfs.git
diff --git a/lib/init.c b/lib/init.c
index 936cc8b..2a451a1 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -11,19 +11,34 @@
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 AROS
+#include "aros_compat.h"
+#endif
#ifdef WIN32
#include "win32_compat.h"
-#else
+#endif
+
+#define _GNU_SOURCE
+
+#ifdef HAVE_UNISTD_H
#include
+#endif
+
+#ifdef HAVE_STRINGS_H
#include
-#endif/*WIN32*/
-#define _GNU_SOURCE
+#endif
#include
#include
#include
#include
+#include
+#include
#include "slist.h"
#include "libnfs-zdr.h"
#include "libnfs.h"
@@ -33,6 +48,7 @@
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) {
@@ -40,6 +56,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) {
@@ -47,17 +64,14 @@ struct rpc_context *rpc_init_context(void)
return NULL;
}
-#if defined(WIN32)
- rpc->auth = authunix_create("LibNFS", 65535, 65535, 0, NULL);
-#else
rpc->auth = authunix_create_default();
-#endif
if (rpc->auth == NULL) {
free(rpc->encodebuf);
free(rpc);
return NULL;
}
- rpc->xid = 1;
+ rpc->xid = salt + time(NULL) + getpid() << 16;
+ salt += 0x01000000;
rpc->fd = -1;
return rpc;
@@ -78,6 +92,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 +105,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 +118,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 +127,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 +151,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 +165,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 +188,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);
@@ -179,11 +207,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) {
@@ -201,6 +225,7 @@ void rpc_destroy_context(struct rpc_context *rpc)
rpc->udp_dest = NULL;
}
+ rpc->magic = 0;
free(rpc);
}