X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Finit.c;h=6bbc11b09f8395f3a8da9ef45f67ba34ef43d8f9;hb=d14e28387f825d7acc33d655db7a22506b064d83;hp=d9f788f99edca3819688d6c9d9582c8ab6b2fe4a;hpb=2606f9bb3d46fa8e4534e2afa8b29f1630c5f530;p=deb_libnfs.git
diff --git a/lib/init.c b/lib/init.c
index d9f788f..6bbc11b 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -12,22 +12,20 @@
along with this program; if not, see .
*/
-#define _GNU_SOURCE
-
-#if defined(WIN32)
-#include
+#ifdef WIN32
+#include "win32_compat.h"
#else
#include
#include
-#endif
+#endif/*WIN32*/
+#define _GNU_SOURCE
#include
#include
#include
#include
-#include
-#include
#include "slist.h"
+#include "libnfs-zdr.h"
#include "libnfs.h"
#include "libnfs-raw.h"
#include "libnfs-private.h"
@@ -40,7 +38,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);
@@ -78,7 +76,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);
@@ -90,19 +88,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);
-#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);
}
@@ -127,6 +119,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)
{
@@ -143,6 +173,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;