X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Finit.c;h=ecac1e7e2fd168b3831aea109a32d65ad093cb20;hb=108c622a9561676b4df437c318959f79e42d4675;hp=6bbc11b09f8395f3a8da9ef45f67ba34ef43d8f9;hpb=763cd6e3e2bbb6906186e7ed6a86660276b596b7;p=deb_libnfs.git

diff --git a/lib/init.c b/lib/init.c
index 6bbc11b..ecac1e7 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -11,19 +11,31 @@
    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/>.
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef AROS
+#include "aros_compat.h"
+#endif
 
 #ifdef WIN32
 #include "win32_compat.h"
 #else
-#include <unistd.h>
 #include <strings.h>
 #endif/*WIN32*/
 #define _GNU_SOURCE
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
 #include <stdlib.h>
+#include <assert.h>
+#include <time.h>
 #include "slist.h"
 #include "libnfs-zdr.h"
 #include "libnfs.h"
@@ -33,6 +45,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 +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) {
@@ -57,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;
@@ -76,8 +91,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);
 	}
@@ -89,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);
 	}
@@ -100,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;
 }
 
@@ -107,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);
@@ -129,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;
 
@@ -141,6 +166,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 +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);
@@ -179,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) {
@@ -201,6 +226,7 @@ void rpc_destroy_context(struct rpc_context *rpc)
 		rpc->udp_dest = NULL;
 	}
 
+	rpc->magic = 0;
 	free(rpc);
 }