X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Finit.c;h=bb2fe17bd00ef48306cb716df5b2f37d09580a81;hb=1c8b4547cee99df587ed6b5d0112ab3f48d6534d;hp=d9f788f99edca3819688d6c9d9582c8ab6b2fe4a;hpb=2606f9bb3d46fa8e4534e2afa8b29f1630c5f530;p=deb_libnfs.git

diff --git a/lib/init.c b/lib/init.c
index d9f788f..bb2fe17 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -11,13 +11,25 @@
    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"
+#endif
 
 #define _GNU_SOURCE
 
-#if defined(WIN32)
-#include <winsock2.h>
-#else
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
 
@@ -25,9 +37,10 @@
 #include <stdarg.h>
 #include <string.h>
 #include <stdlib.h>
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
+#include <assert.h>
+#include <time.h>
 #include "slist.h"
+#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-private.h"
@@ -35,13 +48,15 @@
 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) {
 		return NULL;
 	}
-	bzero(rpc, sizeof(struct rpc_context));
+	memset(rpc, 0, sizeof(struct rpc_context));
 
+	rpc->magic = RPC_CONTEXT_MAGIC;
 	rpc->encodebuflen = 65536;
 	rpc->encodebuf = malloc(rpc->encodebuflen);
 	if (rpc->encodebuf == NULL) {
@@ -49,18 +64,16 @@ 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;
+	rpc->tcp_syncnt = RPC_PARAM_UNDEFINED;
 
 	return rpc;
 }
@@ -80,6 +93,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);
 	}
@@ -90,24 +105,22 @@ void rpc_set_auth(struct rpc_context *rpc, struct AUTH *auth)
 void rpc_set_error(struct rpc_context *rpc, char *error_string, ...)
 {
         va_list ap;
-	char *str;
+
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
 	if (rpc->error_string != NULL) {
 		free(rpc->error_string);
 	}
         va_start(ap, error_string);
-#if defined (WIN32)
-	str = malloc(1024);
-	vsnprintf(str, 1024, error_string, ap);
-#else
-	vasprintf(&str, error_string, ap);
-#endif
-	rpc->error_string = str;
+	rpc->error_string = malloc(1024);
+	vsnprintf(rpc->error_string, 1024, error_string, ap);
         va_end(ap);
 }
 
 char *rpc_get_error(struct rpc_context *rpc)
 {
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
 	return rpc->error_string;
 }
 
@@ -115,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);
@@ -127,11 +142,55 @@ void rpc_error_all_pdus(struct rpc_context *rpc, char *error)
 	}
 }
 
+static void rpc_free_fragment(struct rpc_fragment *fragment)
+{
+	if (fragment->data != NULL) {
+		free(fragment->data);
+	}
+	free(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;
+
+	      SLIST_REMOVE(&rpc->fragments, fragment);
+	      rpc_free_fragment(fragment);
+	}
+}
+
+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;
+	}
+
+	fragment->size = size;
+	fragment->data = malloc(fragment->size);
+	if(fragment->data == NULL) {
+		free(fragment);
+		return -1;
+	}
+
+	memcpy(fragment->data, data, fragment->size);
+	SLIST_ADD_END(&rpc->fragments, fragment);
+	return 0;
+}
 
 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);
@@ -143,15 +202,13 @@ void rpc_destroy_context(struct rpc_context *rpc)
 		rpc_free_pdu(rpc, pdu);
 	}
 
+	rpc_free_all_fragments(rpc);
+
 	auth_destroy(rpc->auth);
 	rpc->auth =NULL;
 
 	if (rpc->fd != -1) {
-#if defined(WIN32)
-		closesocket(rpc->fd);
-#else
  		close(rpc->fd);
-#endif
 	}
 
 	if (rpc->encodebuf != NULL) {
@@ -169,6 +226,7 @@ void rpc_destroy_context(struct rpc_context *rpc)
 		rpc->udp_dest = NULL;
 	}
 
+	rpc->magic = 0;
 	free(rpc);
 }