X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Finit.c;h=7f4a8db190649d19c4386842955cc6c9b4574382;hb=35280fd7a4915c7e1cc121859558c2017fb18969;hp=bbcfb86fa52047a6c8730ef439341d594555eecb;hpb=f816bf4c7641071d83ed2c796c93ce0ddba9b3b4;p=deb_libnfs.git
diff --git a/lib/init.c b/lib/init.c
index bbcfb86..7f4a8db 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -11,20 +11,34 @@
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 "slist.h"
#include "libnfs-zdr.h"
#include "libnfs.h"
@@ -34,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) {
@@ -42,24 +57,23 @@ 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 = 1;
+ rpc->xid = salt + time(NULL) + getpid() << 16;
+ salt += 0x01000000;
rpc->fd = -1;
return rpc;
@@ -195,11 +209,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) {