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

diff --git a/lib/init.c b/lib/init.c
index 80368c2..bb2fe17 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -11,14 +11,27 @@
    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>
@@ -32,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;
@@ -55,19 +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 = salt + time(NULL);
+	rpc->xid = salt + time(NULL) + getpid() << 16;
 	salt += 0x01000000;
 	rpc->fd = -1;
+	rpc->tcp_syncnt = RPC_PARAM_UNDEFINED;
 
 	return rpc;
 }
@@ -202,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) {