repositories
/
deb_libnfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[win32] - completed win32 port
[deb_libnfs.git]
/
lib
/
socket.c
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*/
#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
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@
-62,6
+47,12
@@
#include "libnfs-private.h"
#include "slist.h"
#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)
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) {
int rpc_service(struct rpc_context *rpc, int revents)
{
if (revents & POLLERR) {
+#ifdef WIN32
char err = 0;
char err = 0;
+#else
+ int err = 0;
+#endif
socklen_t err_size = sizeof(err);
if (getsockopt(rpc->fd, SOL_SOCKET, SO_ERROR,
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)
set_nonblocking(rpc->fd);
#if defined(WIN32)
- if (connect(rpc->fd, (struct sockaddr *)&s, socksize) == 0 &&
GetLastError() != WSA
EINPROGRESS )
+ if (connect(rpc->fd, (struct sockaddr *)&s, socksize) == 0 &&
errno !=
EINPROGRESS )
#else
if (connect(rpc->fd, (struct sockaddr *)&s, socksize) != 0 && errno != EINPROGRESS)
#endif
#else
if (connect(rpc->fd, (struct sockaddr *)&s, socksize) != 0 && errno != EINPROGRESS)
#endif