aboutsummaryrefslogtreecommitdiff
path: root/libssh/connect.c
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2008-05-22 12:42:09 +0000
committerAris Adamantiadis <aris@0xbadc0de.be>2008-05-22 12:42:09 +0000
commit58f28617b8c6ca02889f8d116c9a7cd31f7a22a1 (patch)
tree8b82c6ee1187c740083b5a4bb378526842110df8 /libssh/connect.c
parent8b9841dd5714879b27ecb4532dfbbfe08e3b718d (diff)
downloadlibssh-58f28617b8c6ca02889f8d116c9a7cd31f7a22a1.tar.gz
libssh-58f28617b8c6ca02889f8d116c9a7cd31f7a22a1.tar.xz
libssh-58f28617b8c6ca02889f8d116c9a7cd31f7a22a1.zip
some changes so it compiles better under windows
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@159 7dcaeef0-15fb-0310-b436-a5af3365683c
Diffstat (limited to 'libssh/connect.c')
-rw-r--r--libssh/connect.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/libssh/connect.c b/libssh/connect.c
index 6470b5a..9f865bb 100644
--- a/libssh/connect.c
+++ b/libssh/connect.c
@@ -29,6 +29,7 @@ MA 02111-1307, USA. */
#define _WIN32_WINNT 0x0501 //getaddrinfo, freeaddrinfo, getnameinfo
#include <winsock2.h>
#include <ws2tcpip.h>
+#include "wspiapi.h"
#else
#include <netdb.h>
#include <sys/socket.h>
@@ -62,6 +63,13 @@ static void sock_set_blocking(socket_t sock){
u_long nonblocking = 0;
ioctlsocket(sock, FIONBIO, &nonblocking);
}
+
+char WSAAPI *gai_strerrorA(int code){
+ static char buffer[256];
+ snprintf(buffer,256,"Undetermined error code (%d)",code);
+ return buffer;
+}
+
#endif
static int getai(const char *host, int port, struct addrinfo **ai)
@@ -111,7 +119,7 @@ int ssh_connect_ai_timeout(SSH_SESSION *session, const char *host, int port, str
}
ret = 0;
/* get connect(2) return code. zero means no error */
- getsockopt(s,SOL_SOCKET,SO_ERROR,&ret,&len);
+ getsockopt(s,SOL_SOCKET,SO_ERROR,(char *)&ret,&len);
if (ret!=0){
ssh_set_error(session,SSH_FATAL,"Connecting : %s",strerror(ret));
close(s);