From 34480d6d55eeea4b6615d89d3ecb1976cff5e423 Mon Sep 17 00:00:00 2001 From: pk910 Date: Sun, 2 Oct 2011 03:59:04 +0200 Subject: [PATCH] some more changes for WIN32 compatibility --- src/ClientSocket.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/ClientSocket.c b/src/ClientSocket.c index f4288f2..98fefa7 100644 --- a/src/ClientSocket.c +++ b/src/ClientSocket.c @@ -178,7 +178,11 @@ int close_socket(struct ClientSocket *client) { int write_socket(struct ClientSocket *client, char* msg, int len) { if(!(client->flags & SOCKET_FLAG_CONNECTED)) return 0; printf("[send %d] %s", len, msg); + #ifdef WIN32 + send(client->sock, msg, len, 0); + #else write(client->sock, msg, len); + #endif client->traffic_out += len; return 1; } @@ -204,7 +208,11 @@ void socket_loop(int timeout_seconds) { for (sock = sockets->data; sock; sock = sock->next) { if((sock->flags & SOCKET_FLAG_CONNECTED) && FD_ISSET(sock->sock, &fds)) { if(sock->bufferpos != 0) { + #ifdef WIN32 + bytes = recv(sock->sock, buffer, sizeof(buffer), 0); + #else bytes = read(sock->sock, buffer, sizeof(buffer)); + #endif if(bytes > 0) { for(i = 0; i < bytes; i++) { if(sock->bufferpos + i == BUF_SIZ*2) break; //buffer overflow @@ -213,7 +221,11 @@ void socket_loop(int timeout_seconds) { sock->bufferpos += i; } } else { + #ifdef WIN32 + bytes = recv(sock->sock, sock->buffer, sizeof(sock->buffer), 0); + #else bytes = read(sock->sock, sock->buffer, sizeof(sock->buffer)); + #endif if(bytes > 0) sock->bufferpos = bytes; } -- 2.20.1