Some more configure checks for headers

[deb_libnfs.git] / lib / init.c

diff --git a/lib/init.c b/lib/init.c
index bbcfb86fa52047a6c8730ef439341d594555eecb..62a8f81ac96fffa8d2e55f9e76dd2ae2683cd9d5 100644 (file)
--- 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 <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 <time.h>
 #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) {
@@ -49,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;
@@ -195,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) {