Imported Upstream version 1.2.0

[deb_libnfs.git] / lib / init.c

diff --git a/lib/init.c b/lib/init.c
index 5663f250123ef1b6bccf24b0b84feae768083961..4c8f84f42308ea61c131089d4d35cc8d9b670720 100644 (file)
--- 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,12 +12,17 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifdef WIN32
+#include "win32_compat.h"
+#else
+#include <unistd.h>
+#include <strings.h>
+#endif/*WIN32*/
 #define _GNU_SOURCE
+
 #include <stdio.h>
 #include <stdarg.h>
-#include <unistd.h>
 #include <string.h>
-#include <strings.h>
 #include <stdlib.h>
 #include <rpc/rpc.h>
 #include <rpc/xdr.h>
@@ -37,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);
@@ -46,7 +48,11 @@ struct rpc_context *rpc_init_context(void)
                return NULL;
        }
 
-       rpc->auth = authunix_create_default();
+#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);
@@ -71,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);
@@ -83,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);
 }
 
@@ -115,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)
 {
@@ -131,11 +174,17 @@ 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) {
-               close(rpc->fd);
+#if defined(WIN32)
+               closesocket(rpc->fd);
+#else
+               close(rpc->fd);
+#endif
        }
 
        if (rpc->encodebuf != NULL) {