WIN32: More ifdef cleanups

[deb_libnfs.git] / lib / init.c

diff --git a/lib/init.c b/lib/init.c
index ee6e474831b2b6913b84979d670b708521428bdd..e1d4980913f62a0dcc2129f1b792266a98fb27fb 100644 (file)
--- a/lib/init.c
+++ b/lib/init.c
@@ -25,16 +25,21 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
+#include <time.h>
 #include "slist.h"
+#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-private.h"
 
+#ifdef AROS
+#include "aros_compat.h"
+#endif
+
 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) {
@@ -60,7 +65,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;
@@ -79,7 +85,7 @@ struct rpc_context *rpc_init_udp_context(void)
        return rpc;
 }
 
-void rpc_set_auth(struct rpc_context *rpc, AUTH *auth)
+void rpc_set_auth(struct rpc_context *rpc, struct AUTH *auth)
 {
        assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
@@ -196,11 +202,7 @@ void rpc_destroy_context(struct rpc_context *rpc)
        rpc->auth =NULL;
 
        if (rpc->fd != -1) {
-#if defined(WIN32)
-               closesocket(rpc->fd);
-#else
                close(rpc->fd);
-#endif
        }
 
        if (rpc->encodebuf != NULL) {