X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Finit.c;h=62a8f81ac96fffa8d2e55f9e76dd2ae2683cd9d5;hb=bff8fe460dcf4b25071fff966d86877b30eeec90;hp=ee6e474831b2b6913b84979d670b708521428bdd;hpb=4a2b08768a0d9ec9f5604da76f8e41263f20b821;p=deb_libnfs.git
diff --git a/lib/init.c b/lib/init.c
index ee6e474..62a8f81 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -11,23 +11,36 @@
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, see .
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef AROS
+#include "aros_compat.h"
+#endif
#ifdef WIN32
#include "win32_compat.h"
-#else
+#endif
+
+#define _GNU_SOURCE
+
+#ifdef HAVE_UNISTD_H
#include
+#endif
+
+#ifdef HAVE_STRINGS_H
#include
-#endif/*WIN32*/
-#define _GNU_SOURCE
+#endif
#include
#include
#include
#include
#include
-#include
-#include
+#include
#include "slist.h"
+#include "libnfs-zdr.h"
#include "libnfs.h"
#include "libnfs-raw.h"
#include "libnfs-private.h"
@@ -35,6 +48,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) {
@@ -50,17 +64,14 @@ struct rpc_context *rpc_init_context(void)
return NULL;
}
-#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);
return NULL;
}
- rpc->xid = 1;
+ rpc->xid = salt + time(NULL);
+ salt += 0x01000000;
rpc->fd = -1;
return rpc;
@@ -79,7 +90,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 +207,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) {