Win32 changes, include files we need when compiling under win32

[deb_libnfs.git] / lib / init.c

diff --git a/lib/init.c b/lib/init.c
index fb2ae83512150b4f0eb0114eccbc11ec9b5dcad5..536a56c605ac75111b10ba0e142d7690c1b41649 100644 (file)
--- a/lib/init.c
+++ b/lib/init.c
@@ -16,11 +16,19 @@
 */
 
 #define _GNU_SOURCE
+
+#if defined(WIN32)
+#include <winsock2.h>
+#else
+#include <unistd.h>
+#include <strings.h>
+#endif
+
 #include <stdio.h>
 #include <stdarg.h>
-#include <unistd.h>
 #include <string.h>
-#include <strings.h>
+#include <stdlib.h>
+#include <rpc/rpc.h>
 #include <rpc/xdr.h>
 #include "slist.h"
 #include "libnfs.h"
@@ -33,7 +41,6 @@ struct rpc_context *rpc_init_context(void)
 
        rpc = malloc(sizeof(struct rpc_context));
        if (rpc == NULL) {
-               printf("Failed to allocate rpc context\n");
                return NULL;
        }
        bzero(rpc, sizeof(struct rpc_context));
@@ -41,14 +48,16 @@ struct rpc_context *rpc_init_context(void)
        rpc->encodebuflen = 65536;
        rpc->encodebuf = malloc(rpc->encodebuflen);
        if (rpc->encodebuf == NULL) {
-               printf("Failed to allocate a buffer for rpc encoding\n");
                free(rpc);
                return NULL;
        }
 
-       rpc->auth = authunix_create_default();
+#if defined(WIN32)
+       rpc->auth = authunix_create("LibNFS", 65535, 65535, 0, NULL);
+#else
+       rpc->auth = authunix_create_default();
+#endif
        if (rpc->auth == NULL) {
-               printf("failed to create authunix\n");
                free(rpc->encodebuf);
                free(rpc);
                return NULL;
@@ -60,6 +69,18 @@ struct rpc_context *rpc_init_context(void)
 }
 
 
+struct rpc_context *rpc_init_udp_context(void)
+{
+       struct rpc_context *rpc;
+
+       rpc = rpc_init_context();
+       if (rpc != NULL) {
+               rpc->is_udp = 1;
+       }
+       
+       return rpc;
+}
+
 void rpc_set_auth(struct rpc_context *rpc, struct AUTH *auth)
 {
        if (rpc->auth != NULL) {
@@ -124,7 +145,11 @@ void rpc_destroy_context(struct rpc_context *rpc)
        rpc->auth =NULL;
 
        if (rpc->fd != -1) {
-               close(rpc->fd);
+#if defined(WIN32)
+               closesocket(rpc->fd);
+#else
+               close(rpc->fd);
+#endif
        }
 
        if (rpc->encodebuf != NULL) {
@@ -137,6 +162,11 @@ void rpc_destroy_context(struct rpc_context *rpc)
                rpc->error_string = NULL;
        }
 
+       if (rpc->udp_dest != NULL) {
+               free(rpc->udp_dest);
+               rpc->udp_dest = NULL;
+       }
+
        free(rpc);
 }