X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Finit.c;h=4c8f84f42308ea61c131089d4d35cc8d9b670720;hb=be7f59339ee92ae6ebc37ceb170a0287b99b71ae;hp=536a56c605ac75111b10ba0e142d7690c1b41649;hpb=eecdc4f3cd5c464ae02823a823993e720664e465;p=deb_libnfs.git

diff --git a/lib/init.c b/lib/init.c
index 536a56c..4c8f84f 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -1,10 +1,7 @@
 /*
    Copyright (C) 2010 by Ronnie Sahlberg <ronniesahlberg@gmail.com>
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,14 +12,13 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#define _GNU_SOURCE
-
-#if defined(WIN32)
-#include <winsock2.h>
+#ifdef WIN32
+#include "win32_compat.h"
 #else
 #include <unistd.h>
 #include <strings.h>
-#endif
+#endif/*WIN32*/
+#define _GNU_SOURCE
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -43,7 +39,7 @@ struct rpc_context *rpc_init_context(void)
 	if (rpc == NULL) {
 		return NULL;
 	}
-	bzero(rpc, sizeof(struct rpc_context));
+	memset(rpc, 0, sizeof(struct rpc_context));
 
 	rpc->encodebuflen = 65536;
 	rpc->encodebuf = malloc(rpc->encodebuflen);
@@ -81,7 +77,7 @@ struct rpc_context *rpc_init_udp_context(void)
 	return rpc;
 }
 
-void rpc_set_auth(struct rpc_context *rpc, struct AUTH *auth)
+void rpc_set_auth(struct rpc_context *rpc, AUTH *auth)
 {
 	if (rpc->auth != NULL) {
 		auth_destroy(rpc->auth);
@@ -93,14 +89,13 @@ 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;
 
 	if (rpc->error_string != NULL) {
 		free(rpc->error_string);
 	}
         va_start(ap, error_string);
-	vasprintf(&str, error_string, ap);
-	rpc->error_string = str;
+	rpc->error_string = malloc(1024);
+	vsnprintf(rpc->error_string, 1024, error_string, ap);
         va_end(ap);
 }
 
@@ -125,6 +120,44 @@ 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)
+{
+	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;
+
+	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)
 {
@@ -141,6 +174,8 @@ 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;