[win32] - completed win32 port

diff --git a/README b/README
index 79f49eb531c8266479e491fcf4f75169edfc90cb..001e6b457814163380b105cc3b91f7d07c8923c2 100644 (file)
--- a/README
+++ b/README
@@ -45,7 +45,7 @@ MacOSX: - tested with SDK 10.4 (under Snow Leopard) - should also work with late
 iOS:    - tested with iOS SDK 4.2 - running on iOS 4.3.x
 FreeBSD:- tested with 8.2
 OpenSolaris
-Windows:- tested on Windows 7 using Visual Studio 10
+Windows:- tested on Windows 7 64 and Windows XP 32 using Visual Studio 10 (see README.win32.txt for build instructions)
 
 
 Cygwin

diff --git a/README.win32.txt b/README.win32.txt
index 7df1745e40801e2749d0fece2d7ff8db1217d8a3..298045ea4919e6e26facdcf9b66b8ba769b8ece7 100644 (file)
--- a/README.win32.txt
+++ b/README.win32.txt
@@ -4,8 +4,7 @@ package should work with some effort.
 
 
 1. checkout git://github.com/Memphiz/oncrpc-win32.git project (branch hyper!)
-2. build oncrpc-win32 project (see README.win32 in the projects dir)
-3. checkout libnfs (branch win32)
-4. adapt oncrpc-win32 path in win32/win32build.bat
-4. build libnfs with cd win32;win32build.bat
-5. copy lib/libnfs.dll and <oncrpc-win32-path>/win32/bin/liboncrpc.dll to the dir where the executable is...
+2. build oncrpc-win32 project (see README.libnfs in the projects dir)
+3. checkout libnfs ("parallel" to oncrpc-win32)
+4. load vs2010 project from win32/libnfs/libnfs.sln
+5. build libnfs and nfsclient-sync

diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index c7698351148f502e735e581e08d0c696c990a358..97d5a611247d585c8c596cc9e275ad8a4e3d39e4 100644 (file)
--- a/lib/libnfs-sync.c
+++ b/lib/libnfs-sync.c
@@ -47,8 +47,6 @@
 #include <sys/sockio.h>
 #endif
 
-#include <fcntl.h>
-#include <errno.h>
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-raw-mount.h"
@@ -716,11 +714,8 @@ static void statvfs_cb(int status, struct nfs_context *nfs, void *data, void *pr
                nfs_set_error(nfs, "statvfs call failed with \"%s\"", (char *)data);
                return;
        }
-#ifndef WIN32
+
        memcpy(cb_data->return_data, data, sizeof(struct statvfs));
-#else
-  cb_data->return_data=NULL;
-#endif/**/
 }
 
 int nfs_statvfs(struct nfs_context *nfs, const char *path, struct statvfs *svfs)
@@ -1189,7 +1184,6 @@ void mount_free_export_list(struct exportnode *exports)
 
 
 
