more include cleanups it starts to look almost decent now

[deb_libnfs.git] / lib / init.c

diff --git a/lib/init.c b/lib/init.c
index 7ef329298afb136f337d4a1d5cea2adbc4aadda5..ecac1e7e2fd168b3831aea109a32d65ad093cb20 100644 (file)
--- a/lib/init.c
+++ b/lib/init.c
@@ -11,23 +11,33 @@
    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
 
-#define _GNU_SOURCE
+#ifdef AROS
+#include "aros_compat.h"
+#endif
 
-#if defined(WIN32)
-#include <winsock2.h>
+#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 <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,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) {
@@ -42,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) {
@@ -59,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;
@@ -80,10 +93,12 @@ 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);
        }
-       rpc->auth = (AUTH *)auth;
+       rpc->auth = auth;
 }
 
 
@@ -91,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);
        }
@@ -102,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;
 }
 
@@ -109,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);
@@ -121,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);
@@ -137,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) {
@@ -163,6 +226,7 @@ void rpc_destroy_context(struct rpc_context *rpc)
                rpc->udp_dest = NULL;
        }
 
+       rpc->magic = 0;
        free(rpc);
 }