X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Finit.c;h=bb2fe17bd00ef48306cb716df5b2f37d09580a81;hb=1c8b4547cee99df587ed6b5d0112ab3f48d6534d;hp=ee6e474831b2b6913b84979d670b708521428bdd;hpb=4a2b08768a0d9ec9f5604da76f8e41263f20b821;p=deb_libnfs.git

diff --git a/lib/init.c b/lib/init.c
index ee6e474..bb2fe17 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 <http://www.gnu.org/licenses/>.
 */
+#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 <unistd.h>
+#endif
+
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
-#endif/*WIN32*/
-#define _GNU_SOURCE
+#endif
 
 #include <stdio.h>
 #include <stdarg.h>
 #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"
@@ -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,18 +64,16 @@ 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) + getpid() << 16;
+	salt += 0x01000000;
 	rpc->fd = -1;
+	rpc->tcp_syncnt = RPC_PARAM_UNDEFINED;
 
 	return rpc;
 }
@@ -79,7 +91,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 +208,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) {