-#if !defined(WIN32)
 void free_nfs_srvr_list(struct nfs_server_list *srv)
 {
        while (srv != NULL) {
@@ -1260,7 +1254,138 @@ void callit_cb(struct rpc_context *rpc, int status, void *data _U_, void *privat
        srv_data->srvrs = srvr;
 }
 
-#ifndef WIN32
+#ifdef WIN32
+
+static int send_nfsd_probes(struct rpc_context *rpc, INTERFACE_INFO *InterfaceList, int numIfs, struct nfs_list_data *data)
+{
+  int i=0;
+
+  for(i = 0; i < numIfs; i++) 
+  {
+    SOCKADDR *pAddress;
+    char bcdd[16];
+    unsigned long nFlags = 0;
+
+    pAddress = (SOCKADDR *) & (InterfaceList[i].iiBroadcastAddress);
+
+    if(pAddress->sa_family != AF_INET)
+      continue;
+               
+    nFlags = InterfaceList[i].iiFlags;
+
+    if (!(nFlags & IFF_UP)) 
+    {
+      continue;
+    }
+
+    if (nFlags & IFF_LOOPBACK) 
+    {
+      continue;
+    }
+
+    if (!(nFlags & IFF_BROADCAST)) 
+    {
+      continue;
+    }
+
+    if (getnameinfo(pAddress, sizeof(struct sockaddr_in), &bcdd[0], sizeof(bcdd), NULL, 0, NI_NUMERICHOST) < 0) 
+    {
+      continue;
+    }
+
+    if (rpc_set_udp_destination(rpc, bcdd, 111, 1) < 0) 
+    {
+      return -1;
+    }
+
+    if (rpc_pmap_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, callit_cb, data) < 0) 
+    {
+      return -1;
+    }
+  }
+  return 0;
+}
+
+struct nfs_server_list *nfs_find_local_servers(void)
+{
+  struct rpc_context *rpc;
+  struct nfs_list_data data = {0, NULL};
+  struct timeval tv_start, tv_current;
+  int loop;
+  struct pollfd pfd;
+  INTERFACE_INFO InterfaceList[20];
+  unsigned long nBytesReturned;
+  int nNumInterfaces = 0;
+
+  rpc = rpc_init_udp_context();
+  if (rpc == NULL) 
+  {
+    return NULL;
+  }
+
+  if (rpc_bind_udp(rpc, "0.0.0.0", 0) < 0) 
+  {
+    rpc_destroy_context(rpc);
+    return NULL;
+  }
+
+  if (WSAIoctl(rpc_get_fd(rpc), SIO_GET_INTERFACE_LIST, 0, 0, &InterfaceList, sizeof(InterfaceList), &nBytesReturned, 0, 0) == SOCKET_ERROR) 
+  {
+    return NULL;
+  }
+
+  nNumInterfaces = nBytesReturned / sizeof(INTERFACE_INFO);
+
+  for (loop=0; loop<3; loop++) 
+  {
+    if (send_nfsd_probes(rpc, InterfaceList, nNumInterfaces, &data) != 0) 
+    {
+      rpc_destroy_context(rpc);
+      return NULL;
+    }
+
+    win32_gettimeofday(&tv_start, NULL);
+    for(;;) 
+    {
+      int mpt;
+
+      pfd.fd = rpc_get_fd(rpc);
+      pfd.events = rpc_which_events(rpc);
+
+      win32_gettimeofday(&tv_current, NULL);
+      mpt = 1000
+      -    (tv_current.tv_sec *1000 + tv_current.tv_usec / 1000)
+      +    (tv_start.tv_sec *1000 + tv_start.tv_usec / 1000);
+
+      if (poll(&pfd, 1, mpt) < 0) 
+      {
+        free_nfs_srvr_list(data.srvrs);
+        rpc_destroy_context(rpc);
+        return NULL;
+      }
+      if (pfd.revents == 0) 
+      {
+        break;
+      }
+               
+      if (rpc_service(rpc, pfd.revents) < 0) 
+      {
+        break;
+      }
+    }
+  }
+
+  rpc_destroy_context(rpc);
+
+  if (data.status != 0) 
+  {
+    free_nfs_srvr_list(data.srvrs);
+    return NULL;
+  }
+  return data.srvrs;
+}
+#else
+
 static int send_nfsd_probes(struct rpc_context *rpc, struct ifconf *ifc, struct nfs_list_data *data)
 {
        char *ptr;
@@ -1312,13 +1437,11 @@ static int send_nfsd_probes(struct rpc_context *rpc, struct ifconf *ifc, struct
 
        return 0;
 }
-#endif/*WIN32 TODO implement this with win32api FIXME*/
 
 struct nfs_server_list *nfs_find_local_servers(void)
 {
        struct rpc_context *rpc;
        struct nfs_list_data data = {0, NULL};
-#ifndef WIN32
        struct timeval tv_start, tv_current;
        struct ifconf ifc;
        int size, loop;
@@ -1395,7 +1518,6 @@ struct nfs_server_list *nfs_find_local_servers(void)
                free_nfs_srvr_list(data.srvrs);
                return NULL;
        }
-#endif/*WIN32 - FIXME redef it when send_nfsd_probes is implemented for win32*/
        return data.srvrs;
 }
-#endif
+#endif//WIN32

diff --git a/lib/libnfs-win32.def b/lib/libnfs-win32.def
index e758a35268b3e211d301a7829c13cb0ebccea927..f553e715090e1c25316d66d7266c483c965c2c1c 100644 (file)
--- a/lib/libnfs-win32.def
+++ b/lib/libnfs-win32.def
@@ -3,6 +3,8 @@ EXPORTS
 mount_free_export_list
 mount_getexports
 mount_getexports_async
+nfs_find_local_servers
+free_nfs_srvr_list
 nfs_access
 nfs_access_async
 nfs_chmod

diff --git a/lib/libnfs.c b/lib/libnfs.c
index ba7b64893f4ede24fc3b6be4f4eab5774dac09fc..29a276fb5ee0b1d6f3ccfa06b696b428589efa92 100644 (file)
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -2002,9 +2002,7 @@ static void nfs_statvfs_1_cb(struct rpc_context *rpc _U_, int status, void *comm
        FSSTAT3res *res;
        struct nfs_cb_data *data = private_data;
        struct nfs_context *nfs = data->nfs;
-#ifndef WIN32
        struct statvfs svfs;
-#endif/*WIN32*/
 
        if (status == RPC_STATUS_ERROR) {
                data->cb(-EFAULT, nfs, command_data, data->private_data);
@@ -2025,7 +2023,6 @@ static void nfs_statvfs_1_cb(struct rpc_context *rpc _U_, int status, void *comm
                return;
        }
 
-#ifndef WIN32
        svfs.f_bsize   = 4096;
        svfs.f_frsize  = 4096;
        svfs.f_blocks  = res->FSSTAT3res_u.resok.tbytes/4096;
@@ -2039,9 +2036,6 @@ static void nfs_statvfs_1_cb(struct rpc_context *rpc _U_, int status, void *comm
        svfs.f_namemax = 256;
 
        data->cb(0, nfs, &svfs, data->private_data);
-#else
-  data->cb(0, nfs,NULL, data->private_data);  
-#endif/*WIN32*/
        free_nfs_cb_data(data);
 }
 
@@ -3208,35 +3202,3 @@ const char *nfs_get_export(struct nfs_context *nfs) {
        return nfs->export;
 }
 
-
-#if defined(WIN32)
-int poll(struct pollfd *fds, int nfsd, int timeout)
-{
-       fd_set rfds, wfds, efds;
-       int ret;
-
-       FD_ZERO(&rfds);
-       FD_ZERO(&wfds);
-       FD_ZERO(&efds);
-       if (fds->events & POLLIN) {
-               FD_SET(fds->fd, &rfds);
-       }
-       if (fds->events & POLLOUT) {
-               FD_SET(fds->fd, &wfds);
-       }
-       FD_SET(fds->fd, &efds);
-       select(fds->fd + 1, &rfds, &wfds, &efds, NULL);
-       fds->revents = 0;
-       if (FD_ISSET(fds->fd, &rfds)) {
-               fds->revents |= POLLIN;
-       }
-       if (FD_ISSET(fds->fd, &wfds)) {
-               fds->revents |= POLLOUT;
-       }
-       if (FD_ISSET(fds->fd, &efds)) {
-               fds->revents |= POLLHUP;
-       }
-       return 1;
-}
-#endif
-

diff --git a/lib/socket.c b/lib/socket.c
index 6e162a85b6ffc2e73ace6c0ed256230815a3ce9e..bc101e7a6821b01b78d987bd5e8aad917ecfe126 100644 (file)
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -25,21 +25,6 @@
 #include <netdb.h>
 #endif/*WIN32*/
 
-#if defined(WIN32)
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <basetsd.h>
-#define ssize_t SSIZE_T
-#define MSG_DONTWAIT 0
-#else
-#include <unistd.h>
-#include <poll.h>
-#include <arpa/inet.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -62,6 +47,12 @@
 #include "libnfs-private.h"
 #include "slist.h"
 
+#ifdef WIN32
+//has to be included after stdlib!!
+#include "win32_errnowrapper.h"
+#endif
+
+
 static int rpc_disconnect_requeue(struct rpc_context *rpc);
 
 static void set_nonblocking(int fd)
@@ -267,7 +258,11 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 int rpc_service(struct rpc_context *rpc, int revents)
 {
        if (revents & POLLERR) {
+#ifdef WIN32
                char err = 0;
+#else
+               int err = 0;
+#endif
                socklen_t err_size = sizeof(err);
 
                if (getsockopt(rpc->fd, SOL_SOCKET, SO_ERROR,
@@ -414,7 +409,7 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
        set_nonblocking(rpc->fd);
 
 #if defined(WIN32)
-       if (connect(rpc->fd, (struct sockaddr *)&s, socksize) == 0 && GetLastError() != WSAEINPROGRESS   )
+       if (connect(rpc->fd, (struct sockaddr *)&s, socksize) == 0 && errno != EINPROGRESS   )
 #else
        if (connect(rpc->fd, (struct sockaddr *)&s, socksize) != 0 && errno != EINPROGRESS) 
 #endif

diff --git a/nfs/nfs.c b/nfs/nfs.c
index 50836ca12f6d1528e9374bc42afa57e8853388a1..9d8086f7ca1e5611ad907128526f2eb2938b5c3f 100644 (file)
--- a/nfs/nfs.c
+++ b/nfs/nfs.c
@@ -31,10 +31,6 @@
 #include "libnfs-private.h"
 #include "libnfs-raw-nfs.h"
 
-#ifdef WIN32
-#define bzero(a,b) memset((a),(0),(b))
-#endif/*WIN32*/
-
 char *nfsstat3_to_str(int error)
 {
        switch (error) {

diff --git a/nfs/nfsacl.c b/nfs/nfsacl.c
index ba1ca12376fc0656b28df3166113fcbb74df5114..e48db02fc7f601edf4371347c02026a6a1461cf1 100644 (file)
--- a/nfs/nfsacl.c
+++ b/nfs/nfsacl.c
@@ -20,10 +20,6 @@
 #include <sys/stat.h>
 #endif/*WIN32*/
 
-#if defined(WIN32)
-#include <winsock2.h>
-#endif
-
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>

diff --git a/portmap/portmap.c b/portmap/portmap.c
index 29f13d00b3d44a70db72b9c33dd7298e7f65ca70..f8c434d19950e449c0f7bb701c6b32cb992eba8b 100644 (file)
--- a/portmap/portmap.c
+++ b/portmap/portmap.c
@@ -18,10 +18,6 @@
 #include "win32_compat.h"
 #endif/*WIN32*/
 
-#if defined(WIN32)
-#include <winsock2.h>
-#endif
-
 #include <stdio.h>
 #include <rpc/rpc.h>
 #include <rpc/xdr.h>

diff --git a/rquota/rquota.c b/rquota/rquota.c
index fa528c29f84725ef2a78c6768366edf697203404..549f2ff93ae9179dba8cd63a045f0c3a7a0d118b 100644 (file)
--- a/rquota/rquota.c
+++ b/rquota/rquota.c
@@ -18,10 +18,6 @@
 #include "win32_compat.h"
 #endif/*WIN32*/
 
-#if defined(WIN32)
-#include <winsock2.h>
-#endif
-
 #include <stdio.h>
 #include <errno.h>
 #include <sys/stat.h>

diff --git a/win32/win32_compat.c b/win32/win32_compat.c
index fbcbd804f68bdebf74da3bffa84f501063756340..fe2ca05762b7e685a17c3bdf7d7d416be6a7850f 100644 (file)
--- a/win32/win32_compat.c
+++ b/win32/win32_compat.c
@@ -41,7 +41,6 @@ static int dummy ATTRIBUTE((unused));
 #undef inet_aton
 #undef gettimeofday
 #undef stat
-#define bzero(a,b) memset((a),(0),(b))
 #define assert(a)
 
 /* Windows needs this header file for the implementation of inet_aton() */