Grow the marshalling buffer from 64k to 1M so we can marshall really large WRITE3s

[deb_libnfs.git] / lib / init.c

diff --git a/lib/init.c b/lib/init.c
index 6085b6892bb9cc068f8611aa90113a5ec1b5f910..7f4a8db190649d19c4386842955cc6c9b4574382 100644 (file)
--- a/lib/init.c
+++ b/lib/init.c
@@ -15,17 +15,24 @@
 #include "config.h"
 #endif
 
+#ifdef AROS
+#include "aros_compat.h"
+#endif
+
 #ifdef WIN32
 #include "win32_compat.h"
-#else
-#include <strings.h>
-#endif/*WIN32*/
+#endif
+
 #define _GNU_SOURCE
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
@@ -38,10 +45,6 @@
 #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;
@@ -54,24 +57,22 @@ struct rpc_context *rpc_init_context(void)
        memset(rpc, 0, sizeof(struct rpc_context));
 
        rpc->magic = RPC_CONTEXT_MAGIC;
-       rpc->encodebuflen = 65536;
+
+       /* Allow 1M of data (for writes) and some */
+       rpc->encodebuflen = 1024 * 1024 + 4096;
        rpc->encodebuf = malloc(rpc->encodebuflen);
        if (rpc->encodebuf == NULL) {
                free(rpc);
                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 = salt + time(NULL);
+       rpc->xid = salt + time(NULL) + getpid() << 16;
        salt += 0x01000000;
        rpc->fd = -1